Fixed merge error

Suppressed some output to command line Fixed some formatting in Advanced Settings GUI
BYU-MicrostructureOfMaterials · Mar 18, 2015 · bdc04c4 · bdc04c4
1 parent eb5648a
commit bdc04c4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/Code/AdvancedSettings.fig b/Code/AdvancedSettings.fig
diff --git a/Code/AdvancedSettings.m b/Code/AdvancedSettings.m
@@ -234,11 +234,7 @@ function AdvancedSettings_OpeningFcn(hObject, eventdata, handles, varargin)
     end
     set(handles.DDMethod,'Value',DDSMethodInd);
 end
-<<<<<<< HEAD
 if isfield(Settings,'CalcDerivatives')
-=======
-if ~isempty(Settings.CalcDerivatives)
->>>>>>> master
 
     set(handles.CalcDerivativesCheckBox, 'Value', Settings.CalcDerivatives)
     CalcDerivativesCheckBox_Callback(handles.CalcDerivativesCheckBox, eventdata, handles)
@@ -1225,6 +1221,9 @@ function SplitDD_Callback(hObject, eventdata, handles)
         set(handles.DDMethod, 'Enable', 'off');
     end
 else
+    set(hObject,'Value',0);
+    set(handles.DDMethod, 'Enable', 'off');
+end
 
 % --- Executes on selection change in DDMethod.
 function DDMethod_Callback(hObject, eventdata, handles)

diff --git a/Code/BigGreenGUI.m b/Code/BigGreenGUI.m
@@ -901,7 +901,7 @@ function AdvancedButton_Callback(hObject, eventdata, handles)
     clear stemp
 
     SaveSettings(hObject, handles);
-    AdvancedSettings();
+    AdvancedSettings;
 
     handles.AlreadyOpened = 1;
 

diff --git a/Code/HREBSDMain.m b/Code/HREBSDMain.m
@@ -7,8 +7,8 @@
 % tic
 % profile n
 disp('Dont forget to change PC if the image is cropped by ReadEBSDImage.m')
-Settings.DoUsePCFile
-Settings.DoPCStrainMin
+Settings.DoUsePCFile;
+Settings.DoPCStrainMin;
 %% Read in the first image and get the pixel size.
 %The assumption is made that all following images in the scan
 %are the same size and square.