Merge branch 'dev'

tomdoel · Apr 20, 2018 · 35f7c42 · 35f7c42
2 parents 2450e10 + 14e0e63
commit 35f7c42
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/External/depmat/DepMat.m b/External/depmat/DepMat.m
@@ -91,7 +91,6 @@
         function installed = isGitInstalled
             if ispc
                 command = 'where git';
-                command = split(command, char(13));
             else
                 command = 'which git';
             end

diff --git a/External/mim/Gui/Controllers/MimSaveAs.m b/External/mim/Gui/Controllers/MimSaveAs.m
@@ -4,13 +4,13 @@
     %     Syntax
     %     ------
     %
-    %         MimSaveAs(image_data, patient_name, path_name, reporting)
+    %         MimSaveAs(image_data, patient_name, path_name, is_secondary_capture, dicom_metadata, reporting)
     %
     %             image_data      is a PTKImage (or PTKDicomImage) class containing the image
     %                             to be saved
     %             patient_name    specifies the patient name to be stored in the image (only
     %                             used when there is no metadata available in the image)
-    %             path, filename  specify the location to save the DICOM data. One 2D file
+    %             path_name       specify the location to save the DICOM data. One 2D file
     %                             will be created for each image slice in the z direction. 
     %                             Each file is numbered, starting from 0.
     %                             So if filename is 'MyImage.DCM' then the files will be
@@ -34,7 +34,15 @@
         error('Requires a PTKImage as input');
     end
 
-    if nargin < 4
+    if nargin < 4 || isempty(is_secondary_capture)
+        is_secondary_capture = false;
+    end
+
+    if nargin < 5 || isempty(dicom_metadata)
+        dicom_metadata = struct('DicomName', patient_name, 'DicomStudyDescription', patient_name);
+    end
+
+    if nargin < 6
         reporting = CoreReportingDefault;
     end
 

diff --git a/External/mim/Library/File/MimLoadOtherFormat.m b/External/mim/Library/File/MimLoadOtherFormat.m
@@ -41,10 +41,10 @@
 
     if isa(filenames, 'CoreFilename')
         path = filenames.Path;
-        filenames = filenames.Name;
+        filenames = {filenames.Name};
     elseif isa(filenames{1}, 'CoreFilename')
         path = filenames{1}.Path;
-        filenames = filenames{1}.Name;
+        filenames = {filenames{1}.Name};
     end
 
     if nargin < 3

diff --git a/Library/Airways/PTKLoadTreeFromNodes.m b/Library/Airways/PTKLoadTreeFromNodes.m
@@ -4,7 +4,7 @@
     %     Syntax
     %     ------
     %
-    %         root_branch = PTKLoadTreeFromNodes(file_path, filename_prefix, reporting)
+    %         root_branch = PTKLoadTreeFromNodes(file_path, node_filename, element_filename, coordinate_system, template_image, reporting)
     %
     %             root_branch     is the root branch in a PTKTreeModel structure 
     %             file_path       is the path where the node and element files