Changeset 2639
- Timestamp:
- Oct 20, 2011, 12:55:08 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/packages/vizservers/vtkvis/RpVtkDataSet.cpp
r2612 r2639 636 636 if (_dataSet->GetPointData() != NULL && 637 637 _dataSet->GetPointData()->GetArray(fieldName) != NULL) { 638 *numComponents = _dataSet->GetPointData()->GetArray(fieldName)->GetNumberOfComponents(); 639 *type = POINT_DATA; 638 if (type != NULL) 639 *type = POINT_DATA; 640 if (numComponents != NULL) 641 *numComponents = _dataSet->GetPointData()->GetArray(fieldName)->GetNumberOfComponents(); 640 642 return true; 641 643 } else if (_dataSet->GetCellData() != NULL && 642 644 _dataSet->GetCellData()->GetArray(fieldName) != NULL) { 643 *numComponents = _dataSet->GetCellData()->GetArray(fieldName)->GetNumberOfComponents(); 644 *type = CELL_DATA; 645 if (type != NULL) 646 *type = CELL_DATA; 647 if (numComponents != NULL) 648 *numComponents = _dataSet->GetCellData()->GetArray(fieldName)->GetNumberOfComponents(); 645 649 return true; 646 650 } else if (_dataSet->GetFieldData() != NULL && 647 651 _dataSet->GetFieldData()->GetArray(fieldName) != NULL) { 648 *numComponents = _dataSet->GetFieldData()->GetArray(fieldName)->GetNumberOfComponents(); 649 *type = FIELD_DATA; 652 if (type != NULL) 653 *type = FIELD_DATA; 654 if (numComponents != NULL) 655 *numComponents = _dataSet->GetFieldData()->GetArray(fieldName)->GetNumberOfComponents(); 656 return true; 650 657 } 651 658 return false; … … 660 667 if (_dataSet->GetPointData() != NULL && 661 668 _dataSet->GetPointData()->GetArray(fieldName) != NULL) { 662 *numComponents = _dataSet->GetPointData()->GetArray(fieldName)->GetNumberOfComponents(); 669 if (numComponents != NULL) 670 *numComponents = _dataSet->GetPointData()->GetArray(fieldName)->GetNumberOfComponents(); 663 671 return true; 664 672 } else … … 668 676 if (_dataSet->GetCellData() != NULL && 669 677 _dataSet->GetCellData()->GetArray(fieldName) != NULL) { 670 *numComponents = _dataSet->GetCellData()->GetArray(fieldName)->GetNumberOfComponents(); 678 if (numComponents != NULL) 679 *numComponents = _dataSet->GetCellData()->GetArray(fieldName)->GetNumberOfComponents(); 671 680 return true; 672 681 } else … … 676 685 if (_dataSet->GetFieldData() != NULL && 677 686 _dataSet->GetFieldData()->GetArray(fieldName) != NULL) { 678 *numComponents = _dataSet->GetFieldData()->GetArray(fieldName)->GetNumberOfComponents(); 687 if (numComponents != NULL) 688 *numComponents = _dataSet->GetFieldData()->GetArray(fieldName)->GetNumberOfComponents(); 679 689 return true; 680 690 } else
Note: See TracChangeset
for help on using the changeset viewer.