Changeset 3525 for trunk/packages/vizservers
- Timestamp:
- Mar 18, 2013, 11:09:05 AM (12 years ago)
- Location:
- trunk/packages/vizservers/vtkvis
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/vtkvis/RpContour2D.cpp
r3490 r3525 128 128 if (ds->GetPointData() == NULL || 129 129 ds->GetPointData()->GetScalars() == NULL) { 130 WARN("No scalar point data in dataset %s", _dataSet->getName().c_str());130 TRACE("No scalar point data in dataset %s", _dataSet->getName().c_str()); 131 131 if (ds->GetCellData() != NULL && 132 132 ds->GetCellData()->GetScalars() != NULL) { … … 142 142 ds = cellToPtData->GetOutput(); 143 143 } else { 144 ERROR("No scalar cell data in dataset %s", _dataSet->getName().c_str());144 USER_ERROR("No scalar field was found in the data set"); 145 145 } 146 146 } -
trunk/packages/vizservers/vtkvis/RpContour3D.cpp
r3516 r3525 123 123 if (ds->GetPointData() == NULL || 124 124 ds->GetPointData()->GetScalars() == NULL) { 125 WARN("No scalar point data in dataset %s", _dataSet->getName().c_str());125 TRACE("No scalar point data in dataset %s", _dataSet->getName().c_str()); 126 126 if (ds->GetCellData() != NULL && 127 127 ds->GetCellData()->GetScalars() != NULL) { … … 137 137 ds = cellToPtData->GetOutput(); 138 138 } else { 139 ERROR("No scalar cell data in dataset %s", _dataSet->getName().c_str());139 USER_ERROR("No scalar field was found in the data set."); 140 140 } 141 141 } -
trunk/packages/vizservers/vtkvis/RpHeightMap.cpp
r3490 r3525 230 230 if (ds->GetPointData() == NULL || 231 231 ds->GetPointData()->GetScalars() == NULL) { 232 WARN("No scalar point data in dataset %s", _dataSet->getName().c_str());232 TRACE("No scalar point data in dataset %s", _dataSet->getName().c_str()); 233 233 if (ds->GetCellData() != NULL && 234 234 ds->GetCellData()->GetScalars() != NULL) { … … 244 244 ds = cellToPtData->GetOutput(); 245 245 } else { 246 ERROR("No scalar cell data in dataset %s", _dataSet->getName().c_str());246 USER_ERROR("No scalar field was found in the data set."); 247 247 return; 248 248 } -
trunk/packages/vizservers/vtkvis/RpLIC.cpp
r3330 r3525 69 69 if (ds->GetPointData() == NULL || 70 70 ds->GetPointData()->GetVectors() == NULL) { 71 WARN("No vector point data in dataset %s", _dataSet->getName().c_str());71 TRACE("No vector point data in dataset %s", _dataSet->getName().c_str()); 72 72 if (ds->GetCellData() != NULL && 73 73 ds->GetCellData()->GetVectors() != NULL) { … … 83 83 ds = cellToPtData->GetOutput(); 84 84 } else { 85 ERROR("No vector cell data in dataset %s", _dataSet->getName().c_str());85 USER_ERROR("No vector field was found in the data set"); 86 86 return; 87 87 } -
trunk/packages/vizservers/vtkvis/RpStreamlines.cpp
r3427 r3525 478 478 ds->GetPointData()->GetVectors() == NULL) { 479 479 TRACE("No vector point data found in DataSet %s", _dataSet->getName().c_str()); 480 if (ds->GetCellData() == NULL || 481 ds->GetCellData()->GetVectors() == NULL) { 482 ERROR("No vectors found in DataSet %s", _dataSet->getName().c_str()); 483 } else { 480 if (ds->GetCellData() != NULL && 481 ds->GetCellData()->GetVectors() != NULL) { 484 482 cellToPtData = 485 483 vtkSmartPointer<vtkCellDataToPointData>::New(); … … 492 490 cellToPtData->Update(); 493 491 ds = cellToPtData->GetOutput(); 492 } else { 493 USER_ERROR("No vector field was found in the data set."); 494 return; 494 495 } 495 496 } -
trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp
r3516 r3525 3909 3909 if (id.compare("all") == 0) { 3910 3910 itr = _dataSets.begin(); 3911 if (itr == _dataSets.end()) 3912 return; 3911 3913 doAll = true; 3912 3914 } else { … … 3914 3916 } 3915 3917 if (itr == _dataSets.end()) { 3916 TRACE("Unknown dataset %s", id.c_str());3918 ERROR("Unknown dataset %s", id.c_str()); 3917 3919 return; 3918 3920 } … … 4015 4017 if (id.compare("all") == 0) { 4016 4018 itr = _dataSets.begin(); 4019 if (itr == _dataSets.end()) 4020 return; 4017 4021 doAll = true; 4018 4022 } else { … … 4020 4024 } 4021 4025 if (itr == _dataSets.end()) { 4022 TRACE("Unknown dataset %s", id.c_str());4026 ERROR("Unknown dataset %s", id.c_str()); 4023 4027 return; 4024 4028 } … … 4051 4055 if (id.compare("all") == 0) { 4052 4056 itr = _dataSets.begin(); 4057 if (itr == _dataSets.end()) 4058 return; 4053 4059 doAll = true; 4054 4060 } else { … … 4056 4062 } 4057 4063 if (itr == _dataSets.end()) { 4058 TRACE("Unknown dataset %s", id.c_str());4064 ERROR("Unknown dataset %s", id.c_str()); 4059 4065 return; 4060 4066 } -
trunk/packages/vizservers/vtkvis/RpWarp.cpp
r3330 r3525 127 127 ds = cellToPtData->GetOutput(); 128 128 } else { 129 ERROR("No vector data in dataset %s", _dataSet->getName().c_str());129 USER_ERROR("No vector field was found in the data set"); 130 130 return; 131 131 }
Note: See TracChangeset
for help on using the changeset viewer.