some fixes to gtMATCHGUI

(replace cell2mat) in order to allow for transition to matlab2016a

Signed-off-by: Wolfgang Ludwig <wolfgang.ludwig@esrf.fr>

3_pairmatchingGUI/gtMatchUpdateThetaFilterDisplay.m

@@ -61,9 +61,9 @@ end
 % Put the filter rectangles behind everything else in plot
 % (plotting order is by order in 'children') 
 hchildren       = get(handles.GUIEtaTheta.Axes_EtaPlot,'Children');
-hind            = ismember(hchildren,cell2mat(handles.ThetaFilterPlot));
+hind            = ismember(hchildren,[handles.ThetaFilterPlot{:}]);
 hchildren(hind) = [];
-hchildren       = [hchildren; cell2mat(handles.ThetaFilterPlot)'];
+hchildren       = [hchildren; [handles.ThetaFilterPlot{:}]'];
 set(handles.GUIEtaTheta.Axes_EtaPlot,'Children',hchildren);
 
 % If radio button was on, keep it visible

3_pairmatchingGUI/gtMatchUpdateThetaMarkers.m

@@ -9,11 +9,11 @@ switch prop
         
         for ip = 1:handles.nof_phases
             
-            pos = cell2mat(get(cell2mat(handles.ThetaRectHist(ip,:)),'Position'));
+            pos = cell2mat(get([handles.ThetaRectHist{ip,:}],'Position'));
             
             pos(:,4) = newval;
             
-            for it = 1:length(cell2mat(handles.ThetaRectHist(ip,:)))
+            for it = 1:numel(handles.ThetaRectHist(ip,:))
                 set(handles.ThetaRectHist{ip,it},'Position',pos(it,:));
                 set(handles.ThetaLineHist{ip,it},'YData',[0 newval]);
             end
@@ -44,7 +44,7 @@ switch prop
             width(width<=0) = 1e-6;
             
             % Eta plot
-            pos = cell2mat(get(cell2mat(handles.ThetaRectPlot(ip,:)),'Position'));
+            pos = cat(1,get([handles.ThetaRectPlot{ip,:}],'Position'));
             pos(:,1) = orig;
             pos(:,3) = width;
             
@@ -53,7 +53,7 @@ switch prop
             end
             
             % Histogram
-            pos = cell2mat(get(cell2mat(handles.ThetaRectHist(ip,:)),'Position'));
+            pos = cat(1,get([handles.ThetaRectHist{ip,:}],'Position'));
             pos(:,1) = orig;
             pos(:,3) = width;
             
@@ -103,30 +103,30 @@ switch prop
 
             if (ismember(ip,handles.UsedPhases) && get(handles.GUIEtaTheta.Radio_ThetaRanges,'Value'))
                 
-                set(cell2mat(handles.ThetaRectPlot(ip, vis)),'Visible','on');
-                set(cell2mat(handles.ThetaRectPlot(ip,~vis)),'Visible','off');
+                set([handles.ThetaRectPlot{ip, vis}],'Visible','on');
+                set([handles.ThetaRectPlot{ip,~vis}],'Visible','off');
                 
-                set(cell2mat(handles.ThetaRectHist(ip, vis)),'Visible','on');
-                set(cell2mat(handles.ThetaRectHist(ip,~vis)),'Visible','off');
+                set([handles.ThetaRectHist{ip, vis}],'Visible','on');
+                set([handles.ThetaRectHist{ip,~vis}],'Visible','off');
                 
-                set(cell2mat(handles.ThetaLinePlot(ip, vis)),'Visible','on');
-                set(cell2mat(handles.ThetaLinePlot(ip,~vis)),'Visible','off');
+                set([handles.ThetaLinePlot{ip, vis}],'Visible','on');
+                set([handles.ThetaLinePlot{ip,~vis}],'Visible','off');
                 
-                set(cell2mat(handles.ThetaLineHist(ip, vis)),'Visible','on');
-                set(cell2mat(handles.ThetaLineHist(ip,~vis)),'Visible','off');
+                set([handles.ThetaLineHist{ip, vis}],'Visible','on');
+                set([handles.ThetaLineHist{ip,~vis}],'Visible','off');
                 
             else                
-                set(cell2mat(handles.ThetaRectPlot(ip,:)),'Visible','off');
-                set(cell2mat(handles.ThetaRectHist(ip,:)),'Visible','off');
-                set(cell2mat(handles.ThetaLinePlot(ip,:)),'Visible','off');
-                set(cell2mat(handles.ThetaLineHist(ip,:)),'Visible','off');
+                set([handles.ThetaRectPlot{ip,:}],'Visible','off');
+                set([handles.ThetaRectHist{ip,:}],'Visible','off');
+                set([handles.ThetaLinePlot{ip,:}],'Visible','off');
+                set([handles.ThetaLineHist{ip,:}],'Visible','off');
             end
             
             if (ismember(ip,handles.UsedPhases) && get(handles.GUIEtaTheta.Radio_Labels,'Value'))
-                set(cell2mat(handles.HKLLabelsPlot(ip, vis)),'Visible','on');
-                set(cell2mat(handles.HKLLabelsPlot(ip,~vis)),'Visible','off');
+                set([handles.HKLLabelsPlot{ip, vis}],'Visible','on');
+                set([handles.HKLLabelsPlot{ip,~vis}],'Visible','off');
             else
-                set(cell2mat(handles.HKLLabelsPlot(ip,:)),'Visible','off');
+                set([handles.HKLLabelsPlot{ip,:}],'Visible','off');
             end
         end
 end