Changeset 2953 for trunk/packages
- Timestamp:
- Apr 9, 2012, 10:18:09 AM (12 years ago)
- Location:
- trunk/packages/vizservers/nanovis
- Files:
-
- 33 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/nanovis/Axis.h
r2923 r2953 2 2 #ifndef AXIS_H 3 3 #define AXIS_H 4 5 #include <stdlib.h> 4 6 5 7 #include <cmath> … … 45 47 }; 46 48 47 /* 48 * ---------------------------------------------------------------------- 49 * 50 * Ticks -- 51 * 52 * Structure containing information where the ticks (major or 53 * minor) will be displayed on the graph. 54 * 55 * ---------------------------------------------------------------------- 49 /** 50 * Class containing information where the ticks (major or 51 * minor) will be displayed on the graph. 56 52 */ 57 53 class Ticks … … 182 178 183 179 /** 184 * Structurecontains options controlling how the axis will be180 * Class contains options controlling how the axis will be 185 181 * displayed. 186 182 */ … … 212 208 } 213 209 210 bool firstMajor(TickIter& iter) 211 { 212 return _major.firstTick(iter); 213 } 214 215 bool firstMinor(TickIter& iter) 216 { 217 return _minor.firstTick(iter); 218 } 219 214 220 void resetRange(); 215 221 … … 218 224 void setScale(double min, double max); 219 225 220 double scale() 226 double scale() const 221 227 { 222 228 return _scale; 223 229 } 224 230 225 double range() 231 double range() const 226 232 { 227 233 return _range; 228 234 } 229 235 230 bool firstMajor(TickIter& iter)231 {232 return _major.firstTick(iter);233 }234 235 bool firstMinor(TickIter& iter)236 {237 return _minor.firstTick(iter);238 }239 240 236 void getDataLimits(double& min, double& max) 241 237 { 242 238 min = _valueMin, max = _valueMax; 239 } 240 241 double min() const 242 { 243 return _min; 244 } 245 246 void min(double min) 247 { 248 _reqMin = min; 249 } 250 251 double max() const 252 { 253 return _max; 254 } 255 256 void max(double max) 257 { 258 _reqMax = max; 259 } 260 261 void setLimits(double min, double max) 262 { 263 _reqMin = min, _reqMax = max; 264 } 265 266 void unsetLimits() 267 { 268 min(NAN), max(NAN); 243 269 } 244 270 … … 284 310 } 285 311 _title = strdup(title); 286 }287 288 double min()289 {290 return _min;291 }292 293 void min(double min)294 {295 _reqMin = min;296 }297 298 double max()299 {300 return _max;301 }302 303 void max(double max)304 {305 _reqMax = max;306 }307 308 void setLimits(double min, double max)309 {310 _reqMin = min, _reqMax = max;311 }312 313 void unsetLimits()314 {315 min(NAN), max(NAN);316 312 } 317 313 -
trunk/packages/vizservers/nanovis/Command.cpp
r2931 r2953 78 78 1.0 1 0 1\n\ 79 79 } {\n\ 80 0.00 1.0\n\ 81 0.05 0.0\n\ 82 0.15 0.0\n\ 83 0.20 1.0\n\ 84 0.25 0.0\n\ 85 0.35 0.0\n\ 86 0.40 1.0\n\ 87 0.45 0.0\n\ 88 0.55 0.0\n\ 89 0.60 1.0\n\ 90 0.65 0.0\n\ 91 0.75 0.0\n\ 92 0.80 1.0\n\ 93 0.85 0.0\n\ 94 0.95 0.0\n\ 95 1.00 1.0\n\ 80 0.00000 0.0\n\ 81 0.19999 0.0\n\ 82 0.20000 1.0\n\ 83 0.20001 0.0\n\ 84 0.39999 0.0\n\ 85 0.40000 1.0\n\ 86 0.40001 0.0\n\ 87 0.59999 0.0\n\ 88 0.60000 1.0\n\ 89 0.60001 0.0\n\ 90 0.79999 0.0\n\ 91 0.80000 1.0\n\ 92 0.80001 0.0\n\ 93 1.00000 0.0\n\ 96 94 }"; 97 95 … … 651 649 NanoVis::readScreen(); 652 650 653 NanoVis::ppmWrite("nv>image - bytes %d -type print");651 NanoVis::ppmWrite("nv>image -type print -bytes %d"); 654 652 NanoVis::resizeOffscreenBuffer(w, h); 655 653 -
trunk/packages/vizservers/nanovis/FlowCmd.cpp
r2932 r2953 561 561 562 562 Vector3 loc = _volPtr->location(); 563 /*This is wrong. Need to compute origin. */564 NanoVis::xOrigin = loc.x;565 NanoVis::yOrigin = loc.y;566 NanoVis::zOrigin = loc.z;567 563 568 564 _fieldPtr->setVectorField(_volPtr, loc, … … 657 653 Volume *volPtr; 658 654 659 volPtr = NanoVis::loadVolume(_name, _dataPtr->xNum(), _dataPtr->yNum(), 660 _dataPtr->zNum(), 4, data, 655 volPtr = NanoVis::loadVolume(_name, 656 _dataPtr->xNum(), 657 _dataPtr->yNum(), 658 _dataPtr->zNum(), 659 4, data, 661 660 NanoVis::magMin, NanoVis::magMax, 0); 662 661 volPtr->xAxis.setRange(_dataPtr->xMin(), _dataPtr->xMax()); … … 672 671 NanoVis::magMin, NanoVis::magMax); 673 672 volPtr->setPhysicalBBox(physicalMin, physicalMax); 674 //volPtr->numSlices(256 - _volIndex);675 //volPtr->numSlices(512 - _volIndex);676 //volPtr->numSlices(256 - n);677 // TBD..678 /* Don't set the slice number until we're are about to render the679 volume. */680 673 volPtr->disableCutplane(0); 681 674 volPtr->disableCutplane(1); … … 689 682 volPtr->specular(_sv.specular); 690 683 volPtr->diffuse(_sv.diffuse); 691 TRACE("volume is now %d %d\n", _sv.showVolume, volPtr->visible());692 684 volPtr->visible(_sv.showVolume); 693 685 float dx0 = -0.5; … … 1018 1010 continue; 1019 1011 } 1020 Rappture::Unirect3d *dataPtr; 1021 dataPtr = flowPtr->data(); 1012 Rappture::Unirect3d *dataPtr = flowPtr->data(); 1022 1013 min = dataPtr->magMin(); 1023 1014 max = dataPtr->magMax(); … … 1065 1056 // FIXME: This doesn't work when there is more than one flow. 1066 1057 licRenderer->setOffset(flowPtr->GetRelativePosition()); 1067 NanoVis::velocityArrowsSlice->slicePos(flowPtr->GetRelativePosition());1058 velocityArrowsSlice->slicePos(flowPtr->GetRelativePosition()); 1068 1059 } 1069 1060 AdvectFlows(); -
trunk/packages/vizservers/nanovis/Grid.cpp
r2932 r2953 18 18 _majorColor(1.0f, 1.0f, 1.0f, 1.0f), 19 19 _minorColor(0.5f, 0.5f, 0.5f, 1.0f), 20 _font( 0),20 _font(NULL), 21 21 _visible(false) 22 { 23 } 24 25 Grid::~Grid() 22 26 { 23 27 } -
trunk/packages/vizservers/nanovis/Grid.h
r2910 r2953 33 33 public: 34 34 Grid(); 35 virtual ~Grid(); 35 36 36 37 bool isVisible() const -
trunk/packages/vizservers/nanovis/HeightMap.cpp
r2932 r2953 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 #include <memory.h>3 #include <stdlib.h>4 #include <sys/time.h>5 #include <sys/types.h>6 #include <unistd.h>7 #include <fcntl.h>8 #include <stdlib.h>9 2 10 3 #include <GL/glew.h> … … 15 8 #include "ContourLineFilter.h" 16 9 #include "Texture1D.h" 17 #include "R2/R2FilePath.h"18 #include "RpField1D.h"19 10 #include "RenderContext.h" 20 11 … … 57 48 } 58 49 if (_heights != NULL) { 59 free(_heights);50 delete [] _heights; 60 51 } 61 52 } -
trunk/packages/vizservers/nanovis/HeightMap.h
r2927 r2953 36 36 /** 37 37 *@brief Create a height map with heigh values 38 *@param startX ax position of the first height value39 *@param startY ay position of the first height value40 *@param endX ax position of the last height value41 *@param endY ay position of the last height value38 *@param startX x position of the first height value 39 *@param startY y position of the first height value 40 *@param endX x position of the last height value 41 *@param endY y position of the last height value 42 42 *@param xCount the number of columns of height values 43 43 *@param yCount the number of rows of height values … … 126 126 127 127 private: 128 void createIndexBuffer(int xCount, int zCount, float *heights);128 void createIndexBuffer(int xCount, int zCount, float *heights); 129 129 Vector3 *createHeightVertices(float startX, float startY, 130 130 float endX, float endY, 131 int xCount, int yCount, float 131 int xCount, int yCount, float *height); 132 132 void reset(); 133 133 … … 145 145 int _indexCount; 146 146 Vector3 _contourColor; 147 147 148 148 bool _contourVisible; 149 149 bool _topContourVisible; 150 150 bool _visible; 151 151 152 152 Vector3 _scale; 153 153 Vector3 _centerPoint; -
trunk/packages/vizservers/nanovis/NvColorTableShader.cpp
r2914 r2953 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 #include <R2/R2FilePath.h>3 2 4 3 #include <GL/glew.h> -
trunk/packages/vizservers/nanovis/NvFlowVisRenderer.cpp
r2836 r2953 15 15 */ 16 16 17 #include <stdio.h>18 #include <assert.h>19 #include <malloc.h>20 #include <string.h>21 22 #include <R2/R2FilePath.h>23 24 17 #include "NvFlowVisRenderer.h" 25 #include "NvVectorField.h"26 #include "Trace.h"27 18 28 19 #define NV_32 -
trunk/packages/vizservers/nanovis/NvFlowVisRenderer.h
r2877 r2953 3 3 #define NVFLOWVISRENDERER_H 4 4 5 #include <vector>6 5 #include <map> 7 6 #include <string> 8 7 9 #include <GL/glew.h>10 #include <Cg/cgGL.h>11 12 #include "config.h"13 14 #include "Renderable.h"15 #include "RenderVertexArray.h"16 8 #include "Vector3.h" 17 #include "NvParticleAdvectionShader.h"18 9 #include "NvVectorField.h" 19 10 -
trunk/packages/vizservers/nanovis/NvLIC.h
r2951 r2953 31 31 { 32 32 public: 33 NvLIC(int size, int width, int height, int axis, 34 float offset); 33 NvLIC(int size, int width, int height, int axis, float offset); 35 34 ~NvLIC(); 36 35 … … 49 48 void getSlice(); 50 49 51 void setOffset(float v);50 void setOffset(float offset); 52 51 53 52 /** -
trunk/packages/vizservers/nanovis/NvParticleAdvectionShader.cpp
r2916 r2953 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 #include <R2/R2FilePath.h>3 2 4 3 #include <GL/glew.h> -
trunk/packages/vizservers/nanovis/NvParticleAdvectionShader.h
r2950 r2953 8 8 class NvParticleAdvectionShader : public NvShader 9 9 { 10 public: 10 public: 11 11 NvParticleAdvectionShader(); 12 12 -
trunk/packages/vizservers/nanovis/NvParticleRenderer.cpp
r2921 r2953 15 15 */ 16 16 17 #include <stdio.h>18 17 #include <assert.h> 19 #include <malloc.h>20 18 #include <string.h> 21 19 #include <stdlib.h> 22 23 #include <R2/R2FilePath.h>24 20 25 21 #include "NvParticleRenderer.h" … … 300 296 if (_psysFrame == _maxLife) { 301 297 _psysFrame = 0; 302 // 298 // _reborn = true; 303 299 } 304 300 glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboOrig); -
trunk/packages/vizservers/nanovis/NvParticleRenderer.h
r2921 r2953 22 22 #include <Cg/cgGL.h> 23 23 24 #include "config.h"25 26 24 #include "Renderable.h" 25 #include "NvParticleAdvectionShader.h" 27 26 #include "RenderVertexArray.h" 28 27 #include "Vector3.h" 29 #include " NvParticleAdvectionShader.h"28 #include "Vector4.h" 30 29 31 30 struct Particle { -
trunk/packages/vizservers/nanovis/NvStdVertexShader.cpp
r2914 r2953 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 #include <stdio.h>3 2 4 3 #include <GL/glew.h> -
trunk/packages/vizservers/nanovis/NvZincBlendeVolumeShader.cpp
r2919 r2953 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 3 #include <string.h>4 2 5 3 #include <GL/glew.h> -
trunk/packages/vizservers/nanovis/PlaneRenderer.cpp
r2930 r2953 14 14 * ====================================================================== 15 15 */ 16 17 #include <GL/glew.h> 16 18 17 19 #include "PlaneRenderer.h" -
trunk/packages/vizservers/nanovis/PlaneRenderer.h
r2930 r2953 17 17 #define PLANE_RENDERER_H 18 18 19 #include <math.h>20 #include <stdio.h>21 #include <assert.h>22 #include <float.h>23 24 19 #include <vector> 25 26 #include <GL/glew.h>27 #include <Cg/cgGL.h>28 20 29 21 #include "NvColorTableShader.h" -
trunk/packages/vizservers/nanovis/PointSetRenderer.cpp
r2952 r2953 77 77 glBegin(GL_POINTS); 78 78 79 PCA::ClusterList *p;79 PCA::ClusterList *p; 80 80 for (int i = size - 1; i >= 0; --i) { 81 81 p = bucket[i]; -
trunk/packages/vizservers/nanovis/PointSetRenderer.h
r2844 r2953 11 11 class PointSetRenderer 12 12 { 13 public: 13 public: 14 14 PointSetRenderer(); 15 15 ~PointSetRenderer(); -
trunk/packages/vizservers/nanovis/PointShader.cpp
r2870 r2953 1 1 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */ 2 #include <stdio.h>3 #include <stdlib.h>4 #include <assert.h>5 2 6 #include < R2/R2FilePath.h>7 #include < R2/R2string.h>3 #include <GL/glew.h> 4 #include <Cg/cgGL.h> 8 5 9 6 #include "PointShader.h" 10 7 11 8 PointShader::PointShader() : 12 NvShader(), 9 NvShader(), 10 _scale(1.0f), 13 11 _normal(NULL) 14 12 { … … 27 25 } 28 26 29 void PointShader:: setParameters()27 void PointShader::bind() 30 28 { 31 29 cgGLSetStateMatrixParameter(_modelviewVP, CG_GL_MODELVIEW_MATRIX, CG_GL_MATRIX_IDENTITY); … … 35 33 cgGLSetParameter4f(_posoffsetVP, 1.0f, 1.0f, 1.0f, 1.0f); 36 34 cgGLSetParameter4f(_baseposVP, 1.0f, 1.0f, 1.0f, 1.0f); 37 cgGLSetParameter4f(_scaleVP, 1.0f, 1.0f, 1.0f, 1.0f);35 cgGLSetParameter4f(_scaleVP, _scale, 1.0f, 1.0f, 1.0f); 38 36 39 //cgGLSetTextureParameter(_normalParam, _normal->getGraphicsObjectID());37 //cgGLSetTextureParameter(_normalParam, _normal->getGraphicsObjectID()); 40 38 //cgGLEnableTextureParameter(_normalParam); 39 40 NvShader::bind(); 41 41 } 42 42 43 void PointShader:: resetParameters()43 void PointShader::unbind() 44 44 { 45 45 //cgGLDisableTextureParameter(_normalParam); 46 47 NvShader::unbind(); 46 48 } -
trunk/packages/vizservers/nanovis/PointShader.h
r2914 r2953 15 15 void setScale(float scale) 16 16 { 17 cgGLSetParameter4f(_scaleVP, scale, 1.0f, 1.0f, 1.0f);17 _scale = scale; 18 18 } 19 19 20 void setNormalTexture(Texture3D *n )20 void setNormalTexture(Texture3D *normal) 21 21 { 22 _normal = n ;22 _normal = normal; 23 23 } 24 24 25 virtual void bind() 26 { 27 setParameters(); 25 virtual void bind(); 28 26 29 NvShader::bind(); 30 } 31 32 virtual void unbind() 33 { 34 resetParameters(); 35 36 NvShader::unbind(); 37 } 38 39 protected: 40 virtual void setParameters(); 41 virtual void resetParameters(); 27 virtual void unbind(); 42 28 43 29 private: … … 51 37 CGparameter _normalParam; 52 38 39 float _scale; 53 40 Texture3D *_normal; 54 41 }; -
trunk/packages/vizservers/nanovis/R2/src/R2Fonts.cpp
r2877 r2953 73 73 R2Fonts::begin() 74 74 { 75 glPushAttrib(GL_TRANSFORM_BIT | GL_ENABLE_BIT); 75 76 glEnable(GL_TEXTURE_2D); 76 glBindTexture(GL_TEXTURE_2D, _fonts[_fontIndex]. _fontTextureID); 77 78 glPushAttrib(GL_TRANSFORM_BIT | GL_ENABLE_BIT); 77 glBindTexture(GL_TEXTURE_2D, _fonts[_fontIndex]._fontTextureID); 78 79 79 glMatrixMode(GL_PROJECTION); 80 80 glPushMatrix(); 81 82 glLoadIdentity( ); 81 glLoadIdentity(); 82 83 83 gluOrtho2D(0.0f, _screenWidth, _screenHeight, 0.0f); 84 84 85 85 glMatrixMode(GL_MODELVIEW); 86 glPushMatrix( ); 87 glLoadIdentity( ); 88 89 glEnable(GL_TEXTURE_2D); 86 glPushMatrix(); 87 glLoadIdentity(); 88 90 89 glEnable(GL_BLEND); 91 90 glDisable(GL_DEPTH_TEST); … … 98 97 99 98 glMatrixMode(GL_PROJECTION); 100 glPopMatrix( 99 glPopMatrix(); 101 100 102 101 glMatrixMode(GL_MODELVIEW); 103 glPopMatrix( 104 105 glPopAttrib( 102 glPopMatrix(); 103 104 glPopAttrib(); 106 105 } 107 106 … … 229 228 } 230 229 231 fsInput.close( 230 fsInput.close(); 232 231 } 233 232 delete [] path; -
trunk/packages/vizservers/nanovis/RenderVertexArray.cpp
r2921 r2953 51 51 switch (_type) { 52 52 case GL_HALF_FLOAT_NV: 53 _bytesPerComponent = 2; break; 53 _bytesPerComponent = 2; 54 break; 54 55 case GL_FLOAT: 55 _bytesPerComponent = sizeof(float); break; 56 _bytesPerComponent = sizeof(float); 57 break; 56 58 default: 57 59 ERROR("unsupported RenderVertexArray type\n"); … … 70 72 switch(_size) { 71 73 case 1: 72 _format = GL_LUMINANCE; break; 74 _format = GL_LUMINANCE; 75 break; 73 76 case 3: 74 _format = GL_RGB; break; 77 _format = GL_RGB; 78 break; 75 79 case 4: 76 _format = GL_RGBA; break; 80 _format = GL_RGBA; 81 break; 77 82 default: 78 83 ERROR("unsupported RenderVertexArray size\n"); -
trunk/packages/vizservers/nanovis/Unirect.cpp
r2922 r2953 734 734 } 735 735 } 736 TRACE(" GetVectorRange%g %g\n", _magMin, _magMax);736 TRACE("getVectorRange: %g %g\n", _magMin, _magMax); 737 737 } 738 738 -
trunk/packages/vizservers/nanovis/VelocityArrowsSlice.h
r2870 r2953 84 84 85 85 private: 86 void createRenderTarget(); 87 88 void computeSamplingTicks(); 89 86 90 unsigned int _vectorFieldGraphicsID; 87 91 float _vfXscale; … … 134 138 135 139 RenderMode _renderMode; 136 137 void createRenderTarget();138 139 void computeSamplingTicks();140 140 }; 141 141 -
trunk/packages/vizservers/nanovis/VolumeInterpolator.cpp
r2877 r2953 18 18 _numBytes(0), 19 19 _dataCount(0), 20 _numComponents(0), 21 _referenceOfVolume(0) 20 _numComponents(0) 22 21 { 23 22 } … … 133 132 _numComponents = refPtr->numComponents(); 134 133 _numBytes = _dataCount * _numComponents * sizeof(float); 135 134 Vector3 loc = refPtr->location(); 136 135 _volume = new Volume(loc.x, loc.y, loc.z, 137 136 refPtr->width, refPtr->height, refPtr->depth, … … 141 140 refPtr->wAxis.min(), 142 141 refPtr->wAxis.max(), 143 refPtr->nonZeroMin()); 144 /* 145 _referenceOfVolume = refPtr->dataID(); 146 */ 142 refPtr->nonZeroMin()); 147 143 _volume->numSlices(256-1); 148 144 _volume->disableCutplane(0); … … 156 152 _volume->isosurface(0); 157 153 TRACE("VOL : location %f %f %f\n\tid : %s\n", loc.x, loc.y, loc.z, 158 154 refPtr->name()); 159 155 } 160 156 _volumes.push_back(_volume); -
trunk/packages/vizservers/nanovis/VolumeInterpolator.h
r2877 r2953 30 30 double getStartTime() const; 31 31 32 unsigned int getReferenceVolumeID() const;33 34 32 Volume *getVolume(); 35 33 … … 44 42 unsigned int _dataCount; 45 43 unsigned int _numComponents; 46 unsigned int _referenceOfVolume;47 44 double _startTime; 48 45 }; … … 63 60 } 64 61 65 inline unsigned int VolumeInterpolator::getReferenceVolumeID() const66 {67 return _referenceOfVolume;68 }69 70 62 #endif 71 63 -
trunk/packages/vizservers/nanovis/dxReader.cpp
r2942 r2953 213 213 } 214 214 215 TRACE("found nx=%d ny=%d n z=%d\ndx=%f dy=%f dz=%f\nx0=%f y0=%f z0=%f\n",216 nx, ny, n z, dx, dy, dz, x0, y0, z0);215 TRACE("found nx=%d ny=%d nxy=%d nz=%d\ndx=%f dy=%f dz=%f\nx0=%f y0=%f z0=%f\n", 216 nx, ny, nxy, nz, dx, dy, dz, x0, y0, z0); 217 217 218 218 lx = (nx - 1) * dx; … … 296 296 #if ISO_TEST 297 297 double dv = vmax - vmin; 298 int count = nx*ny*nz;299 int ngen = 0;300 double v;301 298 if (dv == 0.0) { 302 299 dv = 1.0; 303 300 } 304 301 305 for (int i = 0; i < count; ++i) { 306 v = data[ngen]; 302 int ngen = 0; 303 const int step = 4; 304 for (int i = 0; i < nx*ny*nz; ++i) { 305 double v = data[ngen]; 307 306 // scale all values [0-1], -1 => out of bounds 308 307 v = (isnan(v)) ? -1.0 : (v - vmin)/dv; 309 308 310 309 data[ngen] = v; 311 ngen += 4;310 ngen += step; 312 311 } 313 312 … … 429 428 } 430 429 431 // figure out a good mesh spacing432 int nsample = 30;433 430 x0 = field.rangeMin(Rappture::xaxis); 434 431 lx = field.rangeMax(Rappture::xaxis) - field.rangeMin(Rappture::xaxis); … … 437 434 z0 = field.rangeMin(Rappture::zaxis); 438 435 lz = field.rangeMax(Rappture::zaxis) - field.rangeMin(Rappture::zaxis); 436 437 // figure out a good mesh spacing 438 int nsample = 30; 439 439 double dmin = pow((lx*ly*lz)/((nsample-1)*(nsample-1)*(nsample-1)), 0.333); 440 440 … … 453 453 dz = lz /(double)(nz - 1); 454 454 455 data = new float[4*nx*ny*nz];456 457 455 vmin = field.valueMin(); 458 456 vmax = field.valueMax(); … … 463 461 } 464 462 463 data = new float[4*nx*ny*nz]; 465 464 // generate the uniformly sampled data that we need for a volume 466 465 int ngen = 0; … … 490 489 491 490 TRACE("nx = %i ny = %i nz = %i\n", nx, ny, nz); 491 TRACE("x0 = %lg y0 = %lg z0 = %lg\n", x0, y0, z0); 492 492 TRACE("lx = %lg ly = %lg lz = %lg\n", lx, ly, lz); 493 493 TRACE("dx = %lg dy = %lg dz = %lg\n", dx, dy, dz); 494 TRACE("dataMin = %lg \tdataMax = %lg\tnzero_min = %lg\n",494 TRACE("dataMin = %lg dataMax = %lg nzero_min = %lg\n", 495 495 vmin, vmax, nzero_min); 496 496 … … 502 502 volPtr->updatePending = true; 503 503 504 504 // TBD.. 505 505 #if 0 && defined(USE_POINTSET_RENDERER) 506 506 PointSet *pset = new PointSet(); -
trunk/packages/vizservers/nanovis/nanovis.cpp
r2951 r2953 173 173 float NanoVis::wMin = FLT_MAX; 174 174 float NanoVis::wMax = -FLT_MAX; 175 float NanoVis::xOrigin;176 float NanoVis::yOrigin;177 float NanoVis::zOrigin;178 175 179 176 /* FIXME: This variable is always true. */ … … 362 359 doExit(int code) 363 360 { 364 TRACE("in doExit \n");361 TRACE("in doExit: %d\n", code); 365 362 NanoVis::removeAllData(); 366 363 … … 513 510 int 514 511 NanoVis::renderLegend(TransferFunction *tf, double min, double max, 515 int width, int height, const char *volArg)512 int width, int height, const char *volArg) 516 513 { 517 514 TRACE("in renderLegend\n"); … … 544 541 ssize_t nWritten; 545 542 546 TRACE(" ppm legend image");543 TRACE("Sending ppm legend image %s min:%g max:%g", volArg, min, max); 547 544 sprintf(prefix, "nv>legend %s %g %g", volArg, min, max); 548 545 ppmWrite(prefix); -
trunk/packages/vizservers/nanovis/nanovis.h
r2951 r2953 171 171 static double magMin, magMax; 172 172 static float xMin, xMax, yMin, yMax, zMin, zMax, wMin, wMax; 173 static float xOrigin, yOrigin, zOrigin;174 173 175 174 static NvColorTableRenderer *colorTableRenderer; -
trunk/packages/vizservers/nanovis/protocol-nanovis.txt
r2892 r2953 186 186 (followed by bytes) 187 187 188 nv>data tag <dataobj-tag> min <val> max <val> vmin <val> vmax <val> 189 The min,max data values for the data object and the cumulative volume data 190 min,max over all volumes 191 188 192 ================================================================================ 189 193 Error Replies:
Note: See TracChangeset
for help on using the changeset viewer.