Changeset 2827 for trunk/packages/vizservers/nanovis/ContourLineFilter.h

Timestamp:

Mar 7, 2012 2:01:55 PM (12 years ago)

Author:

ldelgass

Message:

Move Vector3/4Array typdefs to the Vector3/4.h headers and remove TypeDefs?.h.
Also misc. cleanups

File:

• trunk/packages/vizservers/nanovis/ContourLineFilter.h (modified) (2 diffs)

trunk/packages/vizservers/nanovis/ContourLineFilter.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#ifndef _CONTOURFILTER_H_
-#define _CONTOURFILTER_H_
+#ifndef CONTOURLINEFILTER_H
+#define CONTOURLINEFILTER_H
+
+#include <list>
+
+#include <R2/graphics/R2Geometry.h>
 
 #include "Vector3.h"
 #include "Vector4.h"
-#include "TypeDefs.h"
-#include <R2/graphics/R2Geometry.h>
-#include <list>
 
-class ContourLineFilter {
-public :
-    class ContourLine {
-    public :
+class ContourLineFilter
+{
+public:
+    class ContourLine
+    {
+    public:
         float _value;
         std::list<Vector3> _points;
-    public :
+
         ContourLine(float value);
-        
-    private :
-        bool isValueWithIn(float v1, float v2) {
+
+        /**
+         * @brief
+         * @ret Returns the number of points
+         */
+        int createLine(int width, int height, Vector3 *vertices, bool top);
+        int createLine(int width, int height, Vector4 *vertices, bool top);
+
+    private:
+        bool isValueWithIn(float v1, float v2)
+        {
             return ((_value >= v1 && _value <= v2) || 
                     (_value >= v2 && _value <= v1));
         }
-        void getContourPoint(int vertexIndex1, int vertexIndex2, Vector3* vertices, int width, bool top);
-        void getContourPoint(int vertexIndex1, int vertexIndex2, Vector4* vertices, int width, bool top);
-    public :  
-        /**
-         * @brief
-         * @ret Returns the number of points
-         */
-        int createLine(int width, int height, Vector3* vertices, bool top);
-        int createLine(int width, int height, Vector4* vertices, bool top);
+        void getContourPoint(int vertexIndex1, int vertexIndex2, Vector3 *vertices, int width, bool top);
+        void getContourPoint(int vertexIndex1, int vertexIndex2, Vector4 *vertices, int width, bool top);
     };
-    
-    typedef std::list<ContourLine*> ContourLineList;
-    
-private :
-    ContourLineList _lines;
-    Vector3Array* _colorMap;
-    bool _top;
-public :
+
+    typedef std::list<ContourLine *> ContourLineList;
+
     ContourLineFilter();
-    
-private :
-    void clear();
-    
-public :
-    R2Geometry* create(float min, float max, int linecount, Vector3* vertices, int width, int height);
-    R2Geometry* create(float min, float max, int linecount, Vector4* vertices, int width, int height);
-    void setColorMap(Vector3Array* colorMap);
+
+    R2Geometry *create(float min, float max, int linecount, Vector3 *vertices, int width, int height);
+    R2Geometry *create(float min, float max, int linecount, Vector4 *vertices, int width, int height);
+
+    void setColorMap(Vector3Array *colorMap);
     
     void setHeightTop(bool top)
@@ -55 +51 @@
         _top = top;
     }
+
+private:
+    void clear();
+
+    ContourLineList _lines;
+    Vector3Array *_colorMap;
+    bool _top;
 };