Changeset 3143 for trunk/packages/vizservers/vtkvis

Timestamp:

Aug 17, 2012, 1:52:15 AM (12 years ago)

Author:

ldelgass

Message:

Add protocol for bond style (cylinder vs. line)

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpVtkRenderer.h (modified) (1 diff)
• RpVtkRendererCmd.cpp (modified) (2 diffs)
• RpVtkRendererGraphicsObjs.cpp (modified) (1 diff)
• protocol.txt (modified) (1 diff)
• vtkRpAxisActor.cpp (modified) (1 diff)
• vtkRpAxisActor2D.cpp (modified) (1 diff)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -448 +448 @@
     void setMoleculeBondVisibility(const DataSetId& id, bool state);
 
+    void setMoleculeBondStyle(const DataSetId& id, Molecule::BondStyle style);
+
     void setMoleculeBondColorMode(const DataSetId& id, Molecule::BondColorMode mode);
 

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -3610 +3610 @@
 
 static int
+MoleculeBondStyleOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                    Tcl_Obj *const *objv)
+{
+    Molecule::BondStyle style;
+    const char *styleStr = Tcl_GetString(objv[2]);
+    if (styleStr[0] == 'c' && strcmp(styleStr, "cylinder") == 0) {
+        style = Molecule::BOND_STYLE_CYLINDER;
+    } else if (styleStr[0] == 'l' && strcmp(styleStr, "line") == 0) {
+        style = Molecule::BOND_STYLE_LINE;
+    } else {
+        Tcl_AppendResult(interp, "bad bstyle option \"", styleStr,
+                         "\": should be cylinder or line", (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setMoleculeBondStyle(name, style);
+    } else {
+        g_renderer->setMoleculeBondStyle("all", style);
+    }
+    return TCL_OK;
+}
+
+static int
 MoleculeBondVisibilityOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                          Tcl_Obj *const *objv)
@@ -3839 +3863 @@
     {"bcolor",     3, MoleculeBondColorOp, 5, 6, "r g b ?dataSetName?"},
     {"bonds",      2, MoleculeBondVisibilityOp, 3, 4, "bool ?dataSetName?"},
-    {"bscale",     2, MoleculeBondScaleFactorOp, 3, 4, "value ?dataSetName?"},
+    {"bscale",     3, MoleculeBondScaleFactorOp, 3, 4, "value ?dataSetName?"},
+    {"bstyle",     3, MoleculeBondStyleOp, 3, 4, "value ?dataSetName?"},
     {"colormap",   1, MoleculeColorMapOp, 3, 4, "colorMapName ?dataSetName?"},
     {"delete",     1, MoleculeDeleteOp, 2, 3, "?dataSetName?"},

trunk/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.cpp

@@ -1255 +1255 @@
 }
 
+void Renderer::setMoleculeBondStyle(const DataSetId& id, Molecule::BondStyle style)
+{
+    MoleculeHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _molecules.begin();
+        doAll = true;
+    } else {
+        itr = _molecules.find(id);
+    }
+    if (itr == _molecules.end()) {
+        ERROR("Molecule not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setBondStyle(style);
+    } while (doAll && ++itr != _molecules.end());
+
+    _needsRedraw = true;
+}
+
 void Renderer::setMoleculeBondColorMode(const DataSetId& id, Molecule::BondColorMode mode)
 {

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -285 +285 @@
 molecule bscale <val> <?datasetName?>
          Set bond scale factor
+molecule bstyle <cylinder|line> <?datasetName?>
+         Set bond render style
 molecule colormap <colormapName> <?datasetName?>
 molecule delete <?datasetName?>

trunk/packages/vizservers/vtkvis/vtkRpAxisActor.cpp

@@ -2 +2 @@
 
   Program:   Visualization Toolkit
-  Module:    vtkRpAxisActor.cxx
+  Module:    vtkRpAxisActor.cpp
   Thanks:    Kathleen Bonnell, B Division, Lawrence Livermore Nat'l Laboratory
 

trunk/packages/vizservers/vtkvis/vtkRpAxisActor2D.cpp

@@ -2 +2 @@
 
   Program:   Visualization Toolkit
-  Module:    vtkRpAxisActor2D.cxx
+  Module:    vtkRpAxisActor2D.cpp
 
   Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen