Revision: 76348
http://sourceforge.net/p/brlcad/code/76348
Author: starseeker
Date: 2020-07-15 11:09:35 +0000 (Wed, 15 Jul 2020)
Log Message:
-----------
relocate a couple more functions
Modified Paths:
--------------
brlcad/trunk/src/libtclcad/CMakeLists.txt
brlcad/trunk/src/libtclcad/dm.c
brlcad/trunk/src/libtclcad/tclcad_obj.c
brlcad/trunk/src/libtclcad/tclcad_private.h
brlcad/trunk/src/libtclcad/view/autoview.c
brlcad/trunk/src/libtclcad/view/draw.c
brlcad/trunk/src/libtclcad/view/view.h
Modified: brlcad/trunk/src/libtclcad/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libtclcad/CMakeLists.txt 2020-07-15 01:31:21 UTC (rev
76347)
+++ brlcad/trunk/src/libtclcad/CMakeLists.txt 2020-07-15 11:09:35 UTC (rev
76348)
@@ -14,7 +14,6 @@
tclcad_obj.c
tclcad_obj_wrapper.c
tclcad_polygons.c
- view/tclcad_views.c
view/arrows.c
view/autoview.c
view/axes.c
@@ -23,6 +22,7 @@
view/labels.c
view/lines.c
view/refresh.c
+ view/util.c
tkImgFmtPIX.c
)
Modified: brlcad/trunk/src/libtclcad/dm.c
===================================================================
--- brlcad/trunk/src/libtclcad/dm.c 2020-07-15 01:31:21 UTC (rev 76347)
+++ brlcad/trunk/src/libtclcad/dm.c 2020-07-15 11:09:35 UTC (rev 76348)
@@ -2918,6 +2918,26 @@
return BRLCAD_OK;
}
+/**
+ * @brief
+ * A TCL interface to dm_list_types()).
+ *
+ * @return a list of available dm types.
+ */
+int
+dm_list_tcl(ClientData UNUSED(clientData),
+ Tcl_Interp *interp,
+ int UNUSED(argc),
+ const char **UNUSED(argv))
+{
+ struct bu_vls *list = dm_list_types(",");
+ Tcl_SetResult(interp, bu_vls_addr(list), TCL_VOLATILE);
+ bu_vls_free(list);
+ BU_PUT(list, struct bu_vls);
+ return TCL_OK;
+}
+
+
/*
* Local Variables:
* mode: C
Modified: brlcad/trunk/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_obj.c 2020-07-15 01:31:21 UTC (rev
76347)
+++ brlcad/trunk/src/libtclcad/tclcad_obj.c 2020-07-15 11:09:35 UTC (rev
76348)
@@ -89,12 +89,6 @@
#include "brlcad_version.h"
-HIDDEN int to_autoview(struct ged *gedp,
- int argc,
- const char *argv[],
- ged_func_ptr func,
- const char *usage,
- int maxargs);
HIDDEN int to_base2local(struct ged *gedp,
int argc,
const char *argv[],
@@ -107,12 +101,6 @@
ged_func_ptr func,
const char *usage,
int maxargs);
-HIDDEN int to_blast(struct ged *gedp,
- int argc,
- const char *argv[],
- ged_func_ptr func,
- const char *usage,
- int maxargs);
HIDDEN int to_bounds(struct ged *gedp,
int argc,
const char *argv[],
@@ -962,27 +950,7 @@
{(char *)0, (char *)0, 0, TO_WRAPPER_FUNC_PTR_NULL,
GED_FUNC_PTR_NULL}
};
-
/**
- * @brief
- * A TCL interface to dm_list_types()).
- *
- * @return a list of available dm types.
- */
-int
-dm_list_tcl(ClientData UNUSED(clientData),
- Tcl_Interp *interp,
- int UNUSED(argc),
- const char **UNUSED(argv))
-{
- struct bu_vls *list = dm_list_types(",");
- Tcl_SetResult(interp, bu_vls_addr(list), TCL_VOLATILE);
- bu_vls_free(list);
- BU_PUT(list, struct bu_vls);
- return TCL_OK;
-}
-
-/**
* @brief create the Tcl command for to_open
*
*/
@@ -1317,42 +1285,6 @@
/*************************** Local Command Functions
***************************/
HIDDEN int
-to_autoview(struct ged *gedp,
- int argc,
- const char *argv[],
- ged_func_ptr UNUSED(func),
- const char *usage,
- int UNUSED(maxargs))
-{
- struct ged_dm_view *gdvp;
-
- /* initialize result */
- bu_vls_trunc(gedp->ged_result_str, 0);
-
- if (argc > 3) {
- bu_vls_printf(gedp->ged_result_str, "Usage: %s %s [scale]", argv[0],
usage);
- return GED_ERROR;
- }
-
- for (BU_LIST_FOR(gdvp, ged_dm_view,
¤t_top->to_gop->go_head_views.l)) {
- if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gdv_name), argv[1]))
- break;
- }
-
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
- bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
- return GED_ERROR;
- }
-
- if (argc > 2)
- to_autoview_view(gdvp, argv[2]);
- else
- to_autoview_view(gdvp, NULL);
-
- return GED_OK;
-}
-
-HIDDEN int
to_base2local(struct ged *gedp,
int UNUSED(argc),
const char *UNUSED(argv[]),
@@ -1442,27 +1374,6 @@
HIDDEN int
-to_blast(struct ged *gedp,
- int argc,
- const char *argv[],
- ged_func_ptr UNUSED(func),
- const char *UNUSED(usage),
- int UNUSED(maxargs))
-{
- int ret;
-
- ret = ged_blast(gedp, argc, argv);
-
- if (ret != GED_OK)
- return ret;
-
- to_autoview_all_views(current_top);
-
- return ret;
-}
-
-
-HIDDEN int
to_bounds(struct ged *gedp,
int argc,
const char *argv[],
Modified: brlcad/trunk/src/libtclcad/tclcad_private.h
===================================================================
--- brlcad/trunk/src/libtclcad/tclcad_private.h 2020-07-15 01:31:21 UTC (rev
76347)
+++ brlcad/trunk/src/libtclcad/tclcad_private.h 2020-07-15 11:09:35 UTC (rev
76348)
@@ -95,8 +95,13 @@
const char *usage,
int maxargs);
+/* Dm functions */
+extern int
+dm_list_tcl(ClientData clientData,
+ Tcl_Interp *interp,
+ int argc,
+ const char **argv);
-
/* Tclcad mouse routines */
extern int to_get_prev_mouse(struct ged *gedp,
int argc,
@@ -399,12 +404,6 @@
const char *usage);
-
-/* Tclcad view routines */
-extern fastf_t screen_to_view_x(struct dm *dmp, fastf_t x);
-extern fastf_t screen_to_view_y(struct dm *dmp, fastf_t y);
-extern int to_is_viewable(struct ged_dm_view *gdvp);
-
/* Tclcad obj wrapper routines */
extern int to_pass_through_func(struct ged *gedp,
int argc,
Modified: brlcad/trunk/src/libtclcad/view/autoview.c
===================================================================
--- brlcad/trunk/src/libtclcad/view/autoview.c 2020-07-15 01:31:21 UTC (rev
76347)
+++ brlcad/trunk/src/libtclcad/view/autoview.c 2020-07-15 11:09:35 UTC (rev
76348)
@@ -58,6 +58,43 @@
}
}
+int
+to_autoview(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr UNUSED(func),
+ const char *usage,
+ int UNUSED(maxargs))
+{
+ struct ged_dm_view *gdvp;
+
+ /* initialize result */
+ bu_vls_trunc(gedp->ged_result_str, 0);
+
+ if (argc > 3) {
+ bu_vls_printf(gedp->ged_result_str, "Usage: %s %s [scale]", argv[0],
usage);
+ return GED_ERROR;
+ }
+
+ for (BU_LIST_FOR(gdvp, ged_dm_view,
¤t_top->to_gop->go_head_views.l)) {
+ if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gdv_name), argv[1]))
+ break;
+ }
+
+ if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
+ return GED_ERROR;
+ }
+
+ if (argc > 2)
+ to_autoview_view(gdvp, argv[2]);
+ else
+ to_autoview_view(gdvp, NULL);
+
+ return GED_OK;
+}
+
+
void
to_autoview_all_views(struct tclcad_obj *top)
{
Modified: brlcad/trunk/src/libtclcad/view/draw.c
===================================================================
--- brlcad/trunk/src/libtclcad/view/draw.c 2020-07-15 01:31:21 UTC (rev
76347)
+++ brlcad/trunk/src/libtclcad/view/draw.c 2020-07-15 11:09:35 UTC (rev
76348)
@@ -445,8 +445,28 @@
return to_edit_redraw(gedp, argc, argv);
}
+int
+to_blast(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr UNUSED(func),
+ const char *UNUSED(usage),
+ int UNUSED(maxargs))
+{
+ int ret;
+ ret = ged_blast(gedp, argc, argv);
+ if (ret != GED_OK)
+ return ret;
+
+ to_autoview_all_views(current_top);
+
+ return ret;
+}
+
+
+
/*
* Local Variables:
* mode: C
Modified: brlcad/trunk/src/libtclcad/view/view.h
===================================================================
--- brlcad/trunk/src/libtclcad/view/view.h 2020-07-15 01:31:21 UTC (rev
76347)
+++ brlcad/trunk/src/libtclcad/view/view.h 2020-07-15 11:09:35 UTC (rev
76348)
@@ -44,6 +44,12 @@
const char *argv[]);
/* Autoview */
+extern int to_autoview(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs);
extern void to_autoview_view(struct ged_dm_view *gdvp, const char *scale);
extern void to_autoview_all_views(struct tclcad_obj *top);
extern int to_autoview_func(struct ged *gedp,
@@ -95,6 +101,12 @@
ged_func_ptr func,
const char *usage,
int maxargs);
+extern int to_blast(struct ged *gedp,
+ int argc,
+ const char *argv[],
+ ged_func_ptr func,
+ const char *usage,
+ int maxargs);
/* Faceplate */
extern void go_draw_faceplate(struct ged_obj *gop, struct ged_dm_view *gdvp);
@@ -160,6 +172,11 @@
extern void to_refresh_all_views(struct tclcad_obj *top);
extern void to_refresh_view(struct ged_dm_view *gdvp);
+/* Util */
+extern fastf_t screen_to_view_x(struct dm *dmp, fastf_t x);
+extern fastf_t screen_to_view_y(struct dm *dmp, fastf_t y);
+extern int to_is_viewable(struct ged_dm_view *gdvp);
+
/*
* Local Variables:
* tab-width: 8
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
