Release version 1.12

Using tarball (with SHA1):
257e94e959f3aa81e1413b6fac53cf38fd435e2e *3DVisualizer-1.12.tar.gz

Concrete/CitcomSGlobalASCIIFile.cpp

@@ -2,7 +2,7 @@
 CitcomSGlobalASCIIFile - Class reading ASCII files produced by parallel
 global CitcomS simulations. These are the uncombined files produced by
 each CPU in a parallel run.
-Copyright (c) 2008-2011 Oliver Kreylos
+Copyright (c) 2008-2012 Oliver Kreylos
 
 This file is part of the 3D Data Visualizer (Visualizer).
 
@@ -133,6 +133,7 @@ Visualization::Abstract::DataSet* CitcomSGlobalASCIIFile::load(const std::vector
 			coordFileName.append(".coord.");
 			coordFileName.append(Misc::ValueCoder<int>::encode(cpuLinearIndex));
 			IO::ValueSource coordReader(openFile(coordFileName,pipe));
+			coordReader.skipWs();
 
 			/* Read and check the header line: */
 			try
@@ -245,7 +246,7 @@ Visualization::Abstract::DataSet* CitcomSGlobalASCIIFile::load(const std::vector
 					std::cout<<"Reading vector variable "<<*argIt<<"...   0%"<<std::flush;
 
 				/* Add seven new slices to the data set (3 components spherical and Cartesian each plus Cartesian magnitude): */
-				static const char* componentNames[7]={" Colatitude"," Longitude"," Radius"," X"," Y"," Z"};
+				static const char* componentNames[7]={" Colatitude"," Longitude"," Radius"," X"," Y"," Z"," Magnitude"};
 				for(int i=0;i<7;++i)
 					{
 					dataSet.addSlice();
@@ -306,6 +307,7 @@ Visualization::Abstract::DataSet* CitcomSGlobalASCIIFile::load(const std::vector
 					dataValueFileName.push_back('.');
 					dataValueFileName.append(Misc::ValueCoder<int>::encode(timeStepIndex));
 					IO::ValueSource dataValueReader(openFile(dataValueFileName,pipe));
+					dataValueReader.skipWs();
 
 					/* Read and check the header line(s) in the data value file: */
 					try

Concrete/CitcomSGlobalASCIIFile.h

@@ -2,7 +2,7 @@
 CitcomSGlobalASCIIFile - Class reading ASCII files produced by parallel
 global CitcomS simulations. These are the uncombined files produced by
 each CPU in a parallel run.
-Copyright (c) 2008-2011 Oliver Kreylos
+Copyright (c) 2008-2012 Oliver Kreylos
 
 This file is part of the 3D Data Visualizer (Visualizer).
 

Concrete/CitcomSRegionalASCIIFile.cpp

@@ -2,7 +2,7 @@
 CitcomSRegionalASCIIFile - Class reading ASCII files produced by
 parallel regional CitcomS simulations. These are the uncombined files
 produced by each CPU in a parallel run.
-Copyright (c) 2008-2011 Oliver Kreylos
+Copyright (c) 2008-2012 Oliver Kreylos
 
 This file is part of the 3D Data Visualizer (Visualizer).
 
@@ -247,7 +247,7 @@ Visualization::Abstract::DataSet* CitcomSRegionalASCIIFile::load(const std::vect
 					std::cout<<"Reading vector variable "<<*argIt<<"...   0%"<<std::flush;
 
 				/* Add seven new slices to the data set (3 components spherical and Cartesian each plus Cartesian magnitude): */
-				static const char* componentNames[7]={" Colatitude"," Longitude"," Radius"," X"," Y"," Z"};
+				static const char* componentNames[7]={" Colatitude"," Longitude"," Radius"," X"," Y"," Z"," Magnitude"};
 				for(int i=0;i<7;++i)
 					{
 					dataSet.addSlice();

Concrete/CitcomSRegionalASCIIFile.h

@@ -2,7 +2,7 @@
 CitcomSRegionalASCIIFile - Class reading ASCII files produced by
 parallel regional CitcomS simulations. These are the uncombined files
 produced by each CPU in a parallel run.
-Copyright (c) 2008-2011 Oliver Kreylos
+Copyright (c) 2008-2012 Oliver Kreylos
 
 This file is part of the 3D Data Visualizer (Visualizer).
 

Concrete/StructuredHexahedralTecplotASCIIFile.cpp

@@ -213,6 +213,7 @@ Visualization::Abstract::DataSet* StructuredHexahedralTecplotASCIIFile::load(con
 		DS::Grid& grid=dataSet.getGrid(gridIndex);
 
 		/* Read all grid vertices and scalar values for the zone: */
+		parser.setWhitespace('\n',false);
 		int index0Start=0;
 		int index0End=numZoneVertices[0];
 		int index0Inc=1;
@@ -223,9 +224,10 @@ Visualization::Abstract::DataSet* StructuredHexahedralTecplotASCIIFile::load(con
 			index0Inc=-1;
 			}
 		DS::Index index;
+		size_t line=1;
 		for(index[0]=index0Start;index[0]!=index0End;index[0]+=index0Inc)
 			for(index[1]=0;index[1]<numZoneVertices[1];++index[1])
-				for(index[2]=0;index[2]<numZoneVertices[2];++index[2])
+				for(index[2]=0;index[2]<numZoneVertices[2];++index[2],++line)
 					{
 					/* Parse the line: */
 					try
@@ -236,7 +238,7 @@ Visualization::Abstract::DataSet* StructuredHexahedralTecplotASCIIFile::load(con
 						}
 					catch(std::runtime_error err)
 						{
-						Misc::throwStdErr("StructuredHexahedralTecplotASCIIFile::load: %s while reading zone from file %s",err.what(),dataFileName);
+						Misc::throwStdErr("StructuredHexahedralTecplotASCIIFile::load: %s while reading zone from file %s at vertex (%d, %d, %d) in line %u",err.what(),dataFileName,index[0],index[1],index[2],(unsigned int)line);
 						}
 
 					/* Extract and store the vertex position: */
@@ -261,6 +263,7 @@ Visualization::Abstract::DataSet* StructuredHexahedralTecplotASCIIFile::load(con
 						dataSet.getVertexValue(vectorSliceIndices[i*4+3],gridIndex,index)=vector.mag();
 						}
 					}
+		parser.setWhitespace('\n',true);
 		if(master)
 			std::cout<<" done"<<std::endl;
 

HISTORY

@@ -116,3 +116,8 @@
   cluster environments.
 - Added module class SCTFile for Cartesian single-channel volumetric
   data sets created by LLNL-developed reprojection code.
+
+3D Visualizer 1.12:
+- Bumped required Vrui version number to 2.5-001.
+- Fixed line parser error in StructuredHexahedralTecplotASCIIFile.
+- Small changes to build system in line with Vrui.

README

@@ -1,5 +1,5 @@
 ========================================================================
-README for 3D Visualizer version 1.11
+README for 3D Visualizer version 1.12
 Copyright (c) 2005-2012 Oliver Kreylos
 ========================================================================
 
@@ -28,7 +28,7 @@ Science Foundation.
 Requirements
 ============
 
-3D Visualizer version 1.11 requires Vrui version 2.4 build 001 or newer.
+3D Visualizer version 1.12 requires Vrui version 2.5 build 001 or newer.
 To read images in PNG, JPEG, or TIFF formats, libpng, libjpeg, or
 libtiff have to be installed, respectively, and Vrui has to be
 configured with support for these image formats (see Vrui README file).
@@ -59,7 +59,7 @@ accounts.
 2. Change into 3D Visualizer base directory:
    > cd 3DVisualizer-<version>
 
-3. Adapt makefile if Vrui installation path is *not* ~/Vrui-2.4 by
+3. Adapt makefile if Vrui installation path is *not* ~/Vrui-2.5 by
    setting the VRUIDIR variable to the correct location. VRUIDIR is
    *not* the directory containing Vrui's sources (and the Vrui README
    file), but the directory specified via the INSTALLDIR variable in

VERSION

@@ -1 +1 @@
-3DVisualizer 1.11
+3DVisualizer 1.12

Wrappers/VolumeRenderer.icpp

@@ -286,7 +286,7 @@ VolumeRenderer<DataSetWrapperParam>::glRenderAction(
 	/* Render the volume: */
 	renderer->setSliceCenter(PaletteRenderer::Point::origin);
 	renderer->setColorMap(&privateColorMap);
-	renderer->renderBlock(contextData,viewDirection);
+	renderer->renderBlock(renderState.getContextData(),viewDirection);
 
 	/* Reset OpenGL state: */
 	if(!alphaTestEnabled)

makefile

@@ -25,7 +25,10 @@
 # matches the default Vrui installation; if Vrui's installation
 # directory was changed during Vrui's installation, the directory below
 # must be adapted.
-VRUI_MAKEDIR := $(HOME)/Vrui-2.4/share/make
+VRUI_MAKEDIR := $(HOME)/Vrui-2.5/share/make
+ifdef DEBUG
+  VRUI_MAKEDIR := $(VRUI_MAKEDIR)/debug
+endif
 
 # Base installation directory for 3D Visualizer and its module
 # plug-ins. The module plug-ins cannot be moved from this location
@@ -102,7 +105,7 @@ PACKAGEROOT := $(shell pwd)
 # subsequent release versions of 3D Visualizer from clobbering each
 # other. The value should be identical to the major.minor version
 # number found in VERSION in the root package directory.
-VERSION = 1.11
+VERSION = 1.12
 
 # Set up resource directories: */
 PLUGINSDIREXT = 3DVisualizer-$(VERSION)
@@ -337,10 +340,10 @@ endif
 $(call MODULENAME,%): $(OBJDIR)/pic/Concrete/%.o
 	@mkdir -p $(PLUGINDESTDIR)
 ifdef SHOWCOMMAND
-	$(CCOMP) $(PLUGINLINKFLAGS) -o $@ $^ $(LINKDIRFLAGS) $(LINKLIBFLAGS)
+	$(CCOMP) $(PLUGINLINKFLAGS) -o $@ $(filter %.o,$^) $(LINKDIRFLAGS) $(LINKLIBFLAGS)
 else
 	@echo Linking $@...
-	@$(CCOMP) $(PLUGINLINKFLAGS) -o $@ $^ $(LINKDIRFLAGS) $(LINKLIBFLAGS)
+	@$(CCOMP) $(PLUGINLINKFLAGS) -o $@ $(filter %.o,$^) $(LINKDIRFLAGS) $(LINKLIBFLAGS)
 endif
 
 # Dependencies and special flags for visualization modules:
@@ -371,10 +374,10 @@ $(call COLLABORATIONPLUGINNAME,%): PACKAGES += MYCOLLABORATIONSERVER
 $(call COLLABORATIONPLUGINNAME,%): $(OBJDIR)/pic/%.o
 	@mkdir -p $(COLLABORATIONPLUGINDESTDIR)
 ifdef SHOWCOMMAND
-	$(CCOMP) $(PLUGINLINKFLAGS) -o $@ $^ $(LINKDIRFLAGS) $(LINKLIBFLAGS)
+	$(CCOMP) $(PLUGINLINKFLAGS) -o $@ $(filter %.o,$^) $(LINKDIRFLAGS) $(LINKLIBFLAGS)
 else
 	@echo Linking $@...
-	@$(CCOMP) $(PLUGINLINKFLAGS) -o $@ $^ $(LINKDIRFLAGS) $(LINKLIBFLAGS)
+	@$(CCOMP) $(PLUGINLINKFLAGS) -o $@ $(filter %.o,$^) $(LINKDIRFLAGS) $(LINKLIBFLAGS)
 endif
 
 $(call COLLABORATIONPLUGINNAME,SharedVisualizationServer): $(OBJDIR)/pic/SharedVisualizationProtocol.o \