Changeset 82 for trunk/src/civ.m

Timestamp:

Apr 15, 2010, 5:12:42 AM (14 years ago)

Author:

sommeria

Message:

mouse_up: improve zoom : keep the selected point at the same place on the graph
plot_field: memorize the max coordiantes on the graph (AxeData?) for zoom out
set_object: input possibilities extende to restrict menu (for mask objects)
uvmat: improvement of mask creation
civ: select mask option for civ2 when select(ed for civ1

File:

• trunk/src/civ.m (modified) (6 diffs)

trunk/src/civ.m

@@ -295 +295 @@
    end
 end
-[RootPath,RootFile,str1,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fileinput)
+[RootPath,RootFile,str1,str2,str_a,str_b,ext,nom_type,subdir]=name2display(fileinput);
 filebase=fullfile(RootPath,RootFile);
 % if isequal(nom_type,'*')% all fields in a single file ( movie files)
@@ -355 +355 @@
 set(handles.ImaDoc,'String',ext);
 if ~isempty(num_i1)
-    ref_i=num_i1
-    'TEStbrowse'
-    num_i2
+    ref_i=num_i1;
     if ~isempty(num_i2)
         ref_i=floor((ref_i+num_i2)/2);% reference image number corresponding to the file
@@ -2109 +2107 @@
 end
 if isfield(sparam,'CivBin')
-    CivBin=sparam.CivBin
+    CivBin=sparam.CivBin;
 end
 if isfield(sparam,'Civ1Bin')
@@ -2356 +2354 @@
                     par_civ1.maskname=name_generator(maskbase,num1_mask,1,'.png','_i');
                     if exist(par_civ1.maskname,'file')
-                        par_civ1.maskflag='y'; 
+                        par_civ1.maskflag='y';
                     else
                         par_civ1.maskname='noFile use default';
@@ -2664 +2662 @@
             save(civAllxml,[filename_cmx([1:end-4]) '.xml']);
             %cmd=char({cmd;[CivBin ' -f ' [filename_cmx([1:end-4]) '.xml'] ' ' civAllCmd]});
-            cmd=[cmd '\n' CivBin ' -f ' filename_cmx(1:end-4) '.xml '  civAllCmd]
+            cmd=[cmd '\n' CivBin ' -f ' filename_cmx(1:end-4) '.xml '  civAllCmd];
         end
       % create the .bat file:
@@ -3993 +3991 @@
     set(handles.mask_fix2,'String',mask_displ)
 end
+set(handles.mask_civ2,'Value',maskval)
 
 %------------------------------------------------------------------------