Changeset 182 for trunk/src

Timestamp:

Jan 23, 2011, 6:55:29 PM (14 years ago)

Author:

sommeria

Message:

introduction of a button OK to close the status GUI in civ, bug repair for volume images .vol (uvmat and set_object)

Location:

trunk/src

Files:

• civ.m (modified) (2 diffs)
• read_field.m (modified) (5 diffs)
• set_object.m (modified) (4 diffs)

trunk/src/civ.m

@@ -4639 +4639 @@
     hfig=figure;
     set(hfig,'name','civ_status')
-    hlist=uicontrol('Style','listbox','Units','normalized', 'Position',[0.05 0.05 0.9 0.75], 'Callback', @open_view_field,'tag','list');
+    hlist=uicontrol('Style','listbox','Units','normalized', 'Position',[0.05 0.09 0.9 0.71], 'Callback', @open_view_field,'tag','list');
     uicontrol('Style','listbox','Units','normalized', 'Position', [0.05 0.87 0.9 0.1],'tag','msgbox');
     uicontrol('Style','frame','Units','normalized', 'Position', [0.05 0.81 0.9 0.05]);
+    uicontrol('Style','pushbutton','Units','normalized', 'Position', [0.7 0.01 0.2 0.07],'String','OK','FontWeight','bold','FontUnits','normalized','FontSize',0.9,'Callback',@close_GUI);
     BarPosition=[0.05 0.81 0.01 0.05];
     hwaitbar=uicontrol('Style','frame','Units','normalized', 'Position',BarPosition ,'BackgroundColor',[1 0 0],'tag','waitbar');
@@ -4736 +4737 @@
       end
 
-
+%-------------------------------------------------------------------   
+% call 'view_field.fig' to display the selected field
+function close_GUI(hObject, eventdata)
+%-------------------------------------------------------------------
+     delete(gcbf)

trunk/src/read_field.m

@@ -120 +120 @@
     ParamOut.FieldName='image';
     ParamOut.FieldList={'image'};
+    Npz=1;%default
     switch FileType
         case 'movie'
@@ -151 +152 @@
             FieldName='image';
     end
-    Npz=1;%default
     npxy=size(A);
-    ParamOut.Npx=npxy(2);% display image size on the interface
-    ParamOut.Npy=npxy(1);
     Rangx=[0.5 npxy(2)-0.5]; % coordinates of the first and last pixel centers
     Rangy=[npxy(1)-0.5 0.5]; %
@@ -165 +163 @@
             Field.AY=[npxy(1)-0.5 0.5];
             Field.AX=[0.5 npxy(2)-0.5]; % coordinates of the first and last pixel centers
+            ParamOut.Npx=npxy(2);% display image size on the interface
+            ParamOut.Npy=npxy(1);
         else
             Field.NbDim=3;
@@ -172 +172 @@
             Field.AY=[npxy(2)-0.5 0.5];
             Field.AX=[0.5 npxy(3)-0.5]; % coordinates of the first and last pixel centers
+            ParamOut.Npx=npxy(3);% display image size on the interface
+            ParamOut.Npy=npxy(2);
         end
     else
@@ -177 +179 @@
         Field.AY=[npxy(1)-0.5 0.5];
         Field.AX=[0.5 npxy(2)-0.5]; % coordinates of the first and last pixel centers
+        ParamOut.Npx=npxy(2);% display image size on the interface
+        ParamOut.Npy=npxy(1);
     end
     Field.A=A;

trunk/src/set_object.m

@@ -744 +744 @@
 projview='view_field';%default
 if strcmp(ListObject{IndexObj_1},ObjectName)% we are editing the object whose projection is viewed in the uvmat frame
-%    ObjectData.HandlesDisplay=hhuvmat.axes3;
-%     Object_set{iobj}.DisplayHandle_view_field
     IndexObj=IndexObj_1;
     projview='uvmat';
@@ -751 +749 @@
 elseif ~isempty(IndexObj_2) && IndexObj_2<=numel(ListObject)&& strcmp(ListObject{IndexObj_2},ObjectName)% we are editing the object whose projection is viewed in view_field  
     IndexObj=IndexObj_2;
-%     projview='view_field';
 else %new object 
     testnew=1;
@@ -759 +756 @@
         PlotHandles=guidata(hview_field);
         plotaxes=PlotHandles.axes3;%handle of axes3 in view_field
-%         ObjectData.HandlesDisplay=PlotHandles.axes3;%handle of axes3 in view_field
     end
 end
@@ -803 +799 @@
     ObjectData.DisplayHandle_uvmat=hhuvmat.axes3;
     ObjectData.DisplayHandle_view_field=[];
-elseif isfield(UvData.Object{IndexObj},'DisplayHandle_uvmat')% save the previous object graph handles
-    ObjectData.DisplayHandle_uvmat=UvData.Object{IndexObj}.DisplayHandle_uvmat;
-    ObjectData.DisplayHandle_view_field=UvData.Object{IndexObj}.DisplayHandle_view_field;
-else
-    ObjectData.DisplayHandle_uvmat=hhuvmat.axes3;
-    ObjectData.DisplayHandle_view_field=[];
+else
+    if isfield(UvData.Object{IndexObj},'DisplayHandle_uvmat')% save the previous object graph handles
+        ObjectData.DisplayHandle_uvmat=UvData.Object{IndexObj}.DisplayHandle_uvmat;
+    else
+        ObjectData.DisplayHandle_uvmat=hhuvmat.axes3;%there is no object handle, than the axes handles is used as input
+    end
+    if isfield(UvData.Object{IndexObj},'DisplayHandle_view_field')% save the previous object graph handles
+        ObjectData.DisplayHandle_view_field=UvData.Object{IndexObj}.DisplayHandle_view_field;
+    else
+        ObjectData.DisplayHandle_view_field=[];
+    end
 end
 UvData.Object{IndexObj}=ObjectData;%update the current object properties