Changeset 3693

Timestamp:

Jun 16, 2013, 4:52:42 PM (11 years ago)

Author:

ldelgass

Message:

Add protocol to set atom/bond tesselation quality in molecules

Location:

trunk/packages/vizservers/vtkvis

Files:

• Molecule.cpp (modified) (2 diffs)
• Molecule.h (modified) (3 diffs)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (4 diffs)
• RendererGraphicsObjs.cpp (modified) (2 diffs)
• Streamlines.cpp (modified) (1 diff)
• protocol.txt (modified) (2 diffs)

trunk/packages/vizservers/vtkvis/Molecule.cpp

@@ -242 +242 @@
 
             // Atoms
-            vtkSmartPointer<vtkSphereSource> sphereSource = vtkSmartPointer<vtkSphereSource>::New();
-            sphereSource->SetRadius(1.0);
-            sphereSource->SetThetaResolution(14);
-            sphereSource->SetPhiResolution(14);
-
-            _atomMapper->SetSourceConnection(sphereSource->GetOutputPort());
+            if (_sphereSource == NULL) {
+                _sphereSource = vtkSmartPointer<vtkSphereSource>::New();
+                _sphereSource->SetRadius(1.0);
+                _sphereSource->SetThetaResolution(14);
+                _sphereSource->SetPhiResolution(14);
+            }
+
+            _atomMapper->SetSourceConnection(_sphereSource->GetOutputPort());
 #ifdef USE_VTK6
             _atomMapper->SetInputData(pd);
@@ -662 +664 @@
 }
 
+void Molecule::setAtomQuality(double quality)
+{
+    if (_sphereSource == NULL)
+        return;
+
+    if (quality > 10.0)
+        quality = 10.0;
+
+    int thetaRes = (int)(quality * 14.0);
+    int phiRes = (int)(quality * 14.0);
+    if (thetaRes < 4) thetaRes = 4;
+    if (phiRes < 3) phiRes = 3;
+
+    _sphereSource->SetThetaResolution(thetaRes);
+    _sphereSource->SetPhiResolution(phiRes);
+
+    if (_atomMapper != NULL) {
+        _atomMapper->Modified();
+        _atomMapper->Update();
+    }
+}
+
+void Molecule::setBondQuality(double quality)
+{
+    if (_cylinderSource == NULL)
+        return;
+
+    if (quality > 10.0)
+        quality = 10.0;
+
+    int res = (int)(quality * 12.0);
+    if (res < 3) res = 3;
+
+    _cylinderSource->SetResolution(res);
+
+    if (_bondMapper != NULL) {
+        _bondMapper->Modified();
+        _bondMapper->Update();
+    }
+}
+
 void Molecule::setBondStyle(BondStyle style)
 {

trunk/packages/vizservers/vtkvis/Molecule.h

@@ -17 +17 @@
 #include <vtkGlyph3DMapper.h>
 #include <vtkTransformPolyDataFilter.h>
+#include <vtkSphereSource.h>
 #include <vtkCylinderSource.h>
 #include <vtkLineSource.h>
@@ -128 +129 @@
     void setBondColorMode(BondColorMode mode);
 
+    void setAtomQuality(double quality);
+
+    void setBondQuality(double quality);
+
     static ColorMap *createElementColorMap();
 
@@ -157 +162 @@
     vtkSmartPointer<vtkActor> _bondProp;
     vtkSmartPointer<vtkActor2D> _labelProp;
+    vtkSmartPointer<vtkSphereSource> _sphereSource;
     vtkSmartPointer<vtkPolyData> _bondPD;
     vtkSmartPointer<vtkCylinderSource> _cylinderSource;

trunk/packages/vizservers/vtkvis/Renderer.h

@@ -742 +742 @@
     // Molecules
 
+    void setMoleculeAtomQuality(const DataSetId& id, double quality);
+
+    void setMoleculeBondQuality(const DataSetId& id, double quality);
+
     void setMoleculeAtomRadiusScale(const DataSetId& id, double scale);
 

trunk/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -7332 +7332 @@
 
 static int
+MoleculeAtomQualityOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                      Tcl_Obj *const *objv)
+{
+    double quality;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &quality) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setMoleculeAtomQuality(name, quality);
+    } else {
+        g_renderer->setMoleculeAtomQuality("all", quality);
+    }
+    return TCL_OK;
+}
+
+static int
 MoleculeAtomScaleFactorOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                           Tcl_Obj *const *objv)
@@ -7415 +7432 @@
     } else {
         g_renderer->setMoleculeBondColor("all", color);
+    }
+    return TCL_OK;
+}
+
+static int
+MoleculeBondQualityOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                      Tcl_Obj *const *objv)
+{
+    double quality;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &quality) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setMoleculeBondQuality(name, quality);
+    } else {
+        g_renderer->setMoleculeBondQuality("all", quality);
     }
     return TCL_OK;
@@ -7747 +7781 @@
 static Rappture::CmdSpec moleculeOps[] = {
     {"add",          2, MoleculeAddOp, 2, 3, "?dataSetName?"},
+    {"aquality",     2, MoleculeAtomQualityOp, 3, 4, "value ?dataSetName?"},
     {"ascale",       2, MoleculeAtomScaleFactorOp, 3, 4, "value ?dataSetName?"},
     {"atoms",        2, MoleculeAtomVisibilityOp, 3, 4, "bool ?dataSetName?"},
@@ -7752 +7787 @@
     {"bcolor",       3, MoleculeBondColorOp, 5, 6, "r g b ?dataSetName?"},
     {"bonds",        2, MoleculeBondVisibilityOp, 3, 4, "bool ?dataSetName?"},
+    {"bquality",     2, MoleculeBondQualityOp, 3, 4, "value ?dataSetName?"},
     {"bscale",       3, MoleculeBondScaleFactorOp, 3, 4, "value ?dataSetName?"},
     {"bstyle",       3, MoleculeBondStyleOp, 3, 4, "value ?dataSetName?"},

trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp

@@ -2269 +2269 @@
 
 /**
+ * \brief Set atom sphere resolution
+ */
+void Renderer::setMoleculeAtomQuality(const DataSetId& id, double quality)
+{
+    MoleculeHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _molecules.begin();
+        if (itr == _molecules.end())
+            return;
+        doAll = true;
+    } else {
+        itr = _molecules.find(id);
+    }
+    if (itr == _molecules.end()) {
+        ERROR("Molecule not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setAtomQuality(quality);
+    } while (doAll && ++itr != _molecules.end());
+
+    sceneBoundsChanged();
+    _needsRedraw = true;
+}
+
+
+/**
+ * \brief Set bond cylinder resolution
+ */
+void Renderer::setMoleculeBondQuality(const DataSetId& id, double quality)
+{
+    MoleculeHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _molecules.begin();
+        if (itr == _molecules.end())
+            return;
+        doAll = true;
+    } else {
+        itr = _molecules.find(id);
+    }
+    if (itr == _molecules.end()) {
+        ERROR("Molecule not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setBondQuality(quality);
+    } while (doAll && ++itr != _molecules.end());
+
+    sceneBoundsChanged();
+    _needsRedraw = true;
+}
+
+
+/**
  * \brief Set radius scale factor for atoms
  */
@@ -3020 +3082 @@
  * \param[in] data Bytes of VTK DataSet file
  * \param[in] nbytes Length of data array
+ * \param[in] maxPoints Maximum number of points to be used as seeds
  *
  * \return boolean indicating success or failure

trunk/packages/vizservers/vtkvis/Streamlines.cpp

@@ -706 +706 @@
  *
  * \param[in] seed vtkDataSet with points to use as seeds
+ * \param[in] maxPoints Maximum number of points to be used as seeds
  */
 void Streamlines::setSeedToMeshPoints(vtkDataSet *seed, int maxPoints)

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -591 +591 @@
 
 molecule add <?datasetName?>
+molecule aquality <val> <?datasetName?>
+         Set atom sphere resolution quality val=[0,10], 1 is default
+molecule ascale <val> <?datasetName?>
+         Set atom scale factor
 molecule atoms <bool> <?datasetName?>
          Toggle rendering of atoms
-molecule ascale <val> <?datasetName?>
-         Set atom scale factor
 molecule bcmode <by_elements|constant> <?datasetName?>
          Set bond color mode
@@ -601 +603 @@
 molecule bonds <bool> <?datasetName?>
          Toggle rendering of bonds
+molecule bquality <val> <?datasetName?>
+         Set bond cylinder resolution quality val=[0,10], 1 is default
 molecule bscale <val> <?datasetName?>
          Set bond scale factor