Changeset 6388 for vtkvis/branches/1.8/DataSet.cpp

Timestamp:

Jun 16, 2016, 4:49:33 PM (8 years ago)

Author:

ldelgass

Message:

merge r6378:6384 from vtkvis trunk

Location:

vtkvis/branches/1.8

Files:

• . (modified) (1 prop)
• DataSet.cpp (modified) (2 diffs)

vtkvis/branches/1.8/DataSet.cpp

@@ -14 +14 @@
 #include <vtkDataSetReader.h>
 #include <vtkDataSetWriter.h>
+#include <vtkXMLReader.h>
+#include <vtkXMLDataReader.h>
+#include <vtkXMLGenericDataObjectReader.h>
+#include <vtkXMLDataSetWriter.h>
 #include <vtkPolyData.h>
 #include <vtkStructuredPoints.h>
@@ -153 +157 @@
 
     _dataSet = reader->GetOutput();
+    if (_dataSet == NULL)
+        return false;
+
+    if (vtkUnstructuredGrid::SafeDownCast(_dataSet) != NULL && !isCloud()) {
+        vtkSmartPointer<vtkExtractUnstructuredGrid> filter = vtkSmartPointer<vtkExtractUnstructuredGrid>::New();
+        filter->SetInputData(_dataSet);
+        filter->MergingOn();
+        filter->ReleaseDataFlagOn();
+        filter->Update();
+        _dataSet = filter->GetOutput();
+    }
+
+    if (_dataSet->GetPointData() != NULL &&
+        _dataSet->GetPointData()->GetScalars() != NULL &&
+        _dataSet->GetPointData()->GetScalars()->GetLookupTable() != NULL) {
+        USER_ERROR("No lookup table should be specified in VTK data sets");
+    }
+
+    setDefaultArrays();
+
+#ifdef WANT_TRACE
+    print();
+#endif
+    TRACE("Leave");
+    return true;
+}
+
+/**
+ * \brief Read dataset using supplied reader
+ *
+ */
+bool DataSet::setData(vtkXMLReader *reader)
+{
+    TRACE("Enter");
+    reader->Update();
+
+    _dataSet = reader->GetOutputAsDataSet();
     if (_dataSet == NULL)
         return false;