Changeset 6539 for vtkvis/branches

Timestamp:

Sep 13, 2016, 11:26:18 AM (8 years ago)

Author:

ldelgass

Message:

Merge r6538 from vtkvis trunk (XML format)

Location:

vtkvis/branches/1.8

Files:

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

vtkvis/branches/1.8/DataSet.cpp

@@ -6 +6 @@
  */
 
+#include <cstdlib>
+#include <cstdio>
 #include <cassert>
 #include <cstring>
 #include <cfloat>
 #include <cmath>
+#include <strings.h>
+#include <unistd.h>
 
 #include <vtkCharArray.h>
@@ -88 +92 @@
     if (_dataSet == NULL)
         return;
-    
-    vtkSmartPointer<vtkDataSetWriter> writer = vtkSmartPointer<vtkDataSetWriter>::New();
-
-    writer->SetFileName(filename);
-    writer->SetInputData(_dataSet);
-    writer->Write();
+
+    bool useXML = false;
+    size_t len = strlen(filename);
+    if (len > 4 &&
+        strcasecmp(filename + len - 4, ".vtk") != 0) {
+        useXML = true;
+    }
+
+    if (useXML) {
+        vtkSmartPointer<vtkXMLDataSetWriter> writer = vtkSmartPointer<vtkXMLDataSetWriter>::New();
+
+        writer->SetFileName(filename);
+        writer->SetInputData(_dataSet);
+        writer->Write();
+    } else {
+        vtkSmartPointer<vtkDataSetWriter> writer = vtkSmartPointer<vtkDataSetWriter>::New();
+
+        writer->SetFileName(filename);
+        writer->SetInputData(_dataSet);
+        writer->Write();
+    }
 }
 
@@ -101 +120 @@
 bool DataSet::setDataFile(const char *filename)
 {
-    vtkSmartPointer<vtkDataSetReader> reader = vtkSmartPointer<vtkDataSetReader>::New();
+    bool useXML = false;
+    size_t len = strlen(filename);
+    if (len > 4 &&
+        strcasecmp(filename + len - 4, ".vtk") != 0) {
+        useXML = true;
+    }
+
+    if (useXML) {
+        vtkSmartPointer<vtkXMLGenericDataObjectReader> reader = vtkSmartPointer<vtkXMLGenericDataObjectReader>::New();
 
 #if defined(WANT_TRACE) && defined(DEBUG)
-    reader->DebugOn();
-#endif
-
-    reader->SetFileName(filename);
-    reader->ReadAllNormalsOn();
-    reader->ReadAllTCoordsOn();
-    reader->ReadAllScalarsOn();
-    reader->ReadAllColorScalarsOn();
-    reader->ReadAllVectorsOn();
-    reader->ReadAllTensorsOn();
-    reader->ReadAllFieldsOn();
-
-    return setData(reader);
+        reader->DebugOn();
+#endif
+
+        reader->SetFileName(filename);
+
+        return setData(reader);
+    } else {
+        vtkSmartPointer<vtkDataSetReader> reader = vtkSmartPointer<vtkDataSetReader>::New();
+
+#if defined(WANT_TRACE) && defined(DEBUG)
+        reader->DebugOn();
+#endif
+
+        reader->SetFileName(filename);
+        reader->ReadAllNormalsOn();
+        reader->ReadAllTCoordsOn();
+        reader->ReadAllScalarsOn();
+        reader->ReadAllColorScalarsOn();
+        reader->ReadAllVectorsOn();
+        reader->ReadAllTensorsOn();
+        reader->ReadAllFieldsOn();
+
+        return setData(reader);
+    }
 }
 
@@ -124 +162 @@
 bool DataSet::setData(char *data, int nbytes)
 {
-    vtkSmartPointer<vtkDataSetReader> reader = vtkSmartPointer<vtkDataSetReader>::New();
-    vtkSmartPointer<vtkCharArray> dataSetString = vtkSmartPointer<vtkCharArray>::New();
+    if (nbytes > 0 && data[0] == '<') {
+        // Use XML Reader
+        vtkSmartPointer<vtkXMLGenericDataObjectReader> reader = vtkSmartPointer<vtkXMLGenericDataObjectReader>::New();
+
+        char tmpfile[32];
+        strcpy(tmpfile, "/tmp/vtkvis-XXXXXX");
+        int fid = mkstemp(tmpfile);
+        if (fid < 0) {
+            ERROR("mkstemp: %s", strerror(errno));
+            return false;
+        }
+        if (write(fid, data, (size_t)nbytes) < 0) {
+            ERROR("write: %s", strerror(errno));
+            remove(tmpfile);
+            close(fid);
+            return false;
+        }
 
 #if defined(WANT_TRACE) && defined(DEBUG)
-    reader->DebugOn();
-    dataSetString->DebugOn();
-#endif
-
-    dataSetString->SetArray(data, nbytes, 1);
-    reader->SetInputArray(dataSetString);
-    reader->ReadFromInputStringOn();
-    reader->ReadAllNormalsOn();
-    reader->ReadAllTCoordsOn();
-    reader->ReadAllScalarsOn();
-    reader->ReadAllColorScalarsOn();
-    reader->ReadAllVectorsOn();
-    reader->ReadAllTensorsOn();
-    reader->ReadAllFieldsOn();
-
-    return setData(reader);
+        reader->DebugOn();
+#endif
+        reader->SetFileName(tmpfile);
+
+        bool ret = setData(reader);
+        if (remove(tmpfile) < 0) {
+            ERROR("remove: %s", strerror(errno));
+        }
+        close(fid);
+
+        return ret;
+    } else {
+        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();
+        reader->ReadAllNormalsOn();
+        reader->ReadAllTCoordsOn();
+        reader->ReadAllScalarsOn();
+        reader->ReadAllColorScalarsOn();
+        reader->ReadAllVectorsOn();
+        reader->ReadAllTensorsOn();
+        reader->ReadAllFieldsOn();
+
+        return setData(reader);
+    }
 }