Changeset 3696 for trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp

Timestamp:

Jun 17, 2013, 1:48:27 AM (11 years ago)

Author:

ldelgass

Message:

Use imroved Arc API (arc can only represent a circular section, and setting
two endpoints could cause problems with endpts and center colinear and radii
from center to two endpoints differing). New API uses a center, start point,
normal and sweep angle. Also change Line to support polylines: protocol is
changed to require a Tcl list for point coordinates instead of a fixed 2
endpoints.

File:

• trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp (modified) (4 diffs)

trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp

@@ -8 +8 @@
 #include <cstring>
 #include <typeinfo>
+#include <vector>
 
 #include <vtkVersion.h>
@@ -394 +395 @@
  * \brief Create a new Arc and associate it with an ID
  */
-bool Renderer::addArc(const DataSetId& id, double center[3],
-                      double pt1[3], double pt2[3])
+bool Renderer::addArc(const DataSetId& id,
+                      double center[3],
+                      double pt1[3],
+                      double normal[3],
+                      double angle)
 {
     Arc *gobj;
@@ -419 +423 @@
 
     gobj->setCenter(center);
-    gobj->setEndPoints(pt1, pt2);
+    gobj->setStartPoint(pt1);
+    gobj->setNormal(normal);
+    gobj->setAngle(angle);
 
     getGraphicsObjectHashmap<Arc>()[id] = gobj;
@@ -2299 +2305 @@
 
 /**
+ * \brief Create a new Line and associate it with an ID
+ */
+bool Renderer::addLine(const DataSetId& id, std::vector<double> points)
+{
+    Line *gobj;
+    if ((gobj = getGraphicsObject<Line>(id)) != NULL) {
+        WARN("Replacing existing %s %s", gobj->getClassName(), id.c_str());
+        deleteGraphicsObject<Line>(id);
+    }
+
+    gobj = new Line();
+ 
+    gobj->setDataSet(NULL, this);
+
+    if (gobj->getProp() == NULL &&
+        gobj->getOverlayProp() == NULL) {
+        delete gobj;
+        return false;
+    } else {
+        if (gobj->getProp())
+            _renderer->AddViewProp(gobj->getProp());
+        if (gobj->getOverlayProp())
+            _renderer->AddViewProp(gobj->getOverlayProp());
+    }
+
+    gobj->setPoints(points);
+
+    getGraphicsObjectHashmap<Line>()[id] = gobj;
+
+    sceneBoundsChanged();
+    _needsRedraw = true;
+    return true;
+}
+
+/**
  * \brief Set atom sphere resolution
  */