Changeset 406 for trunk/src/civ.m

Timestamp:

May 3, 2012, 7:30:05 PM (12 years ago)

Author:

sommeria

Message:

bugs corrected in civ_matlab and object projection

File:

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

trunk/src/civ.m

@@ -1253 +1253 @@
             Param.Civ1.ImageWidth=ImageInfo.Width;
             Param.Civ1.ImageHeight=ImageInfo.Height;
-            Param.Civ1.i1=i1_civ1;
-            Param.Civ1.i2=i2_civ1;
+            Param.Civ1.i1=i1_civ1(ifile,j);
+            Param.Civ1.i2=i2_civ1(ifile,j);
             % read mask parameters
             if Param.Civ1.CheckMask % the lines below should be changed with the new gui
@@ -1431 +1431 @@
             Param.Civ2.ImageWidth=ImageInfo.Width;
             Param.Civ2.ImageHeight=ImageInfo.Height;
-            Param.Civ2.i1=i1_civ2;
-            Param.Civ2.i2=i2_civ2;
+            Param.Civ2.i1=i1_civ2(ifile,j);
+            Param.Civ2.i2=i2_civ2(ifile,j);
             switch CivMode
                 case 'CivX'
@@ -1586 +1586 @@
                         if isempty(errormsg)
                             display([filecell.nc.civ1{ifile,j} ' written'])
-%                         else
-%                             msgbox_uvmat('ERROR',errormsg)
                         end
                     end