Changeset 87

Timestamp:

Apr 27, 2010, 7:56:28 PM (14 years ago)

Author:

sommeria

Message:

improvement of vioew_field
suppress spurious 'todo' path in civ

Location:

trunk/src

Files:

• civ.m (modified) (1 diff)
• mouse_down.m (modified) (1 diff)
• uvmat.m (modified) (1 diff)
• view_field.m (modified) (2 diffs)

trunk/src/civ.m

@@ -2133 +2133 @@
 
 % for Windows system find the UBC path name if needed
-if ~isunix & isequal(todo_path(1:2),'\\') & isequal(filebase(2:3),':\')
-    cur_dir=pwd;
-    if ~isequal(cur_dir(2:3),':\')
-        cd(matlabroot); %move to the Matlab root directory if the current Matlab dir does not allow the dos command or is M: 
-    end
-    [ss,ww]=dos(['net use ' filebase(1:2)]);
-    if isequal(ss,0)
-        rankpath=findstr(ww,'\\');
-        if ~isempty(rankpath)
-            wwrest=ww(rankpath:end);
-            rankend=min(find(double(wwrest)==10))-1;
-            filebase=[wwrest(1:rankend) filebase(3:end)];
-            set(handles.RootName,'String',filebase);
-        end
-    else
-         msgbox_uvmat('ERROR','for BATCH option, UBC file names, beginning by \\, are needed');
-%          set(handles.BATCH, 'Enable','On')
-%          set(handles.BATCH,'BackgroundColor',[1 0 0])
-         return
-    end
-end
+% if ~isunix & isequal(todo_path(1:2),'\\') & isequal(filebase(2:3),':\')
+%     cur_dir=pwd;
+%     if ~isequal(cur_dir(2:3),':\')
+%         cd(matlabroot); %move to the Matlab root directory if the current Matlab dir does not allow the dos command or is M: 
+%     end
+%     [ss,ww]=dos(['net use ' filebase(1:2)]);
+%     if isequal(ss,0)
+%         rankpath=findstr(ww,'\\');
+%         if ~isempty(rankpath)
+%             wwrest=ww(rankpath:end);
+%             rankend=min(find(double(wwrest)==10))-1;
+%             filebase=[wwrest(1:rankend) filebase(3:end)];
+%             set(handles.RootName,'String',filebase);
+%         end
+%     else
+%          msgbox_uvmat('ERROR','for BATCH option, UBC file names, beginning by \\, are needed');
+% %          set(handles.BATCH, 'Enable','On')
+% %          set(handles.BATCH,'BackgroundColor',[1 0 0])
+%          return
+%     end
+% end
 
 % set the list of files and check them

trunk/src/mouse_down.m

@@ -30 +30 @@
 end
 hhuvmat=guidata(huvmat);%handles of elements in uvmat
+guihandles=guidata(hObject);
 UvData=get(huvmat,'UserData');
 MouseAction='none'; %default
-testzoom=get(hhuvmat.zoom,'Value');% get the mouse action from the uvmat GUI: options:
+testzoom=get(guihandles.zoom,'Value');% get the mouse action from the uvmat GUI: options:
 if isfield(UvData,'MouseAction')
     MouseAction=UvData.MouseAction;% get the mouse action from the uvmat GUI: options:

trunk/src/uvmat.m

@@ -2637 +2637 @@
         %Projeter les champs sur l'objet:*
         ObjectData=proj_field(UvData.Field,UvData.Object{iobj},iobj);
-        if imap==2
-            UvData.ProjField_2=ObjectData;%store the projection field on uvmat: ***** WILL REPLACE THE FIELD SORED ON THE AXES: AxeData *****
-        else
-            UvData.ProjField_1=ObjectData;%store the projection field on view_field
-        end
+%         if imap==2
+%             UvData.ProjField_2=ObjectData;%store the projection field on uvmat: ***** WILL REPLACE THE FIELD SORED ON THE AXES: AxeData *****
+%         else
+%             UvData.ProjField_1=ObjectData;%store the projection field on view_field
+%         end
         %use of mask
         if isfield(ObjectData,'NbDim')&isequal(ObjectData.NbDim,2)

trunk/src/view_field.m

@@ -91 +91 @@
 set(hObject,'CloseRequestFcn',{@closefcn})%
 
-[PlotType,PlotParamOut,haxes]= plot_field(Field,handles.axes3)%,PlotParam,KeepLim,PosColorbar)
-'TEST'
+[PlotType,PlotParamOut,haxes]= plot_field(Field,handles.axes3);%,PlotParam,KeepLim,PosColorbar)
+set(handles.axes3,'UserData',Field);%store the current field
 if isfield(PlotParamOut,'Vectors')
     set(handles.VECT_title,'Visible','on')
 end
-handles
 write_plot_param(handles,PlotParamOut);% update the display of the plotting parameters
 
@@ -2340 +2339 @@
 haxes= handles.axes3;
 huvmat=findobj(allchild(0),'tag','uvmat');
-UvData=get(huvmat,'UserData');
+ProjField=get(haxes,'UserData');
 % 
 % AxeData=get(haxes,'UserData');
 PlotParam=read_plot_param(handles);
-[PlotType,PlotParamOut]= plot_field(UvData.ProjField_2,haxes,PlotParam,1);
+[PlotType,PlotParamOut]= plot_field(ProjField,haxes,PlotParam,1);
 write_plot_param(handles,PlotParamOut); %update the auto plot parameters