Changeset 3870

Timestamp:

Aug 16, 2013 2:17:25 AM (11 years ago)

Author:

ldelgass

Message:

Add VTK reader/resampler to nanovis

Location:

trunk/packages/vizservers/nanovis

Files:

• Command.cpp (modified) (4 diffs)
• DataSetResample.cpp (added)
• DataSetResample.h (added)
• Makefile.in (modified) (9 diffs)
• VtkDataSetReader.cpp (added)
• VtkDataSetReader.h (added)
• VtkReader.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/Command.cpp

@@ -55 +55 @@
 #include "FlowCmd.h"
 #include "dxReader.h"
+#ifdef USE_VTK
+#include "VtkDataSetReader.h"
+#endif
 #include "VtkReader.h"
 #include "BMPWriter.h"
@@ -1273 +1276 @@
     } else if ((nBytes > 14) && (strncmp(bytes, "# vtk DataFile", 14) == 0)) {
         TRACE("VTK loading...");
-        std::stringstream fdata;
-        fdata.write(bytes, nBytes);
         if (nBytes <= 0) {
             ERROR("data buffer is empty");
@@ -1280 +1281 @@
         }
         Rappture::Outcome context;
+#ifdef USE_VTK
+        volume = load_vtk_volume_stream(context, tag, bytes, nBytes);
+#else
+        std::stringstream fdata;
+        fdata.write(bytes, nBytes);
         volume = load_vtk_volume_stream(context, tag, fdata);
+#endif
         if (volume == NULL) {
             Tcl_AppendResult(interp, context.remark(), (char*)NULL);
@@ -1292 +1299 @@
         }
         TRACE("DX loading...");
-        std::stringstream fdata;
-        fdata.write(bytes, nBytes);
         if (nBytes <= 0) {
             ERROR("data buffer is empty");
             abort();
         }
+        std::stringstream fdata;
+        fdata.write(bytes, nBytes);
         Rappture::Outcome context;
         volume = load_dx_volume_stream(context, tag, fdata);

trunk/packages/vizservers/nanovis/Makefile.in

@@ -3 +3 @@
 USE_POINTSET_RENDERER   = #yes
 USE_PARTICLE_SYSTEM     = #yes
+USE_VTK                 = yes
 
 SHELL = /bin/sh
@@ -53 +54 @@
 VRMATH_LIB_SPEC = $(VRMATH_LIB)
 
+VTK_LIB_DIR     = @VTK_LIB_DIR@
+VTK_INC_SPEC    = @VTK_INC_SPEC@
+VTK_LIB_SPEC    = \
+                -lvtkIOCore-6.0 \
+                -lvtkIOLegacy-6.0 \
+                -lvtkFiltersCore-6.0 \
+                -lvtkImagingHybrid-6.0 \
+                -lvtkImagingCore-6.0 \
+                -lvtkCommonCore-6.0 \
+                -lvtkCommonDataModel-6.0 \
+                -lvtkCommonExecutionModel-6.0  \
+                -lvtkCommonMisc-6.0  \
+                -lvtkCommonSystem-6.0 \
+                -lvtkCommonTransforms-6.0 \
+                -lvtkCommonMath-6.0
+
 EXTRA_LIBS      = -lm -lpthread
 RP_DIR          =  @RP_DIR@
@@ -73 +90 @@
                 $(UTIL_LIB_SPEC) \
                 $(VRMATH_LIB_SPEC) \
+                $(VTK_LIB_SPEC) \
                 $(TCL_LIB_SPEC) \
                 $(CG_LIB_SPEC) \
@@ -85 +103 @@
                 $(MAT_INC_SPEC) \
                 $(VRMATH_INC_SPEC) \
+                $(VTK_INC_SPEC) \
                 $(TCL_INC_SPEC) \
                 $(CG_INC_SPEC) \
@@ -103 +122 @@
 ifdef USE_POINTSET_RENDERER
 DEFINES         += -DUSE_POINTSET_RENDERER
+endif
+ifdef USE_VTK
+DEFINES         += -DUSE_VTK
 endif
 CXX_SWITCHES    = $(CFLAGS) $(EXTRA_CFLAGS) $(DEFINES) $(INCLUDES)
@@ -204 +226 @@
 endif
 
+ifdef USE_VTK
+OBJS +=         DataSetResample.o \
+                VtkDataSetReader.o
+endif
+
 .PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean graphics imgloaders newmat11 util vrmath
 
@@ -287 +314 @@
 ContourLineFilter.o: ContourLineFilter.cpp ContourLineFilter.h
 ConvexPolygon.o: ConvexPolygon.cpp ConvexPolygon.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h Plane.h
+DataSetResample.o: DataSetResample.cpp DataSetResample.h
 Flow.o: Flow.cpp Flow.h FlowCmd.h FlowTypes.h FlowBox.h FlowParticles.h LIC.h VelocityArrowsSlice.h Switch.h Unirect.h Volume.h TransferFunction.h Trace.h
 FlowBox.o: FlowBox.cpp FlowBox.h FlowTypes.h Switch.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h
@@ -293 +321 @@
 GradientFilter.o: GradientFilter.cpp GradientFilter.h
 Grid.o: Grid.cpp Grid.h Axis.h Chain.h $(UTIL_DIR)/Fonts.h $(VRMATH_DIR)/include/vrmath/Color4f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h
-HeightMap.o: HeightMap.cpp HeightMap.h
-LIC.o: LIC.cpp LIC.h
+HeightMap.o: HeightMap.cpp HeightMap.h Shader.h
+LIC.o: LIC.cpp LIC.h Shader.h
 OrientationIndicator.o: OrientationIndicator.cpp OrientationIndicator.h
 ParticleAdvectionShader.o: ParticleAdvectionShader.cpp ParticleAdvectionShader.h Shader.h
@@ -327 +355 @@
 VolumeRenderer.o: VolumeRenderer.cpp VolumeRenderer.h ConvexPolygon.h Volume.h nanovis.h Trace.h Plane.h StdVertexShader.h Shader.h
 VolumeShader.o: VolumeShader.cpp VolumeShader.h Shader.h
-VtkReader.o: VtkReader.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h ReaderCommon.h nanovis.h
+VtkDataSetReader.o: VtkDataSetReader.cpp VtkDataSetReader.h DataSetResample.h $(VRMATH_DIR)/include/vrmath/Vector3f.h ReaderCommon.h Trace.h Volume.h nanovis.h config.h
+VtkReader.o: VtkReader.h Trace.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h ReaderCommon.h nanovis.h config.h
 ZincBlendeReconstructor.o: ZincBlendeReconstructor.cpp ZincBlendeReconstructor.h ZincBlendeVolume.h Volume.h $(VRMATH_DIR)/include/vrmath/Vector3f.h
 ZincBlendeVolume.o: ZincBlendeVolume.cpp ZincBlendeVolume.h config.h define.h

trunk/packages/vizservers/nanovis/VtkReader.cpp

@@ -16 +16 @@
 #include "ReaderCommon.h"
 
+#include "config.h"
 #include "nanovis.h"
 #include "VtkReader.h"