Revision: 76599
http://sourceforge.net/p/brlcad/code/76599
Author: starseeker
Date: 2020-07-30 14:50:19 +0000 (Thu, 30 Jul 2020)
Log Message:
-----------
move the bview list to struct ged. This should set the stage for removing
ged_obj completely.
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/fb.c
brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c
brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c
brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c
brlcad/branches/bioh/src/libtclcad/view/arrows.c
brlcad/branches/bioh/src/libtclcad/view/autoview.c
brlcad/branches/bioh/src/libtclcad/view/axes.c
brlcad/branches/bioh/src/libtclcad/view/faceplate.c
brlcad/branches/bioh/src/libtclcad/view/labels.c
brlcad/branches/bioh/src/libtclcad/view/lines.c
brlcad/branches/bioh/src/libtclcad/view/refresh.c
Modified: brlcad/branches/bioh/include/ged/defines.h
===================================================================
--- brlcad/branches/bioh/include/ged/defines.h 2020-07-30 13:38:25 UTC (rev
76598)
+++ brlcad/branches/bioh/include/ged/defines.h 2020-07-30 14:50:19 UTC (rev
76599)
@@ -194,6 +194,10 @@
struct bu_list l;
struct bu_vls go_name;
struct rt_wdb *ged_wdbp;
+
+ // The full set of views associated with this ged object
+ struct bview go_head_views;
+
void *u_data; /**< @brief User data associated with
this ged instance */
/** for catching log messages */
Modified: brlcad/branches/bioh/include/tclcad.h
===================================================================
--- brlcad/branches/bioh/include/tclcad.h 2020-07-30 13:38:25 UTC (rev
76598)
+++ brlcad/branches/bioh/include/tclcad.h 2020-07-30 14:50:19 UTC (rev
76599)
@@ -161,7 +161,6 @@
struct ged_obj {
struct ged *go_gedp;
- struct bview go_head_views;
};
#define GED_OBJ_NULL ((struct ged_obj *)0)
Modified: brlcad/branches/bioh/src/libged/ged.c
===================================================================
--- brlcad/branches/bioh/src/libged/ged.c 2020-07-30 13:38:25 UTC (rev
76598)
+++ brlcad/branches/bioh/src/libged/ged.c 2020-07-30 14:50:19 UTC (rev
76599)
@@ -156,6 +156,20 @@
bu_vls_free(&gedp->go_name);
+ // Note - it is the caller's responsibility to have freed any data
+ // associated with the ged or its views in the u_data pointers.
+ //
+ // Since libged does not link libdm, it's also the responsibility of the
+ // caller to close any display managers associated with the view.
+ struct bview *gdvp;
+ while (BU_LIST_WHILE(gdvp, bview, &gedp->go_head_views.l)) {
+ BU_LIST_DEQUEUE(&(gdvp->l));
+ bu_vls_free(&gdvp->gv_name);
+ bu_ptbl_free(gdvp->callbacks);
+ BU_PUT(gdvp->callbacks, struct bu_ptbl);
+ bu_free((void *)gdvp, "bview");
+ }
+
if (gedp->ged_gdp != GED_DRAWABLE_NULL) {
if (gedp->ged_gdp->gd_headDisplay)
BU_PUT(gedp->ged_gdp->gd_headDisplay, struct bu_vls);
@@ -211,6 +225,9 @@
// TODO - rename to ged_name
bu_vls_init(&gedp->go_name);
+ // TODO - rename to ged_views
+ BU_LIST_INIT(&gedp->go_head_views.l);
+
BU_GET(gedp->ged_log, struct bu_vls);
bu_vls_init(gedp->ged_log);
Modified: brlcad/branches/bioh/src/libtclcad/fb.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/fb.c 2020-07-30 13:38:25 UTC (rev
76598)
+++ brlcad/branches/bioh/src/libtclcad/fb.c 2020-07-30 14:50:19 UTC (rev
76599)
@@ -985,12 +985,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1047,12 +1047,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c 2020-07-30 13:38:25 UTC
(rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_mouse.c 2020-07-30 14:50:19 UTC
(rev 76599)
@@ -57,12 +57,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -103,12 +103,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -179,7 +179,7 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
@@ -289,7 +289,7 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
@@ -392,12 +392,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -506,12 +506,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -617,12 +617,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -683,12 +683,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -748,12 +748,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -814,12 +814,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -881,12 +881,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -943,7 +943,7 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
@@ -1051,7 +1051,7 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
@@ -1206,12 +1206,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1307,12 +1307,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1424,12 +1424,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "%s: View not found - %s", cmd,
argv[1]);
return GED_ERROR;
}
@@ -1595,12 +1595,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "%s: View not found - %s", cmd,
argv[1]);
return GED_ERROR;
}
@@ -1710,12 +1710,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1809,12 +1809,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1921,12 +1921,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2033,12 +2033,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2191,12 +2191,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2370,12 +2370,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2515,12 +2515,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2702,12 +2702,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2862,12 +2862,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2934,12 +2934,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3028,12 +3028,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3114,12 +3114,12 @@
return GED_ERROR; \
} \
\
- for (BU_LIST_FOR((_gdvp), bview,
¤t_top->to_gop->go_head_views.l)) { \
+ for (BU_LIST_FOR((_gdvp), bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) { \
if (BU_STR_EQUAL(bu_vls_addr(&(_gdvp)->gv_name), (_argv)[1])) \
break; \
} \
\
- if (BU_LIST_IS_HEAD(&(_gdvp)->l,
¤t_top->to_gop->go_head_views.l)) { \
+ if (BU_LIST_IS_HEAD(&(_gdvp)->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) { \
bu_vls_printf(gedp->ged_result_str, "View not found - %s",
(_argv)[1]); \
return GED_ERROR; \
} \
@@ -3189,12 +3189,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3345,12 +3345,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3440,12 +3440,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3541,12 +3541,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3639,12 +3639,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-07-30 13:38:25 UTC
(rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj.c 2020-07-30 14:50:19 UTC
(rev 76599)
@@ -1084,7 +1084,6 @@
}
}
-
/**
* @brief
* Called by Tcl when the object is destroyed.
@@ -1093,32 +1092,54 @@
to_deleteProc(ClientData clientData)
{
struct tclcad_obj *top = (struct tclcad_obj *)clientData;
- struct tclcad_ged_data *tgd = (struct tclcad_ged_data
*)top->to_gop->go_gedp;
- struct bview *gdvp;
+ BU_LIST_DEQUEUE(&top->l);
if (current_top == top)
current_top = TCLCAD_OBJ_NULL;
- BU_LIST_DEQUEUE(&top->l);
- ged_close(top->to_gop->go_gedp);
if (top->to_gop->go_gedp) {
+
+ // Clean up the libtclcad view data.
+ struct bview *gdvp = NULL;
+ for (BU_LIST_FOR(gdvp, bview, &top->to_gop->go_gedp->go_head_views.l)) {
+
+ // There is a top level command created in the Tcl interp that is
the name
+ // of the dm. Clear that command.
+ const char *dm_tcl_cmd = bu_vls_cstr(dm_get_pathname((struct dm
*)gdvp->dmp));
+ Tcl_DeleteCommand(top->to_interp, dm_tcl_cmd);
+
+ // Close the dm. This is not done by libged because libged only
manages the
+ // data bview knows about. From bview's perspective, dmp is just a
pointer
+ // to an opaque data structure it knows nothing about.
+ (void)dm_close((struct dm *)gdvp->dmp);
+
+ // Delete libtclcad specific parts of data - ged_free (called by
+ // ged_close) will handle freeing the primary bview list entries.
+ struct tclcad_view_data *tvd = (struct tclcad_view_data
*)gdvp->u_data;
+ if (tvd) {
+ bu_vls_free(&tvd->gdv_edit_motion_delta_callback);
+ bu_vls_free(&tvd->gdv_callback);
+ BU_PUT(tvd, struct tclcad_view_data);
+ gdvp->u_data = NULL;
+ }
+
+ }
+
+ // Clean up the other libtclcad data
if (top->to_gop->go_gedp->u_data) {
+ struct tclcad_ged_data *tgd = (struct tclcad_ged_data
*)top->to_gop->go_gedp->u_data;
bu_vls_free(&tgd->go_rt_end_callback);
bu_vls_free(&tgd->go_more_args_callback);
+ free_path_edit_params(tgd->go_edited_paths);
+ bu_hash_destroy(tgd->go_edited_paths);
BU_PUT(tgd, struct tclcad_ged_data);
top->to_gop->go_gedp->u_data = NULL;
}
- BU_PUT(top->to_gop->go_gedp, struct ged);
- }
- free_path_edit_params(tgd->go_edited_paths);
- bu_hash_destroy(tgd->go_edited_paths);
+ // Got the libtclcad cleanup done, have libged do its up.
+ ged_close(top->to_gop->go_gedp);
- while (BU_LIST_WHILE(gdvp, bview, &top->to_gop->go_head_views.l)) {
- /* This removes the view related command and results in a call
- * to to_deleteViewProc to release resources.
- */
- Tcl_DeleteCommand(top->to_interp, bu_vls_addr(dm_get_pathname((struct
dm *)gdvp->dmp)));
+ BU_PUT(top->to_gop->go_gedp, struct ged);
}
bu_free((void *)top, "struct ged_obj");
@@ -1309,8 +1330,6 @@
bu_vls_strcpy(&top->to_gop->go_gedp->go_name, argv[1]);
- BU_LIST_INIT(&top->to_gop->go_head_views.l);
-
/* append to list of tclcad_obj */
BU_LIST_APPEND(&HeadTclcadObj.l, &top->l);
@@ -1362,12 +1381,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1437,12 +1456,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1506,12 +1525,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1579,12 +1598,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1648,12 +1667,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1874,12 +1893,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2280,12 +2299,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2378,12 +2397,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2475,12 +2494,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2877,12 +2896,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -2906,28 +2925,6 @@
HIDDEN void
-to_deleteViewProc(ClientData clientData)
-{
- struct bview *gdvp = (struct bview *)clientData;
-
- BU_LIST_DEQUEUE(&(gdvp->l));
- bu_vls_free(&gdvp->gv_name);
-
-
- struct tclcad_view_data *tvd = (struct tclcad_view_data *)gdvp->u_data;
- bu_vls_free(&tvd->gdv_edit_motion_delta_callback);
- bu_vls_free(&tvd->gdv_callback);
- BU_PUT(tvd, struct tclcad_view_data);
-
- (void)dm_close((struct dm *)gdvp->dmp);
- bu_ptbl_free(gdvp->callbacks);
- BU_PUT(gdvp->callbacks, struct bu_ptbl);
- to_close_fbs(gdvp);
- bu_free((void *)gdvp, "bview");
-}
-
-
-HIDDEN void
to_init_default_bindings(struct bview *gdvp)
{
struct bu_vls bindings = BU_VLS_INIT_ZERO;
@@ -3255,12 +3252,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3418,12 +3415,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3458,18 +3455,16 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
- to_deleteViewProc(gdvp);
-
return GED_OK;
}
@@ -3532,12 +3527,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3672,12 +3667,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3777,12 +3772,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -3828,7 +3823,7 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l))
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l))
bu_vls_printf(gedp->ged_result_str, "%s ", bu_vls_addr(&gdvp->gv_name));
return GED_OK;
@@ -3863,7 +3858,7 @@
{
struct bview *gdvp;
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
gedp->ged_gvp = gdvp;
(*func)(gedp, argc, (const char **)argv);
}
@@ -3941,12 +3936,12 @@
return GED_HELP;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -4037,12 +4032,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -4100,12 +4095,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -4219,12 +4214,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "%s: View not found - %s", argv[0],
argv[1]);
return GED_ERROR;
}
@@ -4283,12 +4278,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "%s: View not found - %s", argv[0],
argv[1]);
return GED_ERROR;
}
@@ -4349,12 +4344,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -4412,12 +4407,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -4590,7 +4585,7 @@
bu_vls_printf(&new_gdvp->gv_name, "%s", argv[name_index]);
ged_view_init(new_gdvp);
- BU_LIST_INSERT(¤t_top->to_gop->go_head_views.l, &new_gdvp->l);
+ BU_LIST_INSERT(¤t_top->to_gop->go_gedp->go_head_views.l,
&new_gdvp->l);
new_gdvp->gv_point_scale = 1.0;
new_gdvp->gv_curve_scale = 1.0;
@@ -4623,7 +4618,7 @@
bu_vls_addr(dm_get_pathname((struct dm
*)new_gdvp->dmp)),
(Tcl_CmdProc *)to_view_cmd,
(ClientData)new_gdvp,
- to_deleteViewProc);
+ NULL);
}
bu_vls_printf(gedp->ged_result_str, "%s", bu_vls_addr(&new_gdvp->gv_name));
@@ -4659,12 +4654,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -4721,12 +4716,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -4784,12 +4779,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -4841,12 +4836,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -4896,12 +4891,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -4986,12 +4981,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5092,12 +5087,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5181,12 +5176,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5245,12 +5240,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5412,12 +5407,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5475,12 +5470,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5538,12 +5533,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5601,12 +5596,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5662,12 +5657,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5724,12 +5719,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5779,12 +5774,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5829,12 +5824,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -5885,12 +5880,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -6016,12 +6011,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -6074,12 +6069,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -6127,12 +6122,12 @@
return GED_HELP;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -6180,12 +6175,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -6250,12 +6245,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -6301,12 +6296,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -6379,12 +6374,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -6463,12 +6458,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -6523,12 +6518,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -6566,7 +6561,7 @@
register int first = 1;
struct tclcad_ged_data *tgd = (struct tclcad_ged_data
*)current_top->to_gop->go_gedp->u_data;
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (tgd->go_dlist_on && to_is_viewable(gdvp)) {
(void)dm_make_current((struct dm *)gdvp->dmp);
@@ -6614,7 +6609,7 @@
struct bview *gdvp;
struct tclcad_ged_data *tgd = (struct tclcad_ged_data
*)current_top->to_gop->go_gedp->u_data;
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (tgd->go_dlist_on && to_is_viewable(gdvp)) {
(void)dm_make_current((struct dm *)gdvp->dmp);
(void)dm_free_dlists((struct dm *)gdvp->dmp, dlist, range);
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c 2020-07-30
13:38:25 UTC (rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c 2020-07-30
14:50:19 UTC (rev 76599)
@@ -67,7 +67,7 @@
if (!rflag && ret == GED_OK && strlen(bu_vls_addr(gedp->ged_result_str))
== 0)
aflag = 1;
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (to_is_viewable(gdvp)) {
gedp->ged_gvp->gv_x_samples = dm_get_width((struct dm *)gdvp->dmp);
gedp->ged_gvp->gv_y_samples = dm_get_height((struct dm *)gdvp->dmp);
@@ -270,12 +270,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -394,12 +394,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c 2020-07-30
13:38:25 UTC (rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_polygons.c 2020-07-30
14:50:19 UTC (rev 76599)
@@ -1060,12 +1060,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1140,12 +1140,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1414,12 +1414,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1486,12 +1486,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1577,12 +1577,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -1737,12 +1737,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/view/arrows.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/arrows.c 2020-07-30 13:38:25 UTC
(rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/view/arrows.c 2020-07-30 14:50:19 UTC
(rev 76599)
@@ -96,12 +96,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/view/autoview.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/autoview.c 2020-07-30 13:38:25 UTC
(rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/view/autoview.c 2020-07-30 14:50:19 UTC
(rev 76599)
@@ -77,12 +77,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -101,7 +101,7 @@
{
struct bview *gdvp;
- for (BU_LIST_FOR(gdvp, bview, &top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview, &top->to_gop->go_gedp->go_head_views.l)) {
to_autoview_view(gdvp, NULL);
}
}
Modified: brlcad/branches/bioh/src/libtclcad/view/axes.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/axes.c 2020-07-30 13:38:25 UTC
(rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/view/axes.c 2020-07-30 14:50:19 UTC
(rev 76599)
@@ -503,12 +503,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -720,12 +720,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
@@ -782,12 +782,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/view/faceplate.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/faceplate.c 2020-07-30 13:38:25 UTC
(rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/view/faceplate.c 2020-07-30 14:50:19 UTC
(rev 76599)
@@ -56,12 +56,12 @@
if (argc < 4 || 7 < argc)
goto bad;
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/view/labels.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/labels.c 2020-07-30 13:38:25 UTC
(rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/view/labels.c 2020-07-30 14:50:19 UTC
(rev 76599)
@@ -96,12 +96,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/view/lines.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/lines.c 2020-07-30 13:38:25 UTC
(rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/view/lines.c 2020-07-30 14:50:19 UTC
(rev 76599)
@@ -134,12 +134,12 @@
return GED_ERROR;
}
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), argv[1]))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", argv[1]);
return GED_ERROR;
}
Modified: brlcad/branches/bioh/src/libtclcad/view/refresh.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/view/refresh.c 2020-07-30 13:38:25 UTC
(rev 76598)
+++ brlcad/branches/bioh/src/libtclcad/view/refresh.c 2020-07-30 14:50:19 UTC
(rev 76599)
@@ -155,7 +155,7 @@
{
struct bview *gdvp;
- for (BU_LIST_FOR(gdvp, bview, &top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview, &top->to_gop->go_gedp->go_head_views.l)) {
to_refresh_view(gdvp);
}
}
@@ -247,12 +247,12 @@
{
struct bview *gdvp;
- for (BU_LIST_FOR(gdvp, bview, ¤t_top->to_gop->go_head_views.l)) {
+ for (BU_LIST_FOR(gdvp, bview,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
if (BU_STR_EQUAL(bu_vls_addr(&gdvp->gv_name), name))
break;
}
- if (BU_LIST_IS_HEAD(&gdvp->l, ¤t_top->to_gop->go_head_views.l)) {
+ if (BU_LIST_IS_HEAD(&gdvp->l,
¤t_top->to_gop->go_gedp->go_head_views.l)) {
bu_vls_printf(gedp->ged_result_str, "View not found - %s", name);
return GED_ERROR;
}
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
