Changeset 3134 for trunk

Timestamp:

Aug 2, 2012 7:22:21 PM (12 years ago)

Author:

ldelgass

Message:

Add protocol to toggle atom labels

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)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -444 +444 @@
     void setMoleculeAtomVisibility(const DataSetId& id, bool state);
 
+    void setMoleculeAtomLabelVisibility(const DataSetId& id, bool state);
+
     void setMoleculeBondVisibility(const DataSetId& id, bool state);
 

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -3488 +3488 @@
 
 static int
+MoleculeAtomLabelVisibilityOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                              Tcl_Obj *const *objv)
+{
+    bool state;
+    if (GetBooleanFromObj(interp, objv[2], &state) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setMoleculeAtomLabelVisibility(name, state);
+    } else {
+        g_renderer->setMoleculeAtomLabelVisibility("all", state);
+    }
+    return TCL_OK;
+}
+
+static int
 MoleculeAtomScaleFactorOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                           Tcl_Obj *const *objv)
@@ -3826 +3843 @@
     {"delete",     1, MoleculeDeleteOp, 2, 3, "?dataSetName?"},
     {"edges",      1, MoleculeEdgeVisibilityOp, 3, 4, "bool ?dataSetName?"},
+    {"labels",     2, MoleculeAtomLabelVisibilityOp, 3, 4, "bool ?dataSetName?"},
     {"lighting",   3, MoleculeLightingOp, 3, 4, "bool ?dataSetName?"},
     {"linecolor",  5, MoleculeLineColorOp, 5, 6, "r g b ?dataSetName?"},

trunk/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.cpp

@@ -1173 +1173 @@
 
 /**
+ * \brief Turn on/off rendering of the Molecule atom labels for the given DataSet
+ */
+void Renderer::setMoleculeAtomLabelVisibility(const DataSetId& id, bool state)
+{
+    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->setAtomLabelVisibility(state);
+    } while (doAll && ++itr != _molecules.end());
+
+    _needsRedraw = true;
+}
+
+/**
  * \brief Set radius scale factor for atoms
  */

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -288 +288 @@
 molecule delete <?datasetName?>
 molecule edges <bool> <?datasetName?>
+molecule labels <bool> <?datasetName?>
 molecule lighting <bool> <?datasetName?>
 molecule linecolor <r> <g> <b> <?datasetName?>