Merge remote-tracking branch 'upstream/master'

Author: jessdtate

src/CMakeLists.txt

@@ -750,7 +750,6 @@ SET_PROPERTY(TARGET Core_Logging         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_ConsoleApplication         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_CommandLine         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Command         PROPERTY FOLDER "Core")
-SET_PROPERTY(TARGET Core_SystemCall         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Thread         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_ImportExport         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_IEPlugin         PROPERTY FOLDER "Core")
@@ -759,8 +758,6 @@ SET_PROPERTY(TARGET Core_Application         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Application_Preferences         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Application_Session         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Utils         PROPERTY FOLDER "Core")
-SET_PROPERTY(TARGET Core_ICom         PROPERTY FOLDER "Core")
-SET_PROPERTY(TARGET Core_Services         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Math         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Matlab         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Parser         PROPERTY FOLDER "Core")

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/CMakeLists.txt

@@ -45,10 +45,7 @@ ADD_SUBDIRECTORY(Matlab)
 ADD_SUBDIRECTORY(Persistent)
 ADD_SUBDIRECTORY(Utils)
 ADD_SUBDIRECTORY(Thread)
-ADD_SUBDIRECTORY(Services)
-ADD_SUBDIRECTORY(ICom)
 ADD_SUBDIRECTORY(Parser)
-ADD_SUBDIRECTORY(SystemCall)
 ADD_SUBDIRECTORY(XMLUtil)
 
 IF(BUILD_WITH_PYTHON)

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