Changeset 886 for trunk/src

Timestamp:

Mar 28, 2015, 10:04:00 PM (10 years ago)

Author:

sommeria

Message:

bug on memory increase solved for civ_series and stereo_civ, corrections for Matlab2014b

Location:

trunk/src

Files:

• mouse_motion.m (modified) (1 diff)
• series.m (modified) (3 diffs)
• series/civ_series.m (modified) (2 diffs)
• series/extract_rdvision.m (modified) (2 diffs)
• series/stereo_civ.m (modified) (2 diffs)

trunk/src/mouse_motion.m

@@ -122 +122 @@
             pointershape='crosshair';%set pointer with cross shape 
         else
-        pointershape='fullcross';%set pointer with large cross (default when mouse is over an axis)
+        pointershape='crosshair';%set pointer with large cross (default when mouse is over an axis)
         end
     end

trunk/src/series.m

@@ -264 +264 @@
 
 %% introduce the input file name(s) if defined from input Param,
+set(handles.series,'UserData',[])% initiate Userdata
 if isfield(Param,'InputFile')
     
@@ -2078 +2079 @@
     
     % record the file extension and extend the path list if it is a new extension
-%     ActionExtList=get(handles.ActionExt,'String');
-%     ActionExtIndex=find(strcmp(ActionExt,ActionExtList), 1);
-%     if isempty(ActionExtIndex)
-%         set(handles.ActionExt,'String',[ActionExtList;{ActionExt}])
-%     end
+    ActionExtList=get(handles.ActionExt,'String');
+    ActionExtIndex=find(strcmp(ActionExt,ActionExtList), 1);
+    if isempty(ActionExtIndex)
+        set(handles.ActionExt,'String',[ActionExtList;{ActionExt}])
+    end
 
     % remove old Action options in the menu (keeping a menu length <nb_builtin_ACTION+5)
@@ -2105 +2106 @@
         ActionListUser=ActionList(NbBuiltinAction+1:numel(ActionList)-1);
         ActionPathListUser=ActionPathList(NbBuiltinAction+1:numel(ActionList)-1);
-%         ActionExtListUser={};
-%         if numel(ActionExtList)>2
-%             ActionExtListUser=ActionExtList(3:end);
-%         end
+        ActionExtListUser={};
+        if numel(ActionExtList)>2
+            ActionExtListUser=ActionExtList(3:end);
+        end
         if exist(profil_perso,'file')
             save(profil_perso,'ActionListUser','ActionPathListUser','ActionExtListUser','-append')

trunk/src/series/civ_series.m

@@ -271 +271 @@
 
 %% prepare output Data
-Data.ListGlobalAttribute={'Conventions','Program','CivStage'};
+ListGlobalAttribute={'Conventions','Program','CivStage'};
 Data.Conventions='uvmat/civdata';% states the conventions used for the description of field variables and attributes
 Data.Program='civ_series';
@@ -412 +412 @@
                 Data.(Civ1_param{4+ilist})=Param.ActionInput.Civ1.(list_param{ilist});
             end
-            Data.ListGlobalAttribute=[Data.ListGlobalAttribute Civ1_param];
+            Data.ListGlobalAttribute=[ListGlobalAttribute Civ1_param];
             Data.CivStage=1;
         end

trunk/src/series/extract_rdvision.m

@@ -152 +152 @@
 end
 t=xmltree;
-save(t,fullfile(RootPath,'Running.xml'))%create an xml file to indicate that processing takes place
+%%% A REMETTREE %%%%%%%%%%%%%%%%%%%%%
+%save(t,fullfile(RootPath,'Running.xml'))%create an xml file to indicate that processing takes place
 
 %% calibration data and timing: read the ImaDoc files
@@ -309 +310 @@
     
     %% reading the .sqb file
-    m = memmapfile(filename_sqb,'Format', { 'uint32' [1 1] 'offset'; ...
-        'uint32' [1 1] 'garbage1';...
-        'double' [1 1] 'timestamp';...
-        'uint32' [1 1] 'file_idx';...
-        'uint32' [1 1] 'garbage2' },'Repeat',SeqData.nb_frames);
+%     m = memmapfile(filename_sqb,'Format', { 'uint32' [1 1] 'offset'; ...
+%         'uint32' [1 1] 'garbage1';...
+%         'double' [1 1] 'timestamp';...
+%         'uint32' [1 1] 'file_idx';...
+%         'uint32' [1 1] 'garbage2' },'Repeat',SeqData.nb_frames);
     %%%%%%%BRICOLAGE in case of unreadable .sqb file
-    %     ind=[60 63:152];%indices of bin files
-    %     lengthimage=w*h*bpp;% lengthof an image record on the binary file
-    %     for ii=1:32*numel(ind)
-    %         data(ii).offset=mod(ii-1,32)*2*lengthimage+lengthimage;%Dalsa_2
-    %         %data(ii).offset=mod(ii-1,32)*2*lengthimage;%Dalsa_1
-    %         data(ii).file_idx=ind(ceil(ii/32));
-    %         data(ii).timestamp=0.2*(ii-1);
-    %     end
+        ind=[111 114:211];%indices of bin files
+        w=1024;%w=width of images in pixels
+        h=1024;%h=height of images in pixels
+        bpp=2;% nbre of bytes per pixel
+        lengthimage=w*h*bpp;% lengthof an image record on the binary file
+        nbimages=32; %nbre of images of each camera in a bin file 
+        for ii=1:32*numel(ind)
+            data(ii).offset=mod(ii-1,32)*2*lengthimage+lengthimage;%Dalsa_2
+            %data(ii).offset=mod(ii-1,32)*2*lengthimage;%Dalsa_1
+            data(ii).file_idx=ind(ceil(ii/32));
+            data(ii).timestamp=0.2*(ii-1);
+        end
+        m.Data=data;
     %%%%%%%
     for ii=1: numel(m.Data)
         timestamp(ii)=m.Data(ii).timestamp;
     end
-    timestamp %todo: check withDt from the xml file
+    %timestamp %todo: check withDt from the xml file
     [BinSize,errormsg]=binread_rdv_series(RootPath,SeqData,m.Data,nbfield2,NomTypeNew)
     if ~isempty(errormsg)

trunk/src/series/stereo_civ.m

@@ -234 +234 @@
 OutputDir=[Param.OutputSubDir Param.OutputDirExt];
 
-Data.ListGlobalAttribute={'Conventions','Program','CivStage'};
+ListGlobalAttribute={'Conventions','Program','CivStage'};
 Data.Conventions='uvmat/civdata';% states the conventions used for the description of field variables and attributes
 Data.Program=mfilename;%gives the name of the current function;
@@ -338 +338 @@
             Data.(Civ1_param{4+ilist})=Param.ActionInput.Civ1.(list_param{ilist});
         end
-        Data.ListGlobalAttribute=[Data.ListGlobalAttribute Civ1_param];
+        Data.ListGlobalAttribute=[ListGlobalAttribute Civ1_param];
         Data.CivStage=1;