Changeset 2845 for trunk/packages/vizservers/nanovis

Timestamp:

Mar 12, 2012 10:41:32 AM (12 years ago)

Author:

ldelgass

Message:

More cleanups

Location:

trunk/packages/vizservers/nanovis

Files:

• dxReader2.cpp (modified) (4 diffs)
• dxReaderCommon.h (modified) (1 diff)

trunk/packages/vizservers/nanovis/dxReader2.cpp

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+#include <stdio.h>
+#include <iostream>
+#include <fstream>
+
+// rappture headers
+#include <RpEncode.h>
+#include <RpOutcome.h>
+
 #include "nvconf.h"
 #ifdef HAVE_DX_DX_H
 #include "RpDX.h"
 #undef ERROR
+
+#include "nanovis.h"
 #include "dxReaderCommon.h"
+#include "Volume.h"
 
-#include <stdio.h>
-#include <iostream>
-#include <fstream>
-
-// nanovis headers
-#include "nanovis.h"
-
-// rappture headers
-#include "RpEncode.h"
-#include "RpOutcome.h"
 /* Load a 3D volume from a dx-format file the new way
  */
 Volume *
-load_volume_stream_odx(Rappture::Outcome &context, const char *tag, 
-                        const char *buf, int nBytes)
+load_volume_stream_odx(Rappture::Outcome& context, const char *tag, 
+                       const char *buf, int nBytes)
 {
     char dxfilename[128];
@@ -30 +31 @@
 
     // write the dx file to disk, because DXImportDX takes a file name
-
-    // You can do it like this.  Give 
     sprintf(dxfilename, "/tmp/dx%d.dx", getpid());
 
@@ -61 +60 @@
     float dz = nz;
 
-    const float* data1 = dxObj.data();
+    const float *data1 = dxObj.data();
     float *data = new float[nx*ny*nz*4];
     memset(data, 0, nx*ny*nz*4);
-    int iz=0, ix=0, iy=0;
+    int iz = 0, ix = 0, iy = 0;
     float dv = dxObj.dataMax() - dxObj.dataMin();
     float vmin = dxObj.dataMin();
 
-    for (int i=0; i < nx*ny*nz; i++) {
+    for (int i = 0; i < nx*ny*nz; i++) {
         int nindex = (iz*nx*ny + iy*nx + ix) * 4;
         float v = data1[i];
@@ -90 +89 @@
     computeSimpleGradient(data, nx, ny, nz);
 
-    TRACE("nx = %i ny = %i nz = %i\n",nx,ny,nz);
-    TRACE("dx = %lg dy = %lg dz = %lg\n",dx,dy,dz);
-    TRACE("dataMin = %lg\tdataMax = %lg\tnzero_min = %lg\n", dxObj.dataMin(),dxObj.dataMax(),dxObj.nzero_min());
+    TRACE("nx = %i ny = %i nz = %i\n", nx, ny, nz);
+    TRACE("dx = %lg dy = %lg dz = %lg\n", dx, dy, dz);
+    TRACE("dataMin = %lg\tdataMax = %lg\tnzero_min = %lg\n",
+          dxObj.dataMin(), dxObj.dataMax(), dxObj.nzero_min());
 
     Volume *volPtr;

trunk/packages/vizservers/nanovis/dxReaderCommon.h

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-#ifndef _DX_READER_COMMON_H
-#define _DX_READER_COMMON_H
+#ifndef DX_READER_COMMON_H
+#define DX_READER_COMMON_H
 
-float* merge(float* scalar, float* gradient, int size);
-void normalizeScalar(float* fdata, int count, float min, float max);
-float* computeGradient(float* fdata, int width, int height, int depth,
-        float min, float max);
-void computeSimpleGradient(float* data, int nx, int ny, int nz);
+extern float *
+merge(float *scalar, float *gradient, int size);
 
-#endif /*_DX_READER_COMMON_H*/
+extern void
+normalizeScalar(float *fdata, int count, float min, float max);
+
+extern float *
+computeGradient(float *fdata, int width, int height, int depth,
+                float min, float max);
+
+extern void
+computeSimpleGradient(float *data, int nx, int ny, int nz);
+
+#endif