Changeset 484 for trunk/src

Timestamp:

Jun 27, 2012, 12:40:43 AM (12 years ago)

Author:

sommeria

Message:

bugs removed for windows OS

Location:

trunk/src

Files:

• civ.m (modified) (2 diffs)
• find_file_series.m (modified) (1 diff)
• uvmat.m (modified) (3 diffs)

trunk/src/civ.m

@@ -82 +82 @@
 if isfield(sparam,'BatchParam') && isfield(sparam.BatchParam,'BatchMode')
     batch_mode=sparam.BatchParam.BatchMode; %sge is currently the only implemented batch mod
+    test_command='';
     switch batch_mode
         case 'sge'
@@ -88 +89 @@
             test_command='oarstat';
     end
+    if ~isempty(test_command)
     [s,w]=system(test_command);
     if isequal(s,0)
         test_batch=1;
+    end
     end
 end

trunk/src/find_file_series.m

@@ -232 +232 @@
 
 %% introduce the frame index in case of movies or multimage type
-if isfield(FileInfo,'NumberOfFrames')>1 && FileInfo.NumberOfFrames >1
+if isfield(FileInfo,'NumberOfFrames') && FileInfo.NumberOfFrames >1
+    'TEST'
     if isempty(i1_series)
         i1_series=(1:FileInfo.NumberOfFrames)';

trunk/src/uvmat.m

@@ -853 +853 @@
     return
 end
-nbfield=[];%default
-nbfield_j=[];%default
+% nbfield=[];%default
+% nbfield_j=[];%default
 
 %% read timing and total frame number from the current file (movie files) !! may be overrid by xml file
@@ -868 +868 @@
     imainfo=get(VideoObject);
     testima=1;
-    nbfield_j=1;
+%     nbfield_j=1;
     TimeUnit='s';
     XmlData.Time=(0:1/imainfo.FrameRate:(imainfo.NumberOfFrames-1)/imainfo.FrameRate)';
-    % %         nbfield=imainfo.NumberOfFrames;
+    %nbfield=imainfo.NumberOfFrames;
     set(handles.Dt_txt,'String',['Dt=' num2str(1000/imainfo.FrameRate) 'ms']);%display the elementary time interval in millisec
     ColorType='truecolor';
@@ -884 +884 @@
     ColorType=imainfo.ColorType;%='truecolor' for color images
     if length(imainfo) >1 %case of image with multiple frames
-        nbfield=length(imainfo);
-        nbfield_j=1;
+       % nbfield=length(imainfo);
+       % nbfield_j=1;
     end
 end