Changeset 735

Timestamp:

Apr 9, 2014, 9:37:44 AM (11 years ago)

Author:

sommeria

Message:

various corrections

Location:

trunk/src

Files:

• plot_field.m (modified) (2 diffs)
• proj_field.m (modified) (3 diffs)
• series.fig (modified) (previous)
• series.m (modified) (4 diffs)
• uvmat.m (modified) (7 diffs)

trunk/src/plot_field.m

@@ -811 +811 @@
             MinA=double(PlotParam.Scalar.MinA); % min value set as input
         else
-            MinA=double(nanmin(nanmin(A))); % min value set as min of non NaN scalar values
+            MinA=double(min(min(A))); % min value set as min of non NaN scalar values
         end
         
@@ -824 +824 @@
             MaxA=double(PlotParam.Scalar.MaxA); % max value set as input
         else
-            MaxA=double(nanmax(nanmax(A))); % max value set as min of non NaN scalar values
+            MaxA=double(max(max(A))); % max value set as min of non NaN scalar values
         end 
         

trunk/src/proj_field.m

@@ -147 +147 @@
 end
 [ProjData,errormsg]=proj_heading(FieldData,ObjectData);
+if ~isempty(errormsg)
+    return
+end
 ProjData.NbDim=0;
 [CellInfo,NbDimArray,errormsg]=find_field_cells(FieldData);
@@ -305 +308 @@
 %-------------------------------------------------------------------
 [ProjData,errormsg]=proj_heading(FieldData,ObjectData);
-
+if ~isempty(errormsg)
+    return
+end
 %objectfield=fieldnames(ObjectData);
 widthx=0;
@@ -1608 +1613 @@
 %% initiate Matlab  structure for physical field
 [ProjData,errormsg]=proj_heading(FieldData,ObjectData);
+if ~isempty(errormsg)
+    return
+end
+
 ProjData.NbDim=3;
 ProjData.ListVarName={};

trunk/src/series.m

@@ -1788 +1788 @@
         for iprocess=1:NbProcess
             system([batch_file_list{iprocess} ' &'])% directly execute the command file for each process
+            msgbox_uvmat('CONFIRMATION',[ActionName 'launched in background: press STATUS to see results'])
         end
     case 'cluster_oar' % option 'oar-parexec' used
@@ -1827 +1828 @@
         fclose(fid);
         fprintf(oar_command);% display in command line
-        %system(['chmod +x ' oar_command]);% set the file to executable
-        system(oar_command);     
+        system(oar_command);  
+        msgbox_uvmat('CONFIRMATION',[ActionName ' launched in cluster: press STATUS to see results'])
 end
 
@@ -2426 +2427 @@
             end
             hset_object=set_object(data);% call the set_object interface
+            set(hset_object,'Name','set_object_series')% name to distinguish from set_object used with uvmat
         end
         ProjObject=read_GUI(hset_object);
@@ -2490 +2492 @@
 set(handles.ViewObject,'Visible','off')
 set(handles.EditObject,'Visible','off')
-hset_object=findobj(allchild(0),'Tag','set_object');
+hset_object=findobj(allchild(0),'name','set_object_series');
 if ~isempty(hset_object)
     delete(hset_object)

trunk/src/uvmat.m

@@ -338 +338 @@
 end
 % desable set_object editing action if detected
-hh=findobj(allchild(0),'tag','set_object');
+hh=findobj(allchild(0),'name','set_object');
 if ~isempty(hh)
     hhh=findobj(hh,'tag','PLOT');
@@ -1376 +1376 @@
     if isempty(MaskFile)
         Mask.File='';
+    elseif ischar(MaskFile)
+        Mask.File=MaskFile;
     else
         Mask.File=MaskFile{1};
@@ -2534 +2536 @@
             UvData.ProjObject{1}.enable_plot=1;
             set_object(UvData.ProjObject{1},handles,ZBounds);
+            set(hset_object,'name','set_object');% rename if set_object already used with series
             set(handles.ListObject,'Value',1);
             set(handles.ListObject,'String',{'1-PLANE'});
@@ -3580 +3583 @@
     [hset_object,UvData.sethandles]=set_object(data,PlotHandles);% call the set_object interface with action on haxes,
                                                       % associate the set_object interface handle to the plotting axes
-    %set(hset_object,'Position',get(handles.uvmat,'Position')+UvData.OpenParam.PosSetObject)
+    set(hset_object,'name','set_object')
     UvData.MouseAction='create_object';
 else
@@ -4245 +4248 @@
     end
     ObjectData.Name=list_str{get(handles.ListObject_1,'Value')};
-    set_object(ObjectData,[],ZBounds);
+    hset_object=set_object(ObjectData,[],ZBounds);
+    set(hset_object,'name','set_object')
     set(handles.CheckViewObject,'Value',1)% show that the selected object in ListObject_1 is currently visualised
 end
@@ -4272 +4276 @@
 %% show object features if view_object isselected
 if get(handles.CheckViewObject,'value')
-    set_object(ObjectData,[],ZBounds);
-end
-
-%% The object  is displayed in set_object if this GUI is already opened
-% 
-% hset_object=findobj(allchild(0),'tag','set_object');
-% if ~isempty(hset_object)
-% 
-%     ObjectData.Name=list_str{IndexObj};
-%     set_object(ObjectData,[],ZBounds);
-%     set(handles.CheckViewField,'Value',1)% show that the selected object in ListObject is currently visualised
-% end
+    hset_object=set_object(ObjectData,[],ZBounds);
+    set(hset_object,'name','set_object')
+end
 
 %%  desactivate the edit object mode for security 
 set(handles.CheckEditObject,'Value',0) 
-
-% set(handles.CheckEditObject,'BackgroundColor',[0.7,0.7,0.7]) 
 
 %% update the  plot on view_field if view_field is already openened
@@ -4423 +4416 @@
     end
     hset_object=set_object(data,[],ZBounds);
+    set(hset_object,'name','set_object')
     hhset_object=guidata(hset_object);
     if get(handles.CheckEditObject,'Value')% edit mode