Changeset 2953 for trunk/packages/vizservers/nanovis/Axis.h

Timestamp:

Apr 9, 2012, 10:18:09 AM (12 years ago)

Author:

ldelgass

Message:

Remove unused global origin, make default transfer function a bit more
sensible (used to have full opacity at 0). Fix HeightMap? dtor to use delete[]
instead of free() on array allocated with new[]. Document data response in
protocol.

File:

• trunk/packages/vizservers/nanovis/Axis.h (modified) (6 diffs)

trunk/packages/vizservers/nanovis/Axis.h

@@ -2 +2 @@
 #ifndef AXIS_H
 #define AXIS_H
+
+#include <stdlib.h>
 
 #include <cmath>
@@ -45 +47 @@
 };
 
-/*
- * ----------------------------------------------------------------------
- *
- * Ticks --
- *
- *         Structure containing information where the ticks (major or
- *        minor) will be displayed on the graph.
- *
- * ----------------------------------------------------------------------
+/**
+ * Class containing information where the ticks (major or
+ * minor) will be displayed on the graph.
  */
 class Ticks
@@ -182 +178 @@
 
 /**
- * Structure contains options controlling how the axis will be
+ * Class contains options controlling how the axis will be
  * displayed.
  */
@@ -212 +208 @@
     }
 
+    bool firstMajor(TickIter& iter)
+    {
+        return _major.firstTick(iter);
+    }
+
+    bool firstMinor(TickIter& iter)
+    {
+        return _minor.firstTick(iter);
+    }
+
     void resetRange();
 
@@ -218 +224 @@
     void setScale(double min, double max);
 
-    double scale()
+    double scale() const
     {
         return _scale;
     }
 
-    double range()
+    double range() const
     {
         return _range;
     }
 
-    bool firstMajor(TickIter& iter)
-    {
-        return _major.firstTick(iter);
-    }
-
-    bool firstMinor(TickIter& iter)
-    {
-        return _minor.firstTick(iter);
-    }
-
     void getDataLimits(double& min, double& max)
     {
         min = _valueMin, max = _valueMax;
+    }
+
+    double min() const
+    {
+        return _min;
+    }
+
+    void min(double min)
+    {
+        _reqMin = min;
+    }
+
+    double max() const
+    {
+        return _max;
+    }
+
+    void max(double max)
+    {
+        _reqMax = max;
+    }
+
+    void setLimits(double min, double max)
+    {
+        _reqMin = min, _reqMax = max;
+    }
+
+    void unsetLimits()
+    {
+        min(NAN), max(NAN);
     }
 
@@ -284 +310 @@
         }
         _title = strdup(title);
-    }
-
-    double min()
-    {
-        return _min;
-    }
-
-    void min(double min)
-    {
-        _reqMin = min;
-    }
-
-    double max()
-    {
-        return _max;
-    }
-
-    void max(double max)
-    {
-        _reqMax = max;
-    }
-
-    void setLimits(double min, double max)
-    {
-        _reqMin = min, _reqMax = max;
-    }
-
-    void unsetLimits()
-    {
-        min(NAN), max(NAN);
     }