- Timestamp:
- Jan 8, 2013, 1:22:20 AM (12 years ago)
- Location:
- branches/Rappture 1.2/packages/vizservers/vtkvis
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/Rappture 1.2/packages/vizservers/vtkvis/RpHeightMap.cpp
r3239 r3242 101 101 _dataSet->getActiveScalarsName(), 102 102 1); 103 renderer->getCumulativeDataRange(_vectorMagnitudeRange, 104 _dataSet->getActiveVectorsName(), 105 3); 106 for (int i = 0; i < 3; i++) { 107 renderer->getCumulativeDataRange(_vectorComponentRange[i], 108 _dataSet->getActiveVectorsName(), 109 3, i); 103 const char *activeVectors = _dataSet->getActiveVectorsName(); 104 if (activeVectors != NULL) { 105 renderer->getCumulativeDataRange(_vectorMagnitudeRange, 106 activeVectors, 107 3); 108 for (int i = 0; i < 3; i++) { 109 renderer->getCumulativeDataRange(_vectorComponentRange[i], 110 activeVectors, 111 3, i); 112 } 110 113 } 111 114 } else { … … 850 853 _dataSet->getActiveScalarsName(), 851 854 1); 852 renderer->getCumulativeDataRange(_vectorMagnitudeRange, 853 _dataSet->getActiveVectorsName(), 854 3); 855 for (int i = 0; i < 3; i++) { 856 renderer->getCumulativeDataRange(_vectorComponentRange[i], 857 _dataSet->getActiveVectorsName(), 858 3, i); 855 const char *activeVectors = _dataSet->getActiveVectorsName(); 856 if (activeVectors != NULL) { 857 renderer->getCumulativeDataRange(_vectorMagnitudeRange, 858 activeVectors, 859 3); 860 for (int i = 0; i < 3; i++) { 861 renderer->getCumulativeDataRange(_vectorComponentRange[i], 862 activeVectors, 863 3, i); 864 } 859 865 } 860 866 } else { -
branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRenderer.cpp
r3233 r3242 1121 1121 { 1122 1122 if (_cubeAxesActor != NULL) { 1123 TRACE("Setting %d axistitle font to: '%s'", axis, fontName);1123 TRACE("Setting axis %d title font to: '%s'", axis, fontName); 1124 1124 _cubeAxesActor->GetTitleTextProperty(axis)->SetFontFamilyAsString(fontName); 1125 1125 _needsRedraw = true; … … 1133 1133 { 1134 1134 if (_cubeAxesActor != NULL) { 1135 TRACE("Setting %d axistitle font size to: %d", axis, sz);1135 TRACE("Setting axis %d title font size to: %d", axis, sz); 1136 1136 _cubeAxesActor->GetTitleTextProperty(axis)->SetFontSize(sz); 1137 1137 _needsRedraw = true; … … 1145 1145 { 1146 1146 if (_cubeAxesActor != NULL) { 1147 TRACE("Setting %d axistitle orientation to: %g", axis, orientation);1147 TRACE("Setting axis %d title orientation to: %g", axis, orientation); 1148 1148 _cubeAxesActor->GetTitleTextProperty(axis)->SetOrientation(orientation); 1149 1149 _needsRedraw = true; … … 1157 1157 { 1158 1158 if (_cubeAxesActor != NULL) { 1159 TRACE("Setting %d axislabel font to: '%s'", axis, fontName);1159 TRACE("Setting axis %d label font to: '%s'", axis, fontName); 1160 1160 _cubeAxesActor->GetLabelTextProperty(axis)->SetFontFamilyAsString(fontName); 1161 1161 _needsRedraw = true; … … 1169 1169 { 1170 1170 if (_cubeAxesActor != NULL) { 1171 TRACE("Setting %d axislabel font size to: %d", axis, sz);1171 TRACE("Setting axis %d label font size to: %d", axis, sz); 1172 1172 _cubeAxesActor->GetLabelTextProperty(axis)->SetFontSize(sz); 1173 1173 _needsRedraw = true; … … 1181 1181 { 1182 1182 if (_cubeAxesActor != NULL) { 1183 TRACE("Setting %d axislabel orientation to: %g", axis, orientation);1183 TRACE("Setting axis %d label orientation to: %g", axis, orientation); 1184 1184 _cubeAxesActor->GetLabelTextProperty(axis)->SetOrientation(orientation); 1185 1185 _needsRedraw = true; … … 1193 1193 { 1194 1194 if (_cubeAxesActor != NULL) { 1195 TRACE("Setting %d axislabel format to: '%s'", axis, format);1195 TRACE("Setting axis %d label format to: '%s'", axis, format); 1196 1196 if (axis == X_AXIS) { 1197 1197 _cubeAxesActor->SetXLabelFormat(format); -
branches/Rappture 1.2/packages/vizservers/vtkvis/RpVtkRendererGraphicsObjs.h
r3229 r3242 12 12 #include <typeinfo> 13 13 14 // Use GCC/G++ specific name demangling 15 #define DEMANGLE 16 17 #ifdef DEMANGLE 18 #include <cstdlib> 19 #include <cxxabi.h> 20 #define GO_TRACE(go, format, ...) \ 21 do { \ 22 int status; \ 23 char * typeName = abi::__cxa_demangle(typeid(go).name(), 0, 0, &status); \ 24 TRACE("%s " format, typeName, __VA_ARGS__); \ 25 free(typeName); \ 26 } while (0) 27 28 #define GO_ERROR(go, format, ...) \ 29 do { \ 30 int status; \ 31 char * typeName = abi::__cxa_demangle(typeid(go).name(), 0, 0, &status); \ 32 ERROR("%s " format, typeName, __VA_ARGS__); \ 33 free(typeName); \ 34 } while (0) 35 #else 36 #define GO_TRACE(go, format, ...) TRACE("%s " format, typeid(go).name(), __VA_ARGS__); 37 #define GO_ERROR(go, format, ...) ERROR("%s " format, typeid(go).name(), __VA_ARGS__); 38 #endif 39 14 40 #include "RpVtkRenderer.h" 15 41 … … 30 56 if (itr == hashmap.end()) { 31 57 #ifdef DEBUG 32 TRACE("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());58 GO_TRACE(GraphicsObject, "not found: %s", id.c_str()); 33 59 #endif 34 60 return NULL; … … 56 82 } 57 83 if (itr == hashmap.end()) { 58 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());84 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 59 85 return; 60 86 } … … 171 197 } 172 198 if (itr == hashmap.end()) { 173 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());199 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 174 200 return; 175 201 } … … 202 228 } 203 229 if (itr == hashmap.end()) { 204 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());230 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 205 231 return; 206 232 } … … 233 259 } 234 260 if (itr == hashmap.end()) { 235 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());261 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 236 262 return; 237 263 } … … 264 290 } 265 291 if (itr == hashmap.end()) { 266 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());292 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 267 293 return; 268 294 } … … 295 321 } 296 322 if (itr == hashmap.end()) { 297 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());323 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 298 324 return; 299 325 } … … 326 352 } 327 353 if (itr == hashmap.end()) { 328 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());354 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 329 355 return; 330 356 } … … 357 383 } 358 384 if (itr == hashmap.end()) { 359 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());385 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 360 386 return; 361 387 } … … 388 414 389 415 if (itr == hashmap.end()) { 390 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());416 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 391 417 return; 392 418 } … … 420 446 } 421 447 if (itr == hashmap.end()) { 422 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());448 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 423 449 return; 424 450 } … … 450 476 } 451 477 if (itr == hashmap.end()) { 452 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());478 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 453 479 return; 454 480 } … … 480 506 } 481 507 if (itr == hashmap.end()) { 482 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());508 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 483 509 return; 484 510 } … … 513 539 } 514 540 if (itr == hashmap.end()) { 515 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());541 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 516 542 return; 517 543 } … … 543 569 } 544 570 if (itr == hashmap.end()) { 545 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());571 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 546 572 return; 547 573 } … … 573 599 } 574 600 if (itr == hashmap.end()) { 575 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());601 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 576 602 return; 577 603 } … … 603 629 } 604 630 if (itr == hashmap.end()) { 605 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());631 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 606 632 return; 607 633 } … … 633 659 } 634 660 if (itr == hashmap.end()) { 635 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());661 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 636 662 return; 637 663 } … … 663 689 } 664 690 if (itr == hashmap.end()) { 665 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());691 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 666 692 return; 667 693 } … … 696 722 } 697 723 if (itr == hashmap.end()) { 698 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());724 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 699 725 return; 700 726 } … … 726 752 } 727 753 if (itr == hashmap.end()) { 728 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());754 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 729 755 return; 730 756 } … … 757 783 758 784 if (itr == hashmap.end()) { 759 ERROR("%s not found: %s", typeid(GraphicsObject).name(), id.c_str());785 GO_ERROR(GraphicsObject, "not found: %s", id.c_str()); 760 786 return; 761 787 } … … 768 794 769 795 do { 770 TRACE("Set %s color map: %s for dataset %s", 771 typeid(GraphicsObject).name(), 772 colorMapId.c_str(), 773 itr->second->getDataSet()->getName().c_str()); 796 GO_TRACE(GraphicsObject, "Set color map: %s for dataset %s", 797 colorMapId.c_str(), 798 itr->second->getDataSet()->getName().c_str()); 774 799 775 800 itr->second->setColorMap(cmap); … … 828 853 itr->second->getProp() != NULL) 829 854 mergeBounds(bounds, bounds, itr->second->getBounds()); 855 double *bPtr = itr->second->getBounds(); 856 assert(bPtr != NULL); 857 GO_TRACE(GraphicsObject, 858 "%s bounds: %g %g %g %g %g %g", 859 itr->first.c_str(), 860 bPtr[0], bPtr[1], bPtr[2], bPtr[3], bPtr[4], bPtr[5]); 830 861 } 831 862 } … … 848 879 itr->second->getProp() != NULL) 849 880 mergeBounds(bounds, bounds, itr->second->getUnscaledBounds()); 881 double *bPtr = itr->second->getUnscaledBounds(); 882 assert(bPtr != NULL); 883 GO_TRACE(GraphicsObject, 884 "%s bounds: %g %g %g %g %g %g", 885 itr->first.c_str(), 886 bPtr[0], bPtr[1], bPtr[2], bPtr[3], bPtr[4], bPtr[5]); 850 887 } 851 888 }
Note: See TracChangeset
for help on using the changeset viewer.