Changeset 3954 for branches/blt4

Timestamp:

Sep 24, 2013, 12:45:32 PM (11 years ago)

Author:

gah

Message:

sync with trunk

Location:

branches/blt4/gui/src

Files:

• Makefile.in (modified) (1 diff)
• RapptureGUI_Init.c (modified) (3 diffs)
• RpCanvHotspot.c (modified) (7 diffs)
• RpCanvPlacard.c (modified) (1 diff)
• RpConvertDxToVtk.c (deleted)
• RpDiffview.c (modified) (1 diff)
• RpDxToVtk.c (added)
• RpPdbToVtk.c (added)
• RpReadPoints.c (added)

branches/blt4/gui/src/Makefile.in

@@ -54 +54 @@
                 RpCanvPlacard.o \
                 RpDiffview.o \
-                RpConvertDxToVtk.o
+                RpReadPoints.o \
+                RpDxToVtk.o \
+                RpPdbToVtk.o
 
 name            = RapptureGUI$(version)

branches/blt4/gui/src/RapptureGUI_Init.c

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2009  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and
@@ -25 +25 @@
 extern Tcl_AppInitProc RpCanvHotspot_Init;
 extern Tcl_AppInitProc RpCanvPlacard_Init;
-extern Tcl_AppInitProc RpConvertDxToVtk_Init;
+extern Tcl_AppInitProc RpDxToVtk_Init;
+extern Tcl_AppInitProc RpPdbToVtk_Init;
 extern Tcl_AppInitProc RpDiffview_Init;
+extern Tcl_AppInitProc RpReadPoints_Init;
 
 #ifdef BUILD_Rappture
@@ -47 +49 @@
         return TCL_ERROR;
     }
-    if (RpConvertDxToVtk_Init(interp) != TCL_OK) {
+    if (RpDxToVtk_Init(interp) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (RpPdbToVtk_Init(interp) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (RpReadPoints_Init(interp) != TCL_OK) {
         return TCL_ERROR;
     }

branches/blt4/gui/src/RpCanvHotspot.c

@@ -24 +24 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2009  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and
@@ -1677 +1677 @@
     TkCanvas *canvasPtr;
     int id;
+    long lid;
     Tcl_HashEntry *hPtr;
     Tk_Window tkwin;
@@ -1705 +1706 @@
     }
     string = Tcl_GetString(itemObjPtr);
-    hPtr = Tcl_FindHashEntry(&canvasPtr->idTable, (char *)id);
+
+    lid = id;
+    hPtr = Tcl_FindHashEntry(&canvasPtr->idTable, (char *)lid);
     if (hPtr == NULL) {
         Tcl_AppendResult(interp, "can't find canvas item \"", string,
@@ -1723 +1726 @@
 }
 
-static const char *
+static Tcl_Obj *
 Identify(Tcl_Interp *interp, HotspotItem *itemPtr, double x, double y)
 {
+    Tcl_Obj* resultPtr = NULL;
     ItemSegment *segPtr;
+    Tcl_Obj* objPtr;
 
     x -= itemPtr->x1;
@@ -1736 +1741 @@
         if ((x >= segPtr->x) && (x < (segPtr->x + segPtr->width)) && 
             (y >= segPtr->y) && (y < (segPtr->y + segPtr->height))) {
-            return segPtr->text;
-        }
-    }
-    return "";
+
+            /* build return list: {string x0 y0 x1 y1} */
+            resultPtr = Tcl_NewListObj(0, (Tcl_Obj **)NULL);
+
+            objPtr = Tcl_NewStringObj(segPtr->text, -1);
+            Tcl_ListObjAppendElement(interp, resultPtr, objPtr);
+
+            objPtr = Tcl_NewIntObj(itemPtr->x1 + segPtr->x);
+            Tcl_ListObjAppendElement(interp, resultPtr, objPtr);
+            objPtr = Tcl_NewIntObj(itemPtr->y1 + segPtr->y);
+            Tcl_ListObjAppendElement(interp, resultPtr, objPtr);
+
+            objPtr = Tcl_NewIntObj(itemPtr->x1 + segPtr->x + segPtr->width);
+            Tcl_ListObjAppendElement(interp, resultPtr, objPtr);
+            objPtr = Tcl_NewIntObj(itemPtr->y1 + segPtr->y + segPtr->height);
+            Tcl_ListObjAppendElement(interp, resultPtr, objPtr);
+
+            return resultPtr;
+        }
+    }
+    return NULL;
 }
 
@@ -1767 +1789 @@
     } else if ((c == 'i') && (strncmp(string, "identify", length) == 0)) {
         double x, y;
-        const char *token;
         Tcl_Obj *objPtr;
 
@@ -1775 +1796 @@
             return TCL_ERROR;
         }
-        token = Identify(interp, itemPtr, x, y);
-        objPtr = Tcl_NewStringObj(token, -1);
-        Tcl_SetObjResult(interp, objPtr);
+        objPtr = Identify(interp, itemPtr, x, y);
+        if (objPtr != NULL) {
+            Tcl_SetObjResult(interp, objPtr);
+        }
     } else if ((c == 'v') && (strncmp(string, "variables", length) == 0)) {
         Tcl_Obj *listObjPtr;

branches/blt4/gui/src/RpCanvPlacard.c

@@ -22 +22 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2009  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/gui/src/RpDiffview.c

@@ -24 +24 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2011  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and