Changeset 3149 for trunk/packages/vizservers

Timestamp:

Aug 23, 2012 2:55:39 PM (12 years ago)

Author:

ldelgass

Message:

Add protocol for sphere resolution and section

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpVtkRenderer.h (modified) (1 diff)
• RpVtkRendererCmd.cpp (modified) (3 diffs)
• RpVtkRendererGraphicsObjs.cpp (modified) (1 diff)
• protocol.txt (modified) (1 diff)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -476 +476 @@
                                  const char *name, double range[2] = NULL);
 
+    // Spheres
+
+    void setSphereSection(const DataSetId& id, double thetaStart, double thetaEnd,
+                          double phiStart, double phiEnd);
+
+    void setSphereResolution(const DataSetId& id, int thetaRes, int phiRes);
+
     // Streamlines
 

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -5189 +5189 @@
 
 static int
+SphereResolutionOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                   Tcl_Obj *const *objv)
+{
+    int theta, phi;
+    if (Tcl_GetIntFromObj(interp, objv[2], &theta) != TCL_OK ||
+        Tcl_GetIntFromObj(interp, objv[3], &phi) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 5) {
+        const char *name = Tcl_GetString(objv[4]);
+        g_renderer->setSphereResolution(name, theta, phi);
+    } else {
+        g_renderer->setSphereResolution("all", theta, phi);
+    }
+    return TCL_OK;
+}
+
+static int
 SphereScaleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
               Tcl_Obj *const *objv)
@@ -5203 +5221 @@
     } else {
         g_renderer->setGraphicsObjectScale<Sphere>("all", scale);
+    }
+    return TCL_OK;
+}
+
+static int
+SphereSectionOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                Tcl_Obj *const *objv)
+{
+    double thetaStart, thetaEnd, phiStart, phiEnd;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &thetaStart) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[3], &thetaEnd) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[4], &phiStart) != TCL_OK ||
+        Tcl_GetDoubleFromObj(interp, objv[5], &phiEnd) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 7) {
+        const char *name = Tcl_GetString(objv[6]);
+        g_renderer->setSphereSection(name, thetaStart, thetaEnd, phiStart, phiEnd);
+    } else {
+        g_renderer->setSphereSection("all", thetaStart, thetaEnd, phiStart, phiEnd);
     }
     return TCL_OK;
@@ -5253 +5291 @@
     {"orient",    2, SphereOrientOp, 6, 7, "qw qx qy qz ?name?"},
     {"pos",       2, SpherePositionOp, 5, 6, "x y z ?name?"},
-    {"scale",     1, SphereScaleOp, 5, 6, "sx sy sz ?name?"},
+    {"resolution",1, SphereResolutionOp, 4, 5, "thetaRes phiRes ?name?"},
+    {"scale",     2, SphereScaleOp, 5, 6, "sx sy sz ?name?"},
+    {"section",   2, SphereSectionOp, 6, 7, "thetaStart thetaEnd phiStart phiEnd ?name?"},
     {"visible",   1, SphereVisibleOp, 3, 4, "bool ?name?"},
     {"wireframe", 1, SphereWireframeOp, 3, 4, "bool ?name?"}

trunk/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.cpp

@@ -1522 +1522 @@
 
 /**
+ * \brief Set Sphere resolution
+ */
+void Renderer::setSphereResolution(const DataSetId& id, int thetaRes, int phiRes)
+{
+    SphereHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _spheres.begin();
+        doAll = true;
+    } else {
+        itr = _spheres.find(id);
+    }
+    if (itr == _spheres.end()) {
+        ERROR("Sphere not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setThetaResolution(thetaRes);
+        itr->second->setPhiResolution(phiRes);
+    } while (doAll && ++itr != _spheres.end());
+
+    _needsRedraw = true;
+}
+
+
+/**
+ * \brief Set Sphere section
+ */
+void Renderer::setSphereSection(const DataSetId& id, double thetaStart, double thetaEnd,
+                                double phiStart, double phiEnd)
+{
+    SphereHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _spheres.begin();
+        doAll = true;
+    } else {
+        itr = _spheres.find(id);
+    }
+    if (itr == _spheres.end()) {
+        ERROR("Sphere not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setStartTheta(thetaStart);
+        itr->second->setEndTheta(thetaEnd);
+        itr->second->setStartPhi(phiStart);
+        itr->second->setEndPhi(phiEnd);
+    } while (doAll && ++itr != _spheres.end());
+
+    _needsRedraw = true;
+}
+
+/**
  * \brief Set the streamlines seed to points of the streamlines DataSet
  */

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -373 +373 @@
 sphere orient <qw> <qx> <qy> <qz> <?name?>
 sphere pos <x> <y> <z> <?name?>
+sphere resolution <thetaRes> <phiRes> <?name?>
 sphere scale <sx> <sy> <sz> <?name?>
+sphere section <thetaStart> <thetaEnd> <phiStart> <phiEnd>
+       Angles are in degrees
 sphere visible <bool> <?name?>
 sphere wireframe <bool> <?name?>