Changeset 3072

Timestamp:

Jun 29, 2012, 3:09:38 PM (12 years ago)

Author:

gah

Message:

fixes for drawingentry

Location:

trunk/gui

Files:

• scripts/drawingentry.tcl (modified) (6 diffs)
• scripts/vtkviewer.tcl (modified) (5 diffs)
• src/RpCanvHotspot.c (modified) (3 diffs)

trunk/gui/scripts/drawingentry.tcl

@@ -28 +28 @@
     private variable _drawingWidth 0
     private variable _owner
-    private variable _parser ""
+    private variable _parser "";        # Slave interpreter where all 
+                                        # substituted variables are stored.
     private variable _path
     private variable _showing ""
@@ -41 +42 @@
     private variable _cursor ""
 
-    constructor {owner path args} { # defined below }
-
+    constructor {owner path args} { 
+        # defined below 
+    }
+    destructor {} {
+        # defined below
+    }
     public method value { args }
     public method label {}
@@ -102 +107 @@
     pack $itk_component(drawing) -expand yes -fill both
     bind $itk_component(drawing) <Configure> [itcl::code $this Redraw]
+    set _parser [interp create -safe]
     Redraw
     eval itk_initialize $args
 }
 
+itcl::body Rappture::DrawingEntry::destructor {} {
+    if { $_parser != "" } {
+        $_parser delete 
+    }
+}
 # ----------------------------------------------------------------------
 # USAGE: label
@@ -645 +656 @@
     set id [eval $c create hotspot $coords]
     set _cname2id($cname) $id
+    set options(-interp) $_parser
     eval $c itemconfigure $id [array get options]
     if { $hotspot == "inline" } {
@@ -964 +976 @@
 itcl::body Rappture::DrawingEntry::InitSubstitutions {} {
     # Load a new parser with the variables representing the substitution
-    set _parser [interp create -safe]
     foreach name [array names _name2path] {
         set path $_name2path($name)
@@ -974 +985 @@
         }
         $_parser eval [list set $name $value]
-        set ::$name $value
     }
 }

trunk/gui/scripts/vtkviewer.tcl

@@ -1172 +1172 @@
             foreach dataset [CurrentDatasets -visible $_first] {
                 SendCmd "polydata opacity $sval $dataset"
+                if { $_haveGlyphs } {
+                    SendCmd "glyphs opacity $sval $dataset"
+                }
             }
         }
@@ -1178 +1181 @@
             foreach dataset [CurrentDatasets -visible $_first] {
                 SendCmd "polydata wireframe $bool $dataset"
+                if { $_haveGlyphs } {
+                    SendCmd "glyphs wireframe $bool $dataset"
+                }
             }
         }
@@ -1183 +1189 @@
             set bool $_volume(visible)
             foreach dataset [CurrentDatasets -visible $_first] {
+                if { $_haveGlyphs } {
+                    SendCmd "glyphs visible $bool $dataset"
+                }
                 SendCmd "polydata visible $bool $dataset"
             }
@@ -1189 +1198 @@
             set bool $_volume(lighting)
             foreach dataset [CurrentDatasets -visible $_first] {
+                if { $_haveGlyphs } {
+                    SendCmd "glyphs lighting $bool $dataset"
+                }
                 SendCmd "polydata lighting $bool $dataset"
             }
@@ -1195 +1207 @@
             set bool $_volume(edges)
             foreach dataset [CurrentDatasets -visible $_first] {
+                if { $_haveGlyphs } {
+                    SendCmd "glyphs edges $bool $dataset"
+                }
                 SendCmd "polydata edges $bool $dataset"
             }

trunk/gui/src/RpCanvHotspot.c

@@ -156 +156 @@
 };
 
+static Tk_OptionParseProc ValueInterpParseProc;
+static Tk_OptionPrintProc ValueInterpPrintProc;
+static Tk_CustomOption interpOption = {
+    (Tk_OptionParseProc *)ValueInterpParseProc, ValueInterpPrintProc, 
+    (ClientData) NULL
+};
+
 static Tk_ConfigSpec configSpecs[] = {
     {TK_CONFIG_BORDER, "-activebackground", (char *)NULL, (char*)NULL,
@@ -177 +184 @@
     {TK_CONFIG_COLOR, "-foreground", "foreground", (char*)NULL,
         "black", Tk_Offset(HotspotItem, textColor), 0},
+    {TK_CONFIG_CUSTOM, "-interp", (char*)NULL, (char*)NULL, (char*)NULL, 
+        Tk_Offset(HotspotItem, valueInterp), TK_CONFIG_NULL_OK, &interpOption},
     {TK_CONFIG_FONT, "-valuefont", (char*)NULL, (char*)NULL,
         "helvetica -12 bold", Tk_Offset(HotspotItem, valueFont), 0},
@@ -466 +475 @@
 
 
+/*
+ *----------------------------------------------------------------------
+ *
+ * ValueInterpParseProc --
+ *
+ *      Converts the name of an axis to a pointer to its axis structure.
+ *
+ * Results:
+ *      The return value is a standard Tcl result.  The axis flags are
+ *      written into the widget record.
+ *
+ *----------------------------------------------------------------------
+ */
+/*ARGSUSED*/
+static int
+ValueInterpParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin,
+                     CONST84 char *string, char *widgRec, int offset)
+{
+    HotspotItem *itemPtr = (HotspotItem *)widgRec;
+
+    if (string[0] == '\0') {
+        itemPtr->valueInterp = NULL;
+        return TCL_OK;
+    }
+    itemPtr->valueInterp = Tcl_GetSlave(interp, string);
+    if (itemPtr->valueInterp == NULL) {
+        return TCL_ERROR;
+    }
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * ValueInterpParseProc --
+ *
+ *      Convert the window coordinates into a string.
+ *
+ * Results:
+ *      The string representing the coordinate position is returned.
+ *
+ *----------------------------------------------------------------------
+ */
+/*ARGSUSED*/
+static char *
+ValueInterpPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec,
+                     int offset, Tcl_FreeProc **freeProcPtr)
+{
+    HotspotItem *itemPtr = (HotspotItem *)widgRec;
+
+    if (itemPtr->valueInterp != NULL) {
+        Tcl_Obj *objPtr;
+
+        Tcl_GetInterpPath(itemPtr->interp, itemPtr->valueInterp);
+        objPtr = Tcl_GetObjResult(itemPtr->interp);
+        *freeProcPtr = TCL_VOLATILE;
+        return Tcl_GetString(objPtr);
+    }
+    return "";
+}
 
 /*