[brlcad-commits] SF.net SVN: brlcad:[76592] brlcad/branches/bioh

[starseeker--- via brlcad-commits]

Revision: 76592
          http://sourceforge.net/p/brlcad/code/76592
Author:   starseeker
Date:     2020-07-30 12:41:24 +0000 (Thu, 30 Jul 2020)
Log Message:
-----------
Shift go_more_args_callback into tclcad_ged_data

Modified Paths:
--------------
    brlcad/branches/bioh/include/tclcad.h
    brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
    brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c

Modified: brlcad/branches/bioh/include/tclcad.h
===================================================================
--- brlcad/branches/bioh/include/tclcad.h       2020-07-30 12:36:58 UTC (rev 
76591)
+++ brlcad/branches/bioh/include/tclcad.h       2020-07-30 12:41:24 UTC (rev 
76592)
@@ -135,6 +135,7 @@
 struct tclcad_ged_data {
     struct ged_obj             *gdv_gop;
     struct bu_vls      go_rt_end_callback;
+    struct bu_vls      go_more_args_callback;
 };
 
 struct tclcad_view_data {
@@ -148,7 +149,6 @@
     struct ged         *go_gedp;
     struct bview       go_head_views;
     struct bu_vls      go_name;
-    struct bu_vls      go_more_args_callback;
     struct bu_vls      *go_prim_label_list;
     int                        go_prim_label_list_size;
     int                        go_refresh_on;

Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj.c     2020-07-30 12:36:58 UTC 
(rev 76591)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj.c     2020-07-30 12:41:24 UTC 
(rev 76592)
@@ -1105,6 +1105,7 @@
        if (top->to_gop->go_gedp->u_data) {
            struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)top->to_gop->go_gedp;
            bu_vls_free(&tgd->go_rt_end_callback);
+           bu_vls_free(&tgd->go_more_args_callback);
            BU_PUT(tgd, struct tclcad_ged_data);
            top->to_gop->go_gedp->u_data = NULL;
        }
@@ -1301,12 +1302,12 @@
     struct tclcad_ged_data *tgd;
     BU_GET(tgd, struct tclcad_ged_data);
     bu_vls_init(&tgd->go_rt_end_callback);
+    bu_vls_init(&tgd->go_more_args_callback);
     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_init(&top->to_gop->go_more_args_callback);
     top->to_gop->go_refresh_on = 1;
     top->to_gop->go_edited_paths = bu_hash_create(0);
 
@@ -3969,6 +3970,7 @@
                      int UNUSED(maxargs))
 {
     register int i;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
 
     /* initialize result */
     bu_vls_trunc(gedp->ged_result_str, 0);
@@ -3975,15 +3977,15 @@
 
     /* get the callback string */
     if (argc == 1) {
-       bu_vls_printf(gedp->ged_result_str, "%s", 
bu_vls_addr(&current_top->to_gop->go_more_args_callback));
+       bu_vls_printf(gedp->ged_result_str, "%s", 
bu_vls_addr(&tgd->go_more_args_callback));
 
        return GED_OK;
     }
 
     /* set the callback string */
-    bu_vls_trunc(&current_top->to_gop->go_more_args_callback, 0);
+    bu_vls_trunc(&tgd->go_more_args_callback, 0);
     for (i = 1; i < argc; ++i)
-       bu_vls_printf(&current_top->to_gop->go_more_args_callback, "%s ", 
argv[i]);
+       bu_vls_printf(&tgd->go_more_args_callback, "%s ", argv[i]);
 
     return GED_OK;
 }

Modified: brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c
===================================================================
--- brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c     2020-07-30 
12:36:58 UTC (rev 76591)
+++ brlcad/branches/bioh/src/libtclcad/tclcad_obj_wrapper.c     2020-07-30 
12:41:24 UTC (rev 76592)
@@ -107,6 +107,7 @@
     char **av;
     struct bu_vls callback_cmd = BU_VLS_INIT_ZERO;
     struct bu_vls temp = BU_VLS_INIT_ZERO;
+    struct tclcad_ged_data *tgd = (struct tclcad_ged_data 
*)current_top->to_gop->go_gedp->u_data;
 
     ac = argc;
     total_ac = ac + 1;
@@ -125,10 +126,10 @@
        const char **avmp;
        const char **av_more = NULL;
 
-       if (0 < bu_vls_strlen(&current_top->to_gop->go_more_args_callback)) {
+       if (0 < bu_vls_strlen(&tgd->go_more_args_callback)) {
            bu_vls_trunc(&callback_cmd, 0);
            bu_vls_printf(&callback_cmd, "%s [string range {%s} 0 end]",
-                         
bu_vls_addr(&current_top->to_gop->go_more_args_callback),
+                         bu_vls_addr(&tgd->go_more_args_callback),
                          bu_vls_addr(gedp->ged_result_str));
 
            if (Tcl_Eval(current_top->to_interp, bu_vls_addr(&callback_cmd)) != 
TCL_OK) {

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits