Changeset 2302 for branches/blt4/packages/vizservers/vtkvis/RpVtkDataSet.cpp

Timestamp:

Jul 10, 2011 5:24:36 PM (13 years ago)

Author:

gah

Message:

update from trunk

File:

• branches/blt4/packages/vizservers/vtkvis/RpVtkDataSet.cpp (modified) (6 diffs)

branches/blt4/packages/vizservers/vtkvis/RpVtkDataSet.cpp

@@ -8 +8 @@
 #include <vtkCharArray.h>
 #include <vtkDataSetReader.h>
-#include <vtkDataSetMapper.h>
+#include <vtkPolyData.h>
+#include <vtkStructuredPoints.h>
+#include <vtkStructuredGrid.h>
+#include <vtkRectilinearGrid.h>
+#include <vtkUnstructuredGrid.h>
 #include <vtkProperty.h>
 #include <vtkPointData.h>
@@ -22 +26 @@
     _visible(true)
 {
-    _name = name;
     _dataRange[0] = 0;
     _dataRange[1] = 1;
@@ -62 +65 @@
 {
     vtkSmartPointer<vtkDataSetReader> reader = vtkSmartPointer<vtkDataSetReader>::New();
+
+#if defined(WANT_TRACE) && defined(DEBUG)
+    reader->DebugOn();
+#endif
+
     reader->SetFileName(filename);
+    reader->ReadAllScalarsOn();
+    reader->ReadAllVectorsOn();
     return setData(reader);
 }
@@ -71 +81 @@
 bool DataSet::setData(char *data, int nbytes)
 {
+    TRACE("Entering");
+
     vtkSmartPointer<vtkDataSetReader> reader = vtkSmartPointer<vtkDataSetReader>::New();
     vtkSmartPointer<vtkCharArray> dataSetString = vtkSmartPointer<vtkCharArray>::New();
+
+#if defined(WANT_TRACE) && defined(DEBUG)
+    reader->DebugOn();
+    dataSetString->DebugOn();
+#endif
 
     dataSetString->SetArray(data, nbytes, 1);
     reader->SetInputArray(dataSetString);
     reader->ReadFromInputStringOn();
-    return setData(reader);
+    reader->ReadAllScalarsOn();
+    reader->ReadAllVectorsOn();
+
+    bool status = setData(reader);
+
+    TRACE("Leaving");
+    return status;
 }
 
 /**
  * \brief Read dataset using supplied reader
+ *
+ * Pipeline information is removed from the resulting 
+ * vtkDataSet, so that the reader and its data can be 
+ * released
  */
 bool DataSet::setData(vtkDataSetReader *reader)
@@ -87 +114 @@
     // Force reading data set
     reader->SetLookupTableName("");
+    reader->Update();
+
     _dataSet = reader->GetOutput();
-    _dataSet->Update();
-    _dataSet->GetScalarRange(_dataRange);
-
-    TRACE("Scalar Range: %.12e, %.12e", _dataRange[0], _dataRange[1]);
-    return true;
-}
-
-/**
- * \brief Read dataset using supplied reader
- */
-bool DataSet::setData(vtkDataSet *ds)
-{
-    _dataSet = ds;
-    _dataSet->Update();
+    _dataSet->SetPipelineInformation(NULL);
+
     _dataSet->GetScalarRange(_dataRange);
     _dataSet->GetBounds(_bounds);
 
+    TRACE("DataSet class: %s", _dataSet->GetClassName());
     TRACE("Scalar Range: %.12e, %.12e", _dataRange[0], _dataRange[1]);
+    TRACE("DataSet bounds: %g %g %g %g %g %g",
+          _bounds[0], _bounds[1],
+          _bounds[2], _bounds[3],
+          _bounds[4], _bounds[5]);
     return true;
 }
 
 /**
+ * \brief Set DataSet from existing vtkDataSet object
+ *
+ * Pipeline information is removed from the supplied vtkDataSet
+ */
+bool DataSet::setData(vtkDataSet *ds)
+{
+    _dataSet = ds;
+    _dataSet->SetPipelineInformation(NULL);
+    _dataSet->GetScalarRange(_dataRange);
+    _dataSet->GetBounds(_bounds);
+
+    TRACE("DataSet class: %s", _dataSet->GetClassName());
+    TRACE("Scalar Range: %.12e, %.12e", _dataRange[0], _dataRange[1]);
+    TRACE("DataSet bounds: %g %g %g %g %g %g",
+          _bounds[0], _bounds[1],
+          _bounds[2], _bounds[3],
+          _bounds[4], _bounds[5]);
+    return true;
+}
+
+/**
+ * \brief Copy an existing vtkDataSet object
+ *
+ * Pipeline information is not copied from the supplied vtkDataSet
+ * into this DataSet, but pipeline information in the supplied 
+ * vtkDataSet is not removed
+ */
+vtkDataSet *DataSet::copyData(vtkDataSet *ds)
+{
+    if (vtkPolyData::SafeDownCast(ds) != NULL) {
+        _dataSet = vtkSmartPointer<vtkPolyData>::New();
+        _dataSet->DeepCopy(vtkPolyData::SafeDownCast(ds));
+    } else if (vtkStructuredPoints::SafeDownCast(ds) != NULL) {
+        _dataSet = vtkSmartPointer<vtkStructuredPoints>::New();
+        _dataSet->DeepCopy(vtkStructuredPoints::SafeDownCast(ds));
+    } else if (vtkStructuredGrid::SafeDownCast(ds) != NULL) {
+        _dataSet = vtkSmartPointer<vtkStructuredGrid>::New();
+        _dataSet->DeepCopy(vtkStructuredGrid::SafeDownCast(ds));
+    } else if (vtkRectilinearGrid::SafeDownCast(ds) != NULL) {
+        _dataSet = vtkSmartPointer<vtkRectilinearGrid>::New();
+        _dataSet->DeepCopy(vtkRectilinearGrid::SafeDownCast(ds));
+    } else if (vtkUnstructuredGrid::SafeDownCast(ds) != NULL) {
+        _dataSet = vtkSmartPointer<vtkUnstructuredGrid>::New();
+        _dataSet->DeepCopy(vtkUnstructuredGrid::SafeDownCast(ds));
+    } else {
+        ERROR("Unknown data type");
+        return NULL;
+    }
+    _dataSet->GetScalarRange(_dataRange);
+    _dataSet->GetBounds(_bounds);
+
+    TRACE("DataSet class: %s", _dataSet->GetClassName());
+    TRACE("Scalar Range: %.12e, %.12e", _dataRange[0], _dataRange[1]);
+    return _dataSet;
+}
+
+/**
  * \brief Does DataSet lie in the XY plane (z = 0)
  */
@@ -134 +213 @@
 
 /**
+ * \brief Get the underlying VTK DataSet subclass class name
+ */
+const char *DataSet::getVtkType()
+{
+    return _dataSet->GetClassName();
+}
+
+/**
  * \brief Get the range of scalar values in the DataSet
  */
 void DataSet::getDataRange(double minmax[2])
 {
-    minmax[0] = _dataRange[0];
-    minmax[1] = _dataRange[1];
+    memcpy(minmax, _dataRange, sizeof(double)*2);
+}
+
+/**
+ * \brief Get the bounds the DataSet
+ */
+void DataSet::getBounds(double bounds[6])
+{
+    memcpy(bounds, _bounds, sizeof(double)*6);
 }