Changeset 917 for trunk/vizservers/nanovis/Command.cpp

Timestamp:

Mar 4, 2008 4:48:10 PM (15 years ago)

Author:

gah

Message:

 

File:

• trunk/vizservers/nanovis/Command.cpp (modified) (5 diffs)

trunk/vizservers/nanovis/Command.cpp

@@ -4 +4 @@
  * Command.cpp
  *
- *      This modules creates the Tcl interface to the nanovis server.
- *      The communication protocol of the server is the Tcl language.
- *      Commands given to the server by clients are executed in a
- *      safe interpreter and the resulting image rendered offscreen
- *      is returned as BMP-formatted image data.
+ *      This modules creates the Tcl interface to the nanovis server.  The
+ *      communication protocol of the server is the Tcl language.  Commands
+ *      given to the server by clients are executed in a safe interpreter and
+ *      the resulting image rendered offscreen is returned as BMP-formatted
+ *      image data.
  *
  * ======================================================================
@@ -108 +108 @@
 
 // default transfer function
-static const char def_transfunc[] = "transfunc define default {\n\
+static const char def_transfunc[] = 
+    "transfunc define default {\n\
   0.0  1 1 1\n\
   0.2  1 1 0\n\
@@ -137 +138 @@
 static Tcl_ObjCmdProc CameraCmd;
 static Tcl_ObjCmdProc CutplaneCmd;
+static Tcl_ObjCmdProc FlowCmd;
 static Tcl_ObjCmdProc GridCmd;
 static Tcl_ObjCmdProc LegendCmd;
@@ -148 +150 @@
 static Tcl_ObjCmdProc UpCmd;
 static Tcl_ObjCmdProc VolumeCmd;
-static Tcl_ObjCmdProc FlowCmd;
-
-static int GetVolumeIndices(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv,
-        vector<unsigned int>* vectorPtr);
-static int GetVolumes(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv,
-        vector<Volume *>* vectorPtr);
-static int GetVolumeFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, 
-        Volume **volPtrPtr);
-static int GetVolumeIndex(Tcl_Interp *interp, Tcl_Obj *objPtr, 
-        unsigned int *indexPtr);
-static int GetHeightMap(Tcl_Interp *interp, Tcl_Obj *objPtr, HeightMap **hmPtrPtr);
-static int GetIndices(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv,
-        vector<unsigned int>* vectorPtr);
-static int GetAxisFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *indexPtr);
-static int GetAxisDirFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *indexPtr, 
-        int *dirPtr);
-static int GetColor(Tcl_Interp *interp, int objc, Tcl_Obj *CONST *objv, 
-        float *rgbPtr);
-static int GetDataStream(Tcl_Interp *interp, Rappture::Buffer &buf, 
-        int nBytes);
-static HeightMap *CreateHeightMap(ClientData clientData, Tcl_Interp *interp, 
-        int objc, Tcl_Obj *CONST *objv);
 
 static int
@@ -2573 +2553 @@
 initTcl()
 {
+    /*
+     * Ideally the connection is authenticated by nanoscale.  I still like the
+     * idea of creating a non-safe master interpreter with a safe slave
+     * interpreter.  Alias all the nanovis commands in the slave. That way we
+     * can still run Tcl code within nanovis.  The eventual goal is to create
+     * a test harness through the interpreter for nanovis.
+     */
     interp = Tcl_CreateInterp();
     Tcl_MakeSafe(interp);