Changeset 3568 for trunk/packages/vizservers/nanovis/TransferFunction.h

Timestamp:

Mar 25, 2013, 2:39:16 AM (6 years ago)

Author:

ldelgass

Message:

Fix crash on getting transfer function name, remove unused plane command.

File:

• trunk/packages/vizservers/nanovis/TransferFunction.h (modified) (4 diffs)

trunk/packages/vizservers/nanovis/TransferFunction.h

@@ -17 +17 @@
 #define TRANSFER_FUNCTION_H
 
+#include <string>
+
 #include <vrmath/Vector3f.h>
 
@@ -24 +26 @@
 {
 public:
-    TransferFunction(int size, float *data);
+    TransferFunction(const char *name, int size, float *data);
 
     void update(float *data);
@@ -57 +59 @@
     const char *name() const
     {
-        return _name;
-    }
-
-    void name(const char *name)
-    {
-        _name = name;
+        return _name.c_str();
     }
 
@@ -77 +74 @@
     float *_data;
     Texture1D *_tex;    ///< the texture storing the colors 
-    const char *_name;
+    std::string _name;
     GLuint _id;         ///< OpenGL texture identifier
 };