Changeset 183

Timestamp:

Jan 26, 2011, 5:03:40 PM (14 years ago)

Author:

sommeria

Message:

small bug repair: reading movies in read_fields, plotting rectangles and ellipes

Location:

trunk/src

Files:

• civ.m (modified) (13 diffs)
• mouse_up.m (modified) (1 diff)
• plot_object.m (modified) (1 diff)
• read_field.m (modified) (5 diffs)
• set_object.m (modified) (10 diffs)
• update_obj.m (modified) (2 diffs)
• uvmat.m (modified) (3 diffs)

trunk/src/civ.m

@@ -1724 +1724 @@
         end
     end
-    %test_interp=get(handles.test_interp,'Value');
-
     if  isfield(sparam,'PatchBin')
         if ~exist(sparam.PatchBin,'file')
@@ -1731 +1729 @@
         end
     end
-    % if test_interp && isfield(sparam,'PatchNewBin')
-    %     if ~exist(sparam.PatchNewBin,'file')
-    %          sparam.PatchNewBin=fullfile(path_UVMAT,sparam.PatchNewBin);
-    %     end
-    % end
     if isfield(sparam,'FixBin')
         if ~exist(sparam.FixBin,'file')
@@ -1746 +1739 @@
         batch_mode=sparam.BatchMode;
     end
-else
-%     MaxCivProcesses=50;
-%     if isfield(sparam,'MaxCivProcesses')
-%         MaxCivProcesses=str2double(sparam.MaxCivProcesses);
-%     end
 end
 
@@ -1756 +1744 @@
 %% get civ1 parameters:
 display('files OK, processing...')
-%get civ parameters
 if box_test(1)==1
     par_civ1=read_param_civ1(handles,filecell.ima1.civ1{1,1});
@@ -1863 +1850 @@
         cmd='';
         if isunix % check: necessaire aussi en RUN?
-            %fid=fopen([filename '.cmx'],'w')
             cmd='#!/bin/bash \n';
             cmd=[cmd '#$ -cwd \n'];
@@ -1874 +1860 @@
             civAllxml=set(civAllxml,1,'name','CivDoc');
         end
-        %filename_cur=filecell.nc.civ1{ifile,j};%output netcdf file
         [Rootbat,Filebat]=fileparts(filecell.nc.civ1{ifile,j});%output netcdf file (without extention)
         flname=fullfile(Rootbat,Filebat);
-        %filename_cmx(end-1:end+6)='civ1.cmx';%name of cmx file
         if batch
-%             [Rootbat,Filebat,extbat]=fileparts(filename_cmx);
             filename_bat=fullfile(Rootbat,['job_' Filebat]);
          else
@@ -1890 +1873 @@
             par_civ1.filename_ima_a=filecell.ima1.civ1{ifile,j};
             par_civ1.filename_ima_b=filecell.ima2.civ1{ifile,j};
-            %namelog=[fullfile(Rootbat,Filebat) '.civ1.log'];
             par_civ1.Dt=num2str(time(num2_civ1(ifile),num_b_civ1(j))-time(num1_civ1(ifile),num_a_civ1(j)));
             par_civ1.T0=num2str((time(num2_civ1(ifile),num_b_civ1(j))+time(num1_civ1(ifile),num_a_civ1(j)))/2);
@@ -1943 +1925 @@
             i_cmd=i_cmd+1;
             if isequal(civAll,0)
-                cmd=[cmd CIV1_CMD(fullfile(Rootbat,Filebat),'',par_civ1,handles,sparam) '\n'];
+                if(isunix)
+                     cmd=[cmd 'cp -f ' flname '.civ1.cmx ' flname '.cmx\n'];
+                else
+                    flname=regexprep(flname,'\\','\\\\');
+                    cmd=[cmd 'copy /Y "' flname '.civ1.cmx" "' flname '.cmx"\n'];
+                end
+                cmd=[cmd CIV1_CMD(fullfile(Rootbat,Filebat),'',par_civ1,handles,sparam) '\n']
             else
                 civAllCmd=[civAllCmd ' civ1 '];
@@ -2054 +2042 @@
             filename_cmx=filecell.nc.civ2{ifile,j};%output netcdf file
             filename_cmx([end-1:end+1])=[ 'cmx'];%name of cmx file
-%             filename_cmx=[filename_cmx 'x'];
         end
         
         if box_test(4)==1
             par_civ2.filename_ima_a=filecell.ima1.civ2{ifile,j};
-            %par_civ2.filename_ima_a([end-3:end])=[];%remove .png extension
             par_civ2.filename_ima_b=filecell.ima2.civ2{ifile,j};
-            %par_civ2.filename_ima_b([end-3:end])=[];%remove .png extension
             [Rootbat,Filebat]=fileparts(filecell.nc.civ2{ifile,j});%output netcdf file (without extention)
-            %namelog=[fullfile(Rootbat,Filebat) '.civ2.log'];
             par_civ2.Dt=num2str(time(num2_civ2(ifile),num_b_civ2(j))-time(num1_civ2(ifile),num_a_civ2(j)));
             par_civ2.T0=num2str((time(num2_civ1(ifile),num_b_civ2(j))+time(num1_civ2(ifile),num_a_civ2(j)))/2);
@@ -2115 +2099 @@
                 end
             end
-            %endTESTgrid
             i_cmd=i_cmd+1;
             flname=fullfile(Rootbat,Filebat);
@@ -2234 +2217 @@
         if isequal(civAll,1)
             save(civAllxml,[filename_cmx([1:end-4]) '.xml']);
-            %cmd=char({cmd;[CivBin ' -f ' [filename_cmx([1:end-4]) '.xml'] ' ' civAllCmd]});
             cmd=[cmd CivBin ' -f ' filename_cmx(1:end-4) '.xml '  civAllCmd  '\n'];
         end
@@ -2245 +2227 @@
         fprintf(fid,cmd);
         fclose(fid);
-        %dlmwrite(filename_bat,cmd,'');%write commands in filename_bat
         if batch
             switch batch_mode
                 case 'sge'
                     pvalue=num2str((1-ind_answer)*500);
-                    %namelog=[filename_bat '.patch.log'];
                     display(['!qsub -p ' pvalue ' -q civ.q -e ' flname '.errors -o ' flname '.log' ' ' filename_bat]);
                     eval(  ['!qsub -p ' pvalue ' -q civ.q -e ' flname '.errors -o ' flname '.log' ' ' filename_bat]);
@@ -2258 +2238 @@
             if(isunix)
                 cmd_str=['. ' filename_bat];
-                % cmd_str=['!at -qb now -f ' filename_bat ' &']; %ou at -qb now -f bad idea...
             else %case of Windows
                 cmd_str=['@call "' regexprep(filename_bat,'\\','\\\\') '"'];

trunk/src/mouse_up.m

@@ -116 +116 @@
     set(hh_set_object.YObject,'String',num2str(ObjectData.Coord(:,2),4)); 
     set(hh_set_object.ZObject,'String',num2str(ObjectData.Coord(:,3),4));
+    if strcmp(ObjectData.Style,'rectangle')||strcmp(ObjectData.Style,'ellipse')
+        set(hh_set_object.XMax,'String',num2str(ObjectData.RangeX,4));
+        set(hh_set_object.YMax,'String',num2str(ObjectData.RangeY,4));
+    end
     if NbDefPoint<=2 || isequal(get(currentfig,'SelectionType'),'alt') ||...
               strcmp(AxeData.Drawing,'translate') || strcmp(AxeData.Drawing,'deform');%stop drawing

trunk/src/plot_object.m

@@ -47 +47 @@
     ObjectData=ObjectDataIn;% TODO: modify take into account rotation of axis
 else
-    return % no object representation yet available
+    return % object representation only  available in a plane
 end
 if ~isfield(ObjectData,'Style')||isempty(ObjectData.Style)||~ischar(ObjectData.Style)

trunk/src/read_field.m

@@ -27 +27 @@
 %     .ColorVar: variable used for vector color
 %     .Npx, .Npy: nbre of pixels along x and y (used for .vol input files)
-function [Field,ParamOut,errormsg] = read_field(ObjectName,FileType,ParamIn)
+function [Field,ParamOut,errormsg] = read_field(ObjectName,FileType,ParamIn,num)
 Field=[];
 ParamOut=[];
@@ -124 +124 @@
         case 'movie'
             try
-                A=read(ObjectName,num_i1);
+                A=read(ObjectName,num);
                 FieldName='image';
             catch
@@ -132 +132 @@
         case 'avi'
             try
-                mov=aviread(ObjectName,num_i1);
+                mov=aviread(ObjectName,num);
             catch
                 errormsg=lasterr;
@@ -146 +146 @@
             FieldName='image';
         case 'multimage'
-            A=imread(ObjectName,num_i1);
+            A=imread(ObjectName,num);
             FieldName='image';
         case 'image'
@@ -187 +187 @@
 
 
-

trunk/src/set_object.m

@@ -84 +84 @@
 end
 set(hObject,'KeyPressFcn',{'keyboard_callback',handles})%set keyboard action function (allow action on uvmat when set_object is in front)
-%set(handles.MenuCoord,'ListboxTop',1)
-% if ~exist('PlotHandles','var')
-%      PlotHandles=[];
-% end
 enable_plot=0;%default: does not allow plot of object and projection
-% SetData.PlotHandles=PlotHandles;
-% set(hObject,'UserData',SetData)
 
 % fill the interface as set in the input data:
@@ -99 +93 @@
     if isfield(data,'Name')
         set(handles.TITLE,'String',data.Name)
-%         set(hObject,'name',data.Name)
     end
     if ~isfield(data,'NbDim')||~isequal(data.NbDim,3)%2D case
@@ -125 +118 @@
     ObjectStyle_Callback(hObject, eventdata, handles)
     if isfield(data,'ProjMenu')
-        set(handles.ProjMode,'String',data.ProjMenu);
+        set(handles.ProjMode,'String',data.ProjMenu);%overset the standard menu
     end
     if isfield(data,'ProjMode')
@@ -244 +237 @@
         set(handles.CoordUnit,'String',data.CoordUnit)
     end
-%     if isfield(data,'CoordType')&& isequal(data.CoordType,'px')
-% %         if isequal(data.CoordType,'phys')
-% %             set(handles.MenuCoord,'Value',1)
-% %         elseif isequal(data.CoordType,'px')
-%              set(handles.MenuCoord,'Value',2)
-% %         end
-%     end
 end
 if enable_plot
@@ -267 +253 @@
 end
 
+%------------------------------------------------------------------------
 % --- Outputs from this function are returned to the command line.
 function varargout = set_object_OutputFcn(hObject, eventdata, handles)
-% varargout  cell array for returning output args (see VARARGOUT);
-% hObject    handle to figure
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
+%------------------------------------------------------------------------
 % Get default command line output from handles structure
 varargout{1} = handles.output;
@@ -281 +264 @@
 % --- Executes on selection change in ObjectStyle.
 function ObjectStyle_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 style_prev=get(handles.ObjectStyle,'UserData');%previous object style
 str=get(handles.ObjectStyle,'String');
@@ -286 +270 @@
 style=str{val};
 % make correspondance between different object styles
-% if ~isequal(str{val},style_prev)
 Xcolumn=get(handles.XObject,'String');
 Ycolumn=get(handles.YObject,'String');
@@ -333 +316 @@
      set(handles.ZObject,'String',z_new)
 end
-% end
+
 switch style
     case {'points','line','polyline','plane'}
@@ -542 +525 @@
      s.ProjMode='none';
  end
-%Display title
-% title=set_title(s.Style,s.ProjMode);%update the title
-% if ~isempty(huvmat)
-%     hhuvmat=guidata(huvmat);
-% end
-% menu=get(handles.TITLE,'String');
-% for iline=1:length(menu)
-%      if isequal(menu{iline},title)
-%          set(handles.TITLE,'Value',iline)
-%          break
-%      end
-% end
-%TITLE_Callback(hObject, eventdata, handles)
 teststyle=0;
 
@@ -585 +555 @@
 
 ProjMode_Callback(hObject, eventdata, handles);%visualize the appropriate edit boxes
-% if isfield(s,'CoordType')
-%     if isequal(s.CoordType,'phys')
-%         set(handles.MenuCoord,'Value',1)
-%     elseif isequal(s.CoordType,'px')
-%         set(handles.MenuCoord,'Value',2)
-%     else
-%         warndlg('unknown CoordType (px or phys) in set_object.m')
-%     end
-% end
 if isfield(s,'XMax')
     set(handles.XMax,'String',s.XMax)

trunk/src/update_obj.m

@@ -12 +12 @@
 %    .Object{IndexObj}.DisplayHandle_uvmat: handles of the object plot on uvmat, =[] if it does not exist
 %    .Object{IndexObj}.DisplayHandle_view_field: handles of the object plot on view_field, =[] if it does not exist
-%IndexObj: object index of  UvData.Object correspopnding to the updated object
-%ObjectData: structure containing the input object properties to be attributed to the object #IndexObj
-%       .Style: style of the object: 'line', 'rectangle'...
-%PlotHandles: structure containing the handles of the plotting parameter buttons on the uvmat or view_field interface 
+%IndexObj_1: index of  the object used for the uvmat plot
+%IndexObj_2: index of  the object used for the view_field plot 
 %-------------------------------------
 
@@ -26 +24 @@
 %%  representation of the different objects in the plots uvmat and view_field
 %plot uvmat
-    for iobj=1:length(Object_out) %change the view of all existing objects on the updated current object #IndexObj_1
-         hobject=[];
-        if isfield(Object_out{iobj},'DisplayHandle_uvmat') && ~isempty(Object_out{iobj}.DisplayHandle_uvmat) && ishandle(Object_out{iobj}.DisplayHandle_uvmat)
-            hobject=Object_out{iobj}.DisplayHandle_uvmat;%graphic handle of object #iobj in the uvmat plot
-        end
-        Object_out{iobj}.DisplayHandle_uvmat=plot_object(Object_out{iobj},Object_out{IndexObj_1},hobject,'m');%update the object representation of Object_out{iobj} on Object_out{IndexObj_1}
+for iobj=1:length(Object_out) %change the view of all existing objects on the updated current object #IndexObj_1
+     hobject=[];
+    if isfield(Object_out{iobj},'DisplayHandle_uvmat') && ~isempty(Object_out{iobj}.DisplayHandle_uvmat) && ishandle(Object_out{iobj}.DisplayHandle_uvmat)
+        hobject=Object_out{iobj}.DisplayHandle_uvmat;%graphic handle of object #iobj in the uvmat plot
     end
+    Object_out{iobj}.DisplayHandle_uvmat=plot_object(Object_out{iobj},Object_out{IndexObj_1},hobject,'m');%update the object representation of Object_out{iobj} on Object_out{IndexObj_1}
+end
 % plot view_field
 if ~isempty(IndexObj_2)
-    for iobj=1:length(Object_out) %change the view of all existing objects on the updated current object #IndexObj_2
+    for iobj=1:length(Object_out) %change the view of all existing objects on the updated  object #IndexObj_2
         hobject=[];
         if isfield(Object_out{iobj},'DisplayHandle_view_field') &&  ~isempty(Object_out{iobj}.DisplayHandle_view_field) && ishandle(Object_out{iobj}.DisplayHandle_view_field)

trunk/src/uvmat.m

@@ -2159 +2159 @@
     ParamIn.VelType=VelType;
     ParamIn.GUIName='get_field';
-    [Field{1},ParamOut,errormsg] = read_field(ObjectName,FileType,ParamIn);
+    [Field{1},ParamOut,errormsg] = read_field(ObjectName,FileType,ParamIn,num_i1);
+    if ~isempty(errormsg)
+        errormsg=['error in reading ' filename ': ' errormsg];
+        return
+    end
     if isfield(ParamOut,'Npx')&& isfield(ParamOut,'Npy')
         set(handles.npx,'String',num2str(ParamOut.Npx));% display image size on the interface
@@ -2244 +2248 @@
             ParamIn.VelType=VelType_1;
             ParamIn.GUIName='get_field_1';
-            [Field{2},ParamOut_1,errormsg] = read_field(Name,FileType_1,ParamIn);         
+            [Field{2},ParamOut_1,errormsg] = read_field(Name,FileType_1,ParamIn,num_i1);
+            if ~isempty(errormsg)
+                errormsg=['error in reading ' filename_1 ': ' errormsg];
+                return
+            end
             UvData.Field_1=Field{2}; %store the second field for possible use at next RUN
         end
@@ -4248 +4256 @@
     if ~isempty(hview_field)
         delete(hview_field)
+    end
+    hset_object=findobj(allchild(0),'Tag','set_object');
+    if ~isempty(hset_object)
+        delete(hset_object)
     end
 else