Changeset 4037
- Timestamp:
- Nov 7, 2013, 2:21:45 PM (11 years ago)
- Location:
- trunk/packages/vizservers/vtkvis
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/vtkvis/GraphicsObject.h
r3977 r4037 30 30 31 31 #include "DataSet.h" 32 #include "Math.h" 32 33 #include "Trace.h" 33 34 … … 231 232 { 232 233 if (getProp3D() != NULL) { 233 double angle = vtkMath::DegreesFromRadians(2.0 * acos(quat[0])); 234 double axis[3]; 235 if (angle < 1.0e-6) { 236 axis[0] = 1; 237 axis[1] = 0; 238 axis[2] = 0; 239 } else { 240 double denom = sqrt(1. - quat[0] * quat[0]); 241 axis[0] = quat[1] / denom; 242 axis[1] = quat[2] / denom; 243 axis[2] = quat[3] / denom; 244 } 245 setOrientation(angle, axis); 234 double angleAxis[4]; 235 quatToAngleAxis(quat, angleAxis); 236 setOrientation(angleAxis[0], &angleAxis[1]); 246 237 } 247 238 } … … 312 303 switch (plane) { 313 304 case PLANE_XY: { 314 if (size[0] > size[1] && size[1] > 1.0e-6) {305 if (size[0] > size[1] && size[1] > 0.0) { 315 306 scale[1] = size[0] / size[1]; 316 } else if (size[1] > size[0] && size[0] > 1.0e-6) {307 } else if (size[1] > size[0] && size[0] > 0.0) { 317 308 scale[0] = size[1] / size[0]; 318 309 } … … 320 311 break; 321 312 case PLANE_ZY: { 322 if (size[1] > size[2] && size[2] > 1.0e-6) {313 if (size[1] > size[2] && size[2] > 0.0) { 323 314 scale[2] = size[1] / size[2]; 324 } else if (size[2] > size[1] && size[1] > 1.0e-6) {315 } else if (size[2] > size[1] && size[1] > 0.0) { 325 316 scale[1] = size[2] / size[1]; 326 317 } … … 328 319 break; 329 320 case PLANE_XZ: { 330 if (size[0] > size[2] && size[2] > 1.0e-6) {321 if (size[0] > size[2] && size[2] > 0.0) { 331 322 scale[2] = size[0] / size[2]; 332 } else if (size[2] > size[0] && size[0] > 1.0e-6) {323 } else if (size[2] > size[0] && size[0] > 0.0) { 333 324 scale[0] = size[2] / size[0]; 334 325 } … … 342 333 case PLANE_XY: { 343 334 if (aspect > 1.0) { 344 if (size[0] > size[1] ) {335 if (size[0] > size[1] && size[1] > 0.0) { 345 336 scale[1] = (size[0] / aspect) / size[1]; 346 } else {337 } else if (size[0] > 0.0) { 347 338 scale[0] = (size[1] * aspect) / size[0]; 348 339 } 349 340 } else { 350 if (size[1] > size[0] ) {341 if (size[1] > size[0] && size[0] > 0.0) { 351 342 scale[0] = (size[1] * aspect) / size[0]; 352 } else {343 } else if (size[1] > 0.0) { 353 344 scale[1] = (size[0] / aspect) / size[1]; 354 345 } … … 358 349 case PLANE_ZY: { 359 350 if (aspect > 1.0) { 360 if (size[2] > size[1] ) {351 if (size[2] > size[1] && size[1] > 0.0) { 361 352 scale[1] = (size[2] / aspect) / size[1]; 362 } else {353 } else if (size[2] > 0.0) { 363 354 scale[2] = (size[1] * aspect) / size[2]; 364 355 } 365 356 } else { 366 if (size[1] > size[2] ) {357 if (size[1] > size[2] && size[2] > 0.0) { 367 358 scale[2] = (size[1] * aspect) / size[2]; 368 } else {359 } else if (size[1] > 0.0) { 369 360 scale[1] = (size[2] / aspect) / size[1]; 370 361 } … … 374 365 case PLANE_XZ: { 375 366 if (aspect > 1.0) { 376 if (size[0] > size[2] ) {367 if (size[0] > size[2] && size[2] > 0.0) { 377 368 scale[2] = (size[0] / aspect) / size[2]; 378 } else {369 } else if (size[0] > 0.0) { 379 370 scale[0] = (size[2] * aspect) / size[0]; 380 371 } 381 372 } else { 382 if (size[2] > size[0] ) {373 if (size[2] > size[0] && size[0] > 0.0) { 383 374 scale[0] = (size[2] * aspect) / size[0]; 384 } else {375 } else if (size[2] > 0.0) { 385 376 scale[2] = (size[0] / aspect) / size[2]; 386 377 } -
trunk/packages/vizservers/vtkvis/HeightMap.cpp
r3818 r4037 578 578 switch (_sliceAxis) { 579 579 case X_AXIS: { 580 if (size[1] > size[2] && size[2] > 1.0e-6) {580 if (size[1] > size[2] && size[2] > 0.0) { 581 581 scale[2] = size[1] / size[2]; 582 } else if (size[2] > size[1] && size[1] > 1.0e-6) {582 } else if (size[2] > size[1] && size[1] > 0.0) { 583 583 scale[1] = size[2] / size[1]; 584 584 } … … 586 586 break; 587 587 case Y_AXIS: { 588 if (size[0] > size[2] && size[2] > 1.0e-6) {588 if (size[0] > size[2] && size[2] > 0.0) { 589 589 scale[2] = size[0] / size[2]; 590 } else if (size[2] > size[0] && size[0] > 1.0e-6) {590 } else if (size[2] > size[0] && size[0] > 0.0) { 591 591 scale[0] = size[2] / size[0]; 592 592 } … … 594 594 break; 595 595 case Z_AXIS: { 596 if (size[0] > size[1] && size[1] > 1.0e-6) {596 if (size[0] > size[1] && size[1] > 0.0) { 597 597 scale[1] = size[0] / size[1]; 598 } else if (size[1] > size[0] && size[0] > 1.0e-6) {598 } else if (size[1] > size[0] && size[0] > 0.0) { 599 599 scale[0] = size[1] / size[0]; 600 600 } … … 606 606 case X_AXIS: { 607 607 if (aspect > 1.0) { 608 if (size[2] > size[1] ) {608 if (size[2] > size[1] && size[1] > 0.0) { 609 609 scale[1] = (size[2] / aspect) / size[1]; 610 } else {610 } else if (size[2] > 0.0) { 611 611 scale[2] = (size[1] * aspect) / size[2]; 612 612 } 613 613 } else { 614 if (size[1] > size[2] ) {614 if (size[1] > size[2] && size[2] > 0.0) { 615 615 scale[2] = (size[1] * aspect) / size[2]; 616 } else {616 } else if (size[1] > 0.0) { 617 617 scale[1] = (size[2] / aspect) / size[1]; 618 618 } … … 622 622 case Y_AXIS: { 623 623 if (aspect > 1.0) { 624 if (size[0] > size[2] ) {624 if (size[0] > size[2] && size[2] > 0.0) { 625 625 scale[2] = (size[0] / aspect) / size[2]; 626 } else {626 } else if (size[0] > 0.0) { 627 627 scale[0] = (size[2] * aspect) / size[0]; 628 628 } 629 629 } else { 630 if (size[2] > size[0] ) {630 if (size[2] > size[0] && size[0] > 0.0) { 631 631 scale[0] = (size[2] * aspect) / size[0]; 632 } else {632 } else if (size[2] > 0.0) { 633 633 scale[2] = (size[0] / aspect) / size[2]; 634 634 } … … 638 638 case Z_AXIS: { 639 639 if (aspect > 1.0) { 640 if (size[0] > size[1] ) {640 if (size[0] > size[1] && size[1] > 0.0) { 641 641 scale[1] = (size[0] / aspect) / size[1]; 642 } else {642 } else if (size[0] > 0.0) { 643 643 scale[0] = (size[1] * aspect) / size[0]; 644 644 } 645 645 } else { 646 if (size[1] > size[0] ) {646 if (size[1] > size[0] && size[0] > 0.0) { 647 647 scale[0] = (size[1] * aspect) / size[0]; 648 } else {648 } else if (size[1] > 0.0) { 649 649 scale[1] = (size[0] / aspect) / size[1]; 650 650 } -
trunk/packages/vizservers/vtkvis/Makefile.in
r3995 r4037 59 59 -lvtkInteractionWidgets-$(VTK_VERSION) \ 60 60 -lvtkRenderingOpenGL-$(VTK_VERSION) \ 61 -lvtkRenderingHybridOpenGL-$(VTK_VERSION) \62 61 -lvtkRenderingImage-$(VTK_VERSION) \ 63 62 -lvtkRenderingFreeTypeOpenGL-$(VTK_VERSION) \ … … 76 75 -lvtkCommonMath-$(VTK_VERSION) \ 77 76 -lvtksys-$(VTK_VERSION) 77 78 ifeq ($(VTK_VERSION),6.1) 79 VTK_LIB_SPEC += \ 80 -lvtkRenderingLIC-$(VTK_VERSION) 81 else 82 VTK_LIB_SPEC += \ 83 -lvtkRenderingHybridOpenGL-$(VTK_VERSION) 84 endif 78 85 79 86 LD_RUN_PATH = $(libdir) … … 211 218 $(RM) Makefile Doxyfile 212 219 213 Arc.o: Arc.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h214 Arrow.o: Arrow.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h215 Box.o: Box.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h220 Arc.o: Arc.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 221 Arrow.o: Arrow.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 222 Box.o: Box.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 216 223 CmdProc.o: CmdProc.h 217 224 ColorMap.o: ColorMap.h Molecule.h Trace.h 218 Cone.o: Cone.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h219 Contour2D.o: Contour2D.h GraphicsObject.h DataSet.h Renderer.h Trace.h220 Contour3D.o: Contour3D.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h221 Cutplane.o: Cutplane.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h222 Cylinder.o: Cylinder.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h225 Cone.o: Cone.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 226 Contour2D.o: Contour2D.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 227 Contour3D.o: Contour3D.h GraphicsObject.h Math.h DataSet.h Renderer.h ColorMap.h Trace.h 228 Cutplane.o: Cutplane.h GraphicsObject.h Math.h DataSet.h Renderer.h ColorMap.h Trace.h 229 Cylinder.o: Cylinder.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 223 230 DataSet.o: DataSet.h Trace.h 224 Disk.o: Disk.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h225 Glyphs.o: Glyphs.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h226 GraphicsObject.o: GraphicsObject.h Renderer.h DataSet.h ColorMap.h Trace.h227 Group.o: Group.h GraphicsObject.h DataSet.h Renderer.h Trace.h228 HeightMap.o: HeightMap.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h229 Image.o: Image.h GraphicsObject.h DataSet.h Renderer.h Trace.h230 LIC.o: LIC.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h RenderServer.h231 Line.o: Line.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h231 Disk.o: Disk.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 232 Glyphs.o: Glyphs.h GraphicsObject.h Math.h DataSet.h Renderer.h ColorMap.h Trace.h 233 GraphicsObject.o: GraphicsObject.h Renderer.h DataSet.h ColorMap.h Math.h Trace.h 234 Group.o: Group.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 235 HeightMap.o: HeightMap.h GraphicsObject.h Math.h DataSet.h Renderer.h ColorMap.h Trace.h 236 Image.o: Image.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 237 LIC.o: LIC.h GraphicsObject.h Math.h DataSet.h Renderer.h ColorMap.h Trace.h RenderServer.h 238 Line.o: Line.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 232 239 md5.o: md5.h 233 Molecule.o: Molecule.h MoleculeData.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h234 Outline.o: Outline.h GraphicsObject.h DataSet.h Trace.h235 Parallelepiped.o: Parallelepiped.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h236 PolyData.o: PolyData.h GraphicsObject.h DataSet.h Renderer.h Trace.h237 Polygon.o: Polygon.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h240 Molecule.o: Molecule.h MoleculeData.h GraphicsObject.h Math.h DataSet.h Renderer.h ColorMap.h Trace.h 241 Outline.o: Outline.h GraphicsObject.h Math.h DataSet.h Trace.h 242 Parallelepiped.o: Parallelepiped.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 243 PolyData.o: PolyData.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 244 Polygon.o: Polygon.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 238 245 PPMWriter.o: PPMWriter.h ResponseQueue.h Trace.h 239 PseudoColor.o: PseudoColor.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h246 PseudoColor.o: PseudoColor.h GraphicsObject.h Math.h DataSet.h Renderer.h ColorMap.h Trace.h 240 247 ReadBuffer.o: ReadBuffer.h Trace.h 241 248 Renderer.o: Renderer.h RendererGraphicsObjs.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h Math.h DataSet.h Arc.h Arrow.h Box.h Cone.h Contour2D.h Contour3D.h Cutplane.h Cylinder.h Disk.h Glyphs.h Group.h HeightMap.h Image.h LIC.h Line.h Molecule.h Outline.h Parallelepiped.h PolyData.h Polygon.h PseudoColor.h Sphere.h Streamlines.h Text3D.h Volume.h Warp.h ColorMap.h Trace.h … … 244 251 RenderServer.o: RenderServer.h RendererCmd.h Renderer.h vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h ReadBuffer.h ResponseQueue.h Trace.h PPMWriter.h TGAWriter.h 245 252 ResponseQueue.o: ResponseQueue.h Trace.h 246 Shape.o: Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h247 Sphere.o: Sphere.h Shape.h GraphicsObject.h DataSet.h Renderer.h Trace.h248 Streamlines.o: Streamlines.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h249 Text3D.o: Text3D.h GraphicsObject.h DataSet.h Renderer.h Trace.h253 Shape.o: Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 254 Sphere.o: Sphere.h Shape.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 255 Streamlines.o: Streamlines.h GraphicsObject.h Math.h DataSet.h Renderer.h ColorMap.h Trace.h 256 Text3D.o: Text3D.h GraphicsObject.h Math.h DataSet.h Renderer.h Trace.h 250 257 TGAWriter.o: TGAWriter.h ResponseQueue.h Trace.h 251 258 Trace.o: Trace.h 252 Volume.o: Volume.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h259 Volume.o: Volume.h GraphicsObject.h Math.h DataSet.h Renderer.h ColorMap.h Trace.h 253 260 vtkRpAxisActor.o: vtkRpAxisActor.h 254 261 vtkRpAxisFollower.o: vtkRpAxisFollower.h vtkRpAxisActor.h 255 262 vtkRpCubeAxesActor.o: vtkRpCubeAxesActor.h vtkRpAxisFollower.h vtkRpAxisActor.h 256 Warp.o: Warp.h GraphicsObject.h DataSet.h Renderer.h ColorMap.h Trace.h263 Warp.o: Warp.h GraphicsObject.h Math.h DataSet.h Renderer.h ColorMap.h Trace.h -
trunk/packages/vizservers/vtkvis/protocol.txt
r3983 r4037 510 510 glyphs shape <arrow|cone|cube|cylinder|dodecahedron|icosahedron|line|octahedron|point|sphere|tetrahedron> <?datasetName?> 511 511 glyphs smode <scalar|vmag|vcomp|off> <fieldName> <?dataSetName?> 512 Set the scaling mode: use the scalar field, vector magnitude 513 (uniform scale),vector components, or disable scaling512 Set the scaling mode: use the scalar field, vector magnitude, 513 vector components, or disable scaling 514 514 glyphs visible <bool> <?datasetName?> 515 515 glyphs wireframe <bool> <?datasetName?>
Note: See TracChangeset
for help on using the changeset viewer.