Changeset 153 for trunk/src/set_object.m

Timestamp:

Dec 9, 2010, 11:31:04 PM (14 years ago)

Author:

sommeria

Message:

civ.m: bug on field numbers repaired
other: various cleaning and bug repair for the creation of a new object

File:

• trunk/src/set_object.m (modified) (15 diffs)

trunk/src/set_object.m

@@ -56 +56 @@
 end
 % End initialization code - DO NOT PLOT
-
-%-------------------------------------------------------------------
+%------------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes just before set_object is made visible.
 %INPUT: 
@@ -275 +275 @@
 varargout{2}=handles;
 
-%-----------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on selection change in ObjectStyle.
 function ObjectStyle_Callback(hObject, eventdata, handles)
@@ -350 +350 @@
 set(handles.ObjectStyle,'UserData',style)
 
-%----------------------------------------------
+%------------------------------------------------------------------------
 function xObject_Callback(hObject, eventdata, handles)
 
-
+%------------------------------------------------------------------------
 function yObject_Callback(hObject, eventdata, handles)
 
-
+%------------------------------------------------------------------------
 % --- Executes on selection change in zObject.
 function zObject_Callback(hObject, eventdata, handles)
-
-
-
+%------------------------------------------------------------------------
+
+%------------------------------------------------------------------------
 % --- Executes on selection change in ProjMode.
 function ProjMode_Callback(hObject, eventdata, handles)
@@ -464 +464 @@
         end
 end
-% 
-% %---------------------------------------------
-% % --- Executes on selection change in TITLE.
-% function TITLE_Callback(style, handles)
-% %---------------------------------------------
-% switch style
-%     case {'points','line','polyline','plane'}
-%         menu_proj={'projection';'interp';'filter';'none'}; 
-%     case {'polygon','rectangle','ellipse'}
-%         menu_proj={'inside';'outside';'mask_inside';'mask_outside'};
-%     case 'volume'
-%         menu_proj={'none'};
-% end
-% 
-% 
-% old_menu=get(handles.ObjectStyle,'String');
-% value=get(handles.ObjectStyle,'Value');
-% old_style=old_menu{value};
-% teststyle=0;
-% for iline=1:length(menu_style)
-%     if isequal(menu_style{iline},old_style)
-%         styleval=iline;
-%         teststyle=1;
-%         break
-%     end
-% end
-% if ~teststyle
-%     new_style=[];%default
-%     switch old_style
-%         case 'polyline'
-%             new_style='polygon';
-%         case 'polygon'
-%             new_style='polyline';
-%     end
-%     if ~isempty(new_style)
-%         for iline=1:length(menu_style)
-%             if isequal(menu_style{iline},new_style)
-%                 styleval=iline;
-%                 teststyle=1;
-%                 break
-%             end
-%         end
-%     end
-% end
-% if ~teststyle
-%     styleval=1;
-% end
-% set(handles.ObjectStyle,'String',menu_style)
-% set(handles.ObjectStyle,'Value',styleval)
-% set(handles.ProjMode,'String',menu_proj)
-% set(handles.ProjMode,'Value',1)
-% ObjectStyle_Callback(hObject, eventdata, handles)  
-
-%---------------------------------------------
+%------------------------------------------------------------------------
+
+%------------------------------------------------------------------------
 function Phi_Callback(hObject, eventdata, handles)
 update_slider(hObject, eventdata,handles)
-%---------------------------------------------
-
+%------------------------------------------------------------------------
+%------------------------------------------------------------------------
 function Theta_Callback(hObject, eventdata, handles)
 update_slider(hObject, eventdata,handles)
-
+%------------------------------------------------------------------------
 function update_slider(hObject, eventdata,handles)
 %rotation angles
@@ -542 +491 @@
     ZMax_Callback(hObject, eventdata, handles)
 end
-
+%------------------------------------------------------------------------
 function DX_Callback(hObject, eventdata, handles)
-
-
+%------------------------------------------------------------------------
+%------------------------------------------------------------------------
 function DY_Callback(hObject, eventdata, handles)
-
-
+%------------------------------------------------------------------------
+%------------------------------------------------------------------------
 function DZ_Callback(hObject, eventdata, handles)
-
-
-
+%------------------------------------------------------------------------
+
+%------------------------------------------------------------------------
 %-----------------------------------------------------
 % --- Executes on button press in OPEN: DESACTIVATED use uvmat browser
@@ -740 +689 @@
 set(handles.YObject,'String',YObject)
 %METTRA A JOUR ASPECT DE L'INTERFACE (COMME set_object_Opening
-
+%------------------------------------------------------------------------
 %----------------------------------------------------
 % executed when closing: set the parent interface button to value 0
@@ -768 +717 @@
 end
 
-%-----------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on button press in PLOT: PLOT the defined object and its projected field
 function PLOT_Callback(hObject, eventdata, handles)
@@ -775 +724 @@
 UvData=get(huvmat,'UserData');%Data associated to the GUI uvmat 
 hhuvmat=guidata(huvmat);%handles in the uvmat GUI
-ObjectName=get(handles.TITLE,'String');%name ome)f the current object (set_object na
+ObjectName=get(handles.TITLE,'String');%name of the current object 
 ListObject=get(hhuvmat.list_object_1,'String');%position in the objet list
 IndexObj_1=get(hhuvmat.list_object_1,'Value');
 IndexObj_2=get(hhuvmat.list_object_2,'Value');
-
-% set(plotfig,'Name',['Projection on' num2str(IndexObj) '-' ObjectData.Style]);
 ObjectData=read_set_object(handles);%read the input parameters defining the object in the GUI set_object
-PlotHandles=[];%default
 testnew=0;
 PlotHandles=get_plot_handles(hhuvmat);
@@ -791 +737 @@
     projview='uvmat';
 elseif IndexObj_2<=numel(ListObject)&& strcmp(ListObject{IndexObj_2},ObjectName)% we are editing the object whose projection is viewed in view_field
-    hview_field=findobj('tag','view_field');
+    hview_field=findobj(allchild(0),'tag','view_field');
     if ~isempty(hview_field)
         PlotHandles=guidata(hview_field);
@@ -799 +745 @@
     projview='view_field';
 else %new object 
-    testnew=1;
-   
+    testnew=1;  
     IndexObj=numel(ListObject)+1;
-    %ObjectName=[num2str(IndexObj) '-' ObjectData.Style];
-%     ListObject=[ListObject;ObjectName];
-%     set(hhuvmat.list_object_2,'String',[ListObject;ObjectName;{'...'}])
-%     set(hhuvmat.list_object_2,'Value',IndexObj)
-end
-% ObjectName=get(handles.TITLE,'String');
-if length(ObjectName)<1
-    ObjectName=[num2str(IndexObj) '-' ObjectData.Style];
-else
-    for ilist=1:numel(ListObject)
-        if strcmp(ListObject{ilist},ObjectName)
-            ObjectName=[num2str(IndexObj) '-' ObjectName];
-            break
-        end 
-    end
+end
+if length(ObjectName)<1% name of object not defined in set_object
+    ObjectName=[num2str(IndexObj) '-' ObjectData.Style];%default name
+elseif ~get(hhuvmat.edit,'Value')%not in edit mode (new object created)
+    detectname=1;
+    ObjectNameNew=ObjectName;
+    vers=0;
+    while detectname==1 %create a new subdir if the netcdf files already exist
+        detectname=find(strcmp(ObjectNameNew,ListObject),1)%test the existence of the proposed name in the list
+        if detectname% if athe object name already exists
+            indstr=regexp(ObjectNameNew,'\D')
+            if indstr(end)<length(ObjectNameNew) %object name ends by a number
+                vers=str2double(ObjectNameNew(indstr(end)+1:end))+1;
+                ObjectNameNew=[ObjectNameNew(1:indstr(end)) num2str(vers)];
+            else
+                vers=vers+1
+                ObjectNameNew=[ObjectNameNew(1:indstr(end)) '_' num2str(vers)]      
+            end
+        end
+    end
+    ObjectName=ObjectNameNew;
 end
 ListObject{IndexObj,1}=ObjectName;
@@ -842 +793 @@
 UvData.MouseAction='edit_object'; % set the edit button to 'on'
 set(huvmat,'UserData',UvData)
-
+%------------------------------------------------------------------------
 % --- Executes on button press in MenuCoord.
 function MenuCoord_Callback(hObject, eventdata, handles)
-
+%------------------------------------------------------------------------
 %----------------------------------------------------
 function YMin_Callback(hObject, eventdata, handles)
-
+%------------------------------------------------------------------------
 
 function ZMin_Callback(hObject, eventdata, handles)
-
+%------------------------------------------------------------------------
 
 function ZMax_Callback(hObject, eventdata, handles)
@@ -862 +813 @@
     set(handles.z_slider,'SliderStep',rel_step)
 end
-
+%------------------------------------------------------------------------
 function YMax_Callback(hObject, eventdata, handles)
-
+%------------------------------------------------------------------------
 
 function XMin_Callback(hObject, eventdata, handles)
-
+%------------------------------------------------------------------------
 
 function XMax_Callback(hObject, eventdata, handles)
-
-
-% ------------------------------------------------------
+%------------------------------------------------------------------------
+%------------------------------------------------------------------------
 function SAVE_Callback(hObject, eventdata, handles)
 % ------------------------------------------------------
@@ -914 +864 @@
 end
 msgbox_uvmat('CONFIRMATION',[answer{1}  ' saved'])
-
-%---------------------------------------------------------
+%------------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on slider movement.
 function z_slider_Callback(hObject, eventdata, handles)
@@ -936 +886 @@
 set(handles.ZObject,'String',num2str(NormVec_Z*Z_value,4))
 PLOT_Callback(hObject, eventdata, handles)
-
-
+%------------------------------------------------------------------------
+%------------------------------------------------------------------------
 % --- Executes on button press in HELP.
 function HELP_Callback(hObject, eventdata, handles)
@@ -948 +898 @@
     web([helpfile '#set_object']) 
 end
-
-
-
+%------------------------------------------------------------------------
+
+