Revision: 76593
http://sourceforge.net/p/brlcad/code/76593
Author: starseeker
Date: 2020-07-30 12:57:45 +0000 (Thu, 30 Jul 2020)
Log Message:
-----------
Shift the name back up to the struct ged
Modified Paths:
--------------
brlcad/branches/bioh/include/ged/defines.h
brlcad/branches/bioh/include/tclcad.h
brlcad/branches/bioh/src/libged/ged.c
brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c
brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c
Modified: brlcad/branches/bioh/include/ged/defines.h
===================================================================
--- brlcad/branches/bioh/include/ged/defines.h 2020-07-30 12:41:24 UTC (rev
76592)
+++ brlcad/branches/bioh/include/ged/defines.h 2020-07-30 12:57:45 UTC (rev
76593)
@@ -192,6 +192,7 @@
struct ged {
struct bu_list l;
+ struct bu_vls go_name;
struct rt_wdb *ged_wdbp;
void *u_data; /**< @brief User data associated with
this ged instance */
Modified: brlcad/branches/bioh/include/tclcad.h
===================================================================
--- brlcad/branches/bioh/include/tclcad.h 2020-07-30 12:41:24 UTC (rev
76592)
+++ brlcad/branches/bioh/include/tclcad.h 2020-07-30 12:57:45 UTC (rev
76593)
@@ -148,7 +148,7 @@
struct ged_obj {
struct ged *go_gedp;
struct bview go_head_views;
- struct bu_vls go_name;
+ //struct bu_vls go_name;
struct bu_vls *go_prim_label_list;
int go_prim_label_list_size;
int go_refresh_on;
Modified: brlcad/branches/bioh/src/libged/ged.c
===================================================================
--- brlcad/branches/bioh/src/libged/ged.c 2020-07-30 12:41:24 UTC (rev
76592)
+++ brlcad/branches/bioh/src/libged/ged.c 2020-07-30 12:57:45 UTC (rev
76593)
@@ -154,6 +154,8 @@
gedp->ged_wdbp = RT_WDB_NULL;
+ bu_vls_free(&gedp->go_name);
+
if (gedp->ged_gdp != GED_DRAWABLE_NULL) {
if (gedp->ged_gdp->gd_headDisplay)
BU_PUT(gedp->ged_gdp->gd_headDisplay, struct bu_vls);
@@ -206,6 +208,9 @@
BU_LIST_INIT(&gedp->l);
gedp->ged_wdbp = RT_WDB_NULL;
+ // TODO - rename to ged_name
+ bu_vls_init(&gedp->go_name);
+
BU_GET(gedp->ged_log, struct bu_vls);
bu_vls_init(gedp->ged_log);
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c 2020-07-30 12:41:24 UTC
(rev 76592)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c 2020-07-30 12:57:45 UTC
(rev 76593)
@@ -252,10 +252,10 @@
bu_vls_printf(&bindings, "bind %s <Motion> {%s
mouse_brep_selection_translate %s %s %%x %%y; "
"%s brep %s plot SCV}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
brep_name,
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
brep_name);
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
}
@@ -1015,7 +1015,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s
mouse_joint_selection_translate %s %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
joint_name);
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-07-30 12:41:24 UTC
(rev 76592)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-07-30 12:57:45 UTC
(rev 76593)
@@ -1099,7 +1099,6 @@
current_top = TCLCAD_OBJ_NULL;
BU_LIST_DEQUEUE(&top->l);
- bu_vls_free(&top->to_gop->go_name);
ged_close(top->to_gop->go_gedp);
if (top->to_gop->go_gedp) {
if (top->to_gop->go_gedp->u_data) {
@@ -1233,7 +1232,7 @@
if (argc == 1) {
/* get list of database objects */
for (BU_LIST_FOR(top, tclcad_obj, &HeadTclcadObj.l))
- Tcl_AppendResult(interp, bu_vls_addr(&top->to_gop->go_name), " ",
(char *)NULL);
+ Tcl_AppendResult(interp,
bu_vls_addr(&top->to_gop->go_gedp->go_name), " ", (char *)NULL);
return TCL_OK;
}
@@ -1306,8 +1305,7 @@
tgd->gdv_gop = top->to_gop;
gedp->u_data = (void *)tgd;
- bu_vls_init(&top->to_gop->go_name);
- bu_vls_strcpy(&top->to_gop->go_name, argv[1]);
+ bu_vls_strcpy(&top->to_gop->go_gedp->go_name, argv[1]);
top->to_gop->go_refresh_on = 1;
top->to_gop->go_edited_paths = bu_hash_create(0);
@@ -1611,7 +1609,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_constrain_rot %s
%s %%x %%y}; break",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2]);
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -1680,7 +1678,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_constrain_trans %s
%s %%x %%y}; break",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2]);
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -1743,7 +1741,7 @@
bu_vls_strcpy(&from_vls, cp+1);
for (BU_LIST_FOR(top, tclcad_obj, &HeadTclcadObj.l)) {
- if (BU_STR_EQUAL(bu_vls_addr(&top->to_gop->go_name),
bu_vls_addr(&db_vls))) {
+ if (BU_STR_EQUAL(bu_vls_addr(&top->to_gop->go_gedp->go_name),
bu_vls_addr(&db_vls))) {
from_gedp = top->to_gop->go_gedp;
break;
}
@@ -1768,7 +1766,7 @@
bu_vls_strcpy(&to_vls, cp+1);
for (BU_LIST_FOR(top, tclcad_obj, &HeadTclcadObj.l)) {
- if (BU_STR_EQUAL(bu_vls_addr(&top->to_gop->go_name),
bu_vls_addr(&db_vls))) {
+ if (BU_STR_EQUAL(bu_vls_addr(&top->to_gop->go_gedp->go_name),
bu_vls_addr(&db_vls))) {
to_gedp = top->to_gop->go_gedp;
break;
}
@@ -2929,7 +2927,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Configure> {%s configure %s; break};
",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Enter> {focus %s; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
@@ -2936,45 +2934,45 @@
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)));
bu_vls_printf(&bindings, "bind %s <Expose> {%s handle_expose %s %%c;
break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "catch {wm protocol %s WM_DELETE_WINDOW {%s
delete_view %s; break}}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
/* Mouse Bindings */
bu_vls_printf(&bindings, "bind %s <2> {%s vslew %s %%x %%y; focus %s;
break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)));
bu_vls_printf(&bindings, "bind %s <1> {%s zoom %s 0.5; focus %s;
break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)));
bu_vls_printf(&bindings, "bind %s <3> {%s zoom %s 2.0; focus %s;
break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)));
#ifdef DM_X
bu_vls_printf(&bindings, "bind %s <4> {%s zoom %s 1.1; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <5> {%s zoom %s 0.9; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
#endif
#ifdef DM_WGL
bu_vls_printf(&bindings, "bind %s <MouseWheel> {if {%%D < 0} {%s zoom
%s 0.9} else {%s zoom %s 1.1}; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
#endif
@@ -2981,203 +2979,203 @@
/* Idle Mode */
bu_vls_printf(&bindings, "bind %s <ButtonRelease> {%s idle_mode %s}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <KeyRelease-Control_L> {%s idle_mode
%s}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <KeyRelease-Control_R> {%s idle_mode
%s}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <KeyRelease-Shift_L> {%s idle_mode
%s}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <KeyRelease-Shift_R> {%s idle_mode
%s}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <KeyRelease-Alt_L> {%s idle_mode %s;
break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <KeyRelease-Alt_R> {%s idle_mode %s;
break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
/* Rotate Mode */
bu_vls_printf(&bindings, "bind %s <Control-ButtonRelease-1> {%s
idle_mode %s}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Control-ButtonPress-1> {%s
rotate_mode %s %%x %%y}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Control-ButtonPress-2> {%s
rotate_mode %s %%x %%y}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Control-ButtonPress-3> {%s
rotate_mode %s %%x %%y}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
/* Translate Mode */
bu_vls_printf(&bindings, "bind %s <Shift-ButtonRelease-1> {%s idle_mode
%s}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Shift-ButtonPress-1> {%s
translate_mode %s %%x %%y}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Shift-ButtonPress-2> {%s
translate_mode %s %%x %%y}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Shift-ButtonPress-3> {%s
translate_mode %s %%x %%y}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
/* Scale Mode */
bu_vls_printf(&bindings, "bind %s <Control-Shift-ButtonRelease-1> {%s
idle_mode %s}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Control-Shift-ButtonPress-1> {%s
scale_mode %s %%x %%y}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Control-Shift-ButtonPress-2> {%s
scale_mode %s %%x %%y}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Control-Shift-ButtonPress-3> {%s
scale_mode %s %%x %%y}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
/* Constrained Rotate Mode */
bu_vls_printf(&bindings, "bind %s <Control-Lock-ButtonRelease-1> {%s
idle_mode %s}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Control-Lock-ButtonPress-1> {%s
constrain_rmode %s x %%x %%y; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Control-Lock-ButtonPress-2> {%s
constrain_rmode %s y %%x %%y; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Control-Lock-ButtonPress-3> {%s
constrain_rmode %s z %%x %%y; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
/* Constrained Translate Mode */
bu_vls_printf(&bindings, "bind %s <Shift-Lock-ButtonRelease-1> {%s
idle_mode %s; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Shift-Lock-ButtonPress-1> {%s
constrain_tmode %s x %%x %%y; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Shift-Lock-ButtonPress-2> {%s
constrain_tmode %s y %%x %%y; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Shift-Lock-ButtonPress-3> {%s
constrain_tmode %s z %%x %%y; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
/* Key Bindings */
bu_vls_printf(&bindings, "bind %s 3 {%s aet %s 35 25; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s 4 {%s aet %s 45 45; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s f {%s aet %s 0 0; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s F {%s aet %s 0 0; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s R {%s aet %s 180 0; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s r {%s aet %s 270 0; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s l {%s aet %s 90 0; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s L {%s aet %s 90 0; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s t {%s aet %s 270 90; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s T {%s aet %s 270 90; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s b {%s aet %s 270 -90; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s B {%s aet %s 270 -90; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s + {%s zoom %s 2.0; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s = {%s zoom %s 2.0; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s _ {%s zoom %s 0.5; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s - {%s zoom %s 0.5; break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Key-Left> {%s rot %s -v 0 1 0;
break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Key-Right> {%s rot %s -v 0 -1 0;
break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Key-Up> {%s rot %s -v 1 0 0; break};
",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
bu_vls_printf(&bindings, "bind %s <Key-Down> {%s rot %s -v -1 0 0;
break}; ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
@@ -4052,7 +4050,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_move_arb_edge %s
%s %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2],
argv[3]);
@@ -4115,7 +4113,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_move_arb_face %s
%s %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2],
argv[3]);
@@ -4234,7 +4232,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_bot_move_pnt -r %s
%s %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2],
argv[3]);
@@ -4298,7 +4296,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_bot_move_pnts %s
%%x %%y %s ",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[4]);
}
@@ -4364,7 +4362,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_metaball_move_pnt
%s %s %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2],
argv[3]);
@@ -4427,7 +4425,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_pipe_move_pnt %s
%s %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2],
argv[3]);
@@ -4604,7 +4602,7 @@
if (dm_get_pathname((struct dm *)new_gdvp->dmp)) {
bu_vls_printf(&event_vls, "event generate %s <Configure>; %s autoview
%s",
bu_vls_addr(dm_get_pathname((struct dm *)new_gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&new_gdvp->gv_name));
Tcl_Eval(current_top->to_interp, bu_vls_addr(&event_vls));
}
@@ -4674,7 +4672,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_orotate %s %s %%x
%%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2]);
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -4736,7 +4734,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_oscale %s %s %%x
%%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2]);
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -4799,7 +4797,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_otranslate %s %s
%%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2]);
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
@@ -5133,7 +5131,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_rect %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
}
@@ -5196,7 +5194,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_rotate_arb_face %s
%s %s %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2],
argv[3],
@@ -5260,7 +5258,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_rot %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
}
@@ -5427,7 +5425,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_protate %s %s %s
%%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2],
argv[3]);
@@ -5490,7 +5488,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_pscale %s %s %s
%%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2],
argv[3]);
@@ -5553,7 +5551,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_ptranslate %s %s
%s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name),
argv[2],
argv[3]);
@@ -5616,7 +5614,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_data_scale %s %%x
%%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
}
@@ -5677,7 +5675,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_scale %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
}
@@ -6031,7 +6029,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_trans %s %%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
}
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c 2020-07-30
12:41:24 UTC (rev 76592)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c 2020-07-30
12:57:45 UTC (rev 76593)
@@ -1153,7 +1153,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_poly_circ %s %%x
%%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
}
@@ -1315,7 +1315,7 @@
if (doBind && dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_poly_cont %s
%%x %%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
Tcl_Eval(interp, bu_vls_addr(&bindings));
}
@@ -1584,7 +1584,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_poly_ell %s %%x
%%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
}
@@ -1742,7 +1742,7 @@
if (dm_get_pathname((struct dm *)gdvp->dmp)) {
bu_vls_printf(&bindings, "bind %s <Motion> {%s mouse_poly_rect %s %%x
%%y}",
bu_vls_addr(dm_get_pathname((struct dm *)gdvp->dmp)),
- bu_vls_addr(¤t_top->to_gop->go_name),
+ bu_vls_addr(¤t_top->to_gop->go_gedp->go_name),
bu_vls_addr(&gdvp->gv_name));
Tcl_Eval(current_top->to_interp, bu_vls_addr(&bindings));
}
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
