Merge remote-tracking branch 'upstream/master' into tutorial

Author: jessdtate

src/Core/Algorithms/Math/GetMatrixSliceAlgo.cc

@@ -52,6 +52,7 @@ GetMatrixSliceAlgo::GetMatrixSliceAlgo()
 {
   addParameter(Parameters::IsSliceColumn, true);
   addParameter(Parameters::SliceIndex, 0);
+  addParameter(Parameters::MaxIndex, 0);
   addParameter(Parameters::PlayModeActive, false);
   //TODO DAN: make overload to handle const char*
   addOption(Parameters::PlayModeType, "looponce", "looponce|loopforever"); //TODO add more play options

src/Core/Datatypes/Legacy/Field/Field.h

@@ -61,6 +61,8 @@ class SCISHARE Field : public Core::Datatypes::Datatype, public Core::Datatypes:
 
 #ifdef SCIRUN4_CODE_TO_BE_ENABLED_LATER
     /// Detach the mesh from the field, if needed make a new copy of it.
+    // NOTE: IF THIS FUNCTION IS CALLED IN LEGACY CODE, IT MUST BE CONVERTED TO A deep_clone CALL ON THE FIELD OBJECT
+    // FYI detach() calls should be converted to clone() calls (shallow copy, only field data is copied, not the mesh).
     virtual void mesh_detach() = 0;
 #endif
     /// The order of the field: we could get this one from the type_description

src/Core/IEPlugin/CMakeLists.txt

@@ -49,7 +49,7 @@ SET(Core_IEPlugin_SRCS
   #StructHexVolField_Plugin.cc
   #StructQuadSurfField_Plugin.cc
   TriSurfField_Plugin.cc
-  #TetVolField_Plugin.cc
+  TetVolField_Plugin.cc
 )
 
 SET(Core_IEPlugin_HEADERS
@@ -76,7 +76,7 @@ SET(Core_IEPlugin_HEADERS
   #StructHexVolField_Plugin.h
   #StructQuadSurfField_Plugin.h
   TriSurfField_Plugin.h
-  #TetVolField_Plugin.h
+  TetVolField_Plugin.h
 )
 
 SCIRUN_ADD_LIBRARY(Core_IEPlugin

src/Core/IEPlugin/IEPluginInit.cc

@@ -34,6 +34,7 @@
 #include <Core/IEPlugin/PointCloudField_Plugin.h>
 #include <Core/IEPlugin/CurveField_Plugin.h>
 #include <Core/IEPlugin/TriSurfField_Plugin.h>
+#include <Core/IEPlugin/TetVolField_Plugin.h>
 #include <Core/ImportExport/Field/FieldIEPlugin.h>
 #include <Core/ImportExport/Matrix/MatrixIEPlugin.h>
 #include <Core/IEPlugin/IEPluginInit.h>
@@ -73,4 +74,9 @@ void IEPluginManager::Initialize()
   static FieldIEPluginLegacyAdapter VtkFromTriSurfField_plugin("VtkToTriSurfField", "*.vtk", "", VtkToTriSurfField_reader, nullptr);
   static FieldIEPluginLegacyAdapter TriSurfFieldToExotxt_plugin("TriSurfFieldToExotxt", "*.ex2", "", nullptr, TriSurfFieldToExotxt_writer);
   static FieldIEPluginLegacyAdapter TriSurfFieldToExotxtBaseIndexOne_plugin("TriSurfFieldToExotxt[BaseIndex 1]", "*.ex2", "", nullptr, TriSurfFieldToExotxtBaseIndexOne_writer);
+
+  static FieldIEPluginLegacyAdapter TetVolField_plugin("TetVolField","*.elem *.tet *.pts *.pos", "", TextToTetVolField_reader, TetVolFieldToTextBaseIndexZero_writer);
+  static FieldIEPluginLegacyAdapter TetVolFieldBaseIndexOne_plugin("TetVolField[BaseIndex 1]", "*.tet *.pts", "", nullptr, TetVolFieldToTextBaseIndexOne_writer);
+  static FieldIEPluginLegacyAdapter JHU_elemsPtsFileToTetVol_plugin("JHUFileToTetVol","*.elem *.tet *.pts *.pos", "", TextToTetVolField_reader, nullptr);
+  static FieldIEPluginLegacyAdapter TetVolFieldVtk_plugin("TetVolFieldToVtk", "*.vtk", "", nullptr, TetVolFieldToVtk_writer);
 }