Changeset 3630 for trunk/packages/vizservers/nanovis/Flow.h

Timestamp:

Apr 16, 2013, 12:52:20 AM (11 years ago)

Author:

ldelgass

Message:

Nanovis refactoring to fix problems with scaling and multiple results.
Do rendering in world space to properly place and scale multiple data sets.
Also fix flows to reduce resets of animations. More work toward removing
Cg dependency. Fix panning to convert viewport coords to world coords.

File:

• trunk/packages/vizservers/nanovis/Flow.h (modified) (7 diffs)

trunk/packages/vizservers/nanovis/Flow.h

@@ -25 +25 @@
 #include "FlowBox.h"
 #include "LIC.h"
+#include "VelocityArrowsSlice.h"
 #include "Unirect.h"
 #include "Volume.h"
@@ -50 +51 @@
 {
 public:
-    enum SliceAxis { AXIS_X, AXIS_Y, AXIS_Z };
-
     Flow(Tcl_Interp *interp, const char *name);
 
@@ -84 +83 @@
     void getBoxNames(std::vector<std::string>& names);
 
-    float *getScaledVector();
-
-    Volume *makeVolume(float *data);
-
     bool scaleVectorField();
 
@@ -117 +112 @@
         _data = data;
     }
+
+    FlowSliceAxis getAxis()
+    {
+        return _sv.slicePos.axis;
+    }
+
+    TransferFunction *getTransferFunction()
+    {
+        return _sv.transferFunction;
+    }
 #if 0
-    void activateSlice()
-    {
-        /* Must set axis before offset or position goes to wrong axis. */
-        NanoVis::licRenderer->setAxis(_sv.slicePos.axis);
-        NanoVis::licRenderer->setOffset(_sv.slicePos.value);
-        NanoVis::licRenderer->active(true);
-    }
-
-    void deactivateSlice()
-    {
-        NanoVis::licRenderer->active(false);
+    void setAxis(FlowSliceAxis axis)
+    {
+        _sv.slicePos.axis = axis;
+        if (NanoVis::licRenderer != NULL) {
+            NanoVis::licRenderer->setSliceAxis(_sv.slicePos.axis);
+        }
+        if (NanoVis::velocityArrowsSlice != NULL) {
+            NanoVis::velocityArrowsSlice->setSliceAxis(_sv.slicePos.axis);
+        }
+    }
+
+    void setCurrentPosition(float position)
+    {
+        _sv.slicePos.value = position;
+        if (NanoVis::licRenderer != NULL) {
+            NanoVis::licRenderer->setSlicePosition(_sv.slicePos.value);
+        }
+        if (NanoVis::velocityArrowsSlice != NULL) {
+            NanoVis::velocityArrowsSlice->setSlicePosition(_sv.slicePos.value);
+        }
+    }
+
+    void setLICActive(bool state)
+    {
+        _sv.sliceVisible = state;
+        if (NanoVis::licRenderer != NULL) {
+            NanoVis::licRenderer->setVectorField(_volume);
+            NanoVis::licRenderer->setSliceAxis(_sv.slicePos.axis);
+            NanoVis::licRenderer->setSlicePosition(_sv.slicePos.value);
+            NanoVis::licRenderer->visible(state);
+        }
+    }
+
+    void setArrowsActive(bool state)
+        _sv.showArrows = state;
+        if (NanoVis::velocityArrowsSlice != NULL) {
+            NanoVis::velocityArrowsSlice->setVectorField(_volume);
+            NanoVis::velocityArrowsSlice->setSliceAxis(_sv.slicePos.axis);
+            NanoVis::velocityArrowsSlice->setSlicePosition(_sv.slicePos.value);
+            NanoVis::velocityArrowsSlice->visible(_sv.showArrows);
+        }
     }
 #endif
-    SliceAxis getAxis()
-    {
-        return (SliceAxis)_sv.slicePos.axis;
-    }
-
-    TransferFunction *getTransferFunction()
-    {
-        return _sv.transferFunction;
-    }
-
-    float getRelativePosition();
-
-    void setAxis()
-    {
-        NanoVis::licRenderer->setAxis(_sv.slicePos.axis);
-    }
-
-    void setAxis(Flow::SliceAxis axis)
-    {
-        _sv.slicePos.axis = axis;
-        NanoVis::licRenderer->setAxis(_sv.slicePos.axis);
-    }
-
-    void setCurrentPosition(float position)
-    {
-        _sv.slicePos.value = position;
-        NanoVis::licRenderer->setOffset(_sv.slicePos.value);
-    }
-
-    void setCurrentPosition()
-    {
-        NanoVis::licRenderer->setOffset(_sv.slicePos.value);
-    }
-
-    void setActive(bool state)
-    {
-        _sv.sliceVisible = state;
-        NanoVis::licRenderer->active(state);
-    }
-
-    void setActive()
-    {
-        NanoVis::licRenderer->active(_sv.sliceVisible);
-    }
-
     const Volume *getVolume() const
     {
@@ -190 +180 @@
     }
 
+    bool configure();
+
     Tcl_Command getCommandToken()
     {
@@ -195 +187 @@
     }
 
-    static float getRelativePosition(FlowPosition *pos);
+    float getRelativePosition(FlowPosition *pos);
+
+    static bool updatePending;
+    static double magMin, magMax;
 
 private:
@@ -203 +198 @@
     typedef std::tr1::unordered_map<BoxId, FlowBox *> BoxHashmap;
 
-    void configure();
+    float *getScaledVector();
+
+    Volume *makeVolume(float *data);
 
     void renderBoxes();