Changeset 2853 for trunk/packages/vizservers/nanovis/VolumeInterpolator.h

Timestamp:

Mar 14, 2012, 1:14:22 AM (13 years ago)

Author:

ldelgass

Message:

Minor, mostly formatting changes

File:

• trunk/packages/vizservers/nanovis/VolumeInterpolator.h (modified) (3 diffs)

trunk/packages/vizservers/nanovis/VolumeInterpolator.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#ifndef __VOLUME_INTERPOLATOR_H__
-#define __VOLUME_INTERPOLATOR_H__
+#ifndef VOLUME_INTERPOLATOR_H
+#define VOLUME_INTERPOLATOR_H
+
+#include <vector>
 
 #include "Volume.h"
 
-#include <vector>
+class VolumeInterpolator
+{
+public :
+    VolumeInterpolator();
 
-class VolumeInterpolator {
-    Volume* _volume;
+    void addVolume(Volume *vol);
+
+    void clearAll();
+    
+    void start();
+
+    Volume *update(float fraction);
+
+    void stop();
+
+    void computeKeys(float fraction, int count, float *interp, int *key1, int *key2);
+
+    bool is_started() const;
+
+    double getInterval() const;
+
+    double getStartTime() const;
+
+    unsigned int getReferenceVolumeID() const;
+
+    Volume *getVolume();
+
+private:
+    Volume *_volume;
 
     std::vector<Volume*> _volumes;
@@ -19 +46 @@
     unsigned int _referenceOfVolume;
     double _start_time;
-
-public :
-    VolumeInterpolator();
-    void addVolume(Volume* vol);
-    void clearAll();
-    
-    void start();
-    Volume* update(float fraction);
-    void stop();
-    void computeKeys(float fraction, int count, float* interp, int* key1, int* key2);
-    bool is_started() const;
-    double getInterval() const;
-    double getStartTime() const;
-    unsigned int getReferenceVolumeID() const;
-    Volume* getVolume();
 };
 
@@ -56 +68 @@
 }
 
-//inline Volume* VolumeInterpolator::getVolume()
-//{
-//    return _volume;
-//    //return _volumes[0];
-//}
 #endif