Changeset 2822 for trunk/packages/vizservers/nanovis/NvZincBlendeReconstructor.h

Timestamp:

Mar 7, 2012 12:21:30 PM (12 years ago)

Author:

ldelgass

Message:

Const correctness fixes, pass vector/matrix objects by reference, various
formatting and style cleanups, don't spam syslog and uncomment openlog() call.
Still needs to be compiled with -DWANT_TRACE to get tracing, but now trace
output will be output to file in /tmp.

File:

• trunk/packages/vizservers/nanovis/NvZincBlendeReconstructor.h (modified) (8 diffs)

trunk/packages/vizservers/nanovis/NvZincBlendeReconstructor.h

@@ -14 +14 @@
  * ======================================================================
  */
-
 #ifndef __NV_ZINC_BLENDE_RECONSTRUCTOR_H__
 #define __NV_ZINC_BLENDE_RECONSTRUCTOR_H__
@@ -27 +26 @@
 class ZincBlendeVolume;
 
-class NvZincBlendeReconstructor {
+class NvZincBlendeReconstructor
+{
     char buff[255];
 
@@ -34 +34 @@
      */
     static NvZincBlendeReconstructor* _instance;
-private :
+private:
     /**
      * @brief Constructor
@@ -45 +45 @@
     ~NvZincBlendeReconstructor();
 
-public :
+public:
     /**
      * @brief Return a singleton instance
@@ -51 +51 @@
     static NvZincBlendeReconstructor* getInstance();
 
-private :
+private:
     /**
      * @brief Get a line from file. It is used for reading header because header is written in ascii.
@@ -58 +58 @@
     void getLine(std::istream& stream);
     void getLine(unsigned char*& stream);
-    
-public :
+
+public:
     /**
      * @brief Load Zinc blende binary volume data and create ZincBlendeVolume with the file
      * @param fileName Zinc blende file name, which data is generated by NEMO-3D
      */
-    ZincBlendeVolume* loadFromFile(const char* fileName);
+    ZincBlendeVolume *loadFromFile(const char* fileName);
 
     /**
@@ -70 +70 @@
      * @param data Zinc blende binary volume data, which data is generated by NEMO-3D and transferred from nanoscale
      */
-    ZincBlendeVolume* loadFromStream(std::istream& stream);
-    ZincBlendeVolume* loadFromMemory(void* dataBlock);
+    ZincBlendeVolume *loadFromStream(std::istream& stream);
+    ZincBlendeVolume *loadFromMemory(void *dataBlock);
 
     /**
@@ -82 +82 @@
      * @param data the memory block of output data of NEMO-3D
      */
-    ZincBlendeVolume* buildUp(const Vector3& origin, const Vector3& delta, int width, int height, int depth, void* data);
-    ZincBlendeVolume* buildUp(const Vector3& origin, const Vector3& delta, int width, int height, int depth, int datacount, double emptyvalue, void* data);
+    ZincBlendeVolume *buildUp(const Vector3& origin, const Vector3& delta,
+                              int width, int height, int depth, void *data);
+    ZincBlendeVolume *buildUp(const Vector3& origin, const Vector3& delta,
+                              int width, int height, int depth,
+                              int datacount, double emptyvalue, void *data);
 };
 
 #endif
-