Changeset 886


Ignore:
Timestamp:
Mar 28, 2015, 10:04:00 PM (6 years ago)
Author:
sommeria
Message:

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

Location:
trunk/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/mouse_motion.m

    r862 r886  
    122122            pointershape='crosshair';%set pointer with cross shape
    123123        else
    124         pointershape='fullcross';%set pointer with large cross (default when mouse is over an axis)
     124        pointershape='crosshair';%set pointer with large cross (default when mouse is over an axis)
    125125        end
    126126    end
  • trunk/src/series.m

    r883 r886  
    264264
    265265%% introduce the input file name(s) if defined from input Param,
     266set(handles.series,'UserData',[])% initiate Userdata
    266267if isfield(Param,'InputFile')
    267268   
     
    20782079   
    20792080    % record the file extension and extend the path list if it is a new extension
    2080 %     ActionExtList=get(handles.ActionExt,'String');
    2081 %     ActionExtIndex=find(strcmp(ActionExt,ActionExtList), 1);
    2082 %     if isempty(ActionExtIndex)
    2083 %         set(handles.ActionExt,'String',[ActionExtList;{ActionExt}])
    2084 %     end
     2081    ActionExtList=get(handles.ActionExt,'String');
     2082    ActionExtIndex=find(strcmp(ActionExt,ActionExtList), 1);
     2083    if isempty(ActionExtIndex)
     2084        set(handles.ActionExt,'String',[ActionExtList;{ActionExt}])
     2085    end
    20852086
    20862087    % remove old Action options in the menu (keeping a menu length <nb_builtin_ACTION+5)
     
    21052106        ActionListUser=ActionList(NbBuiltinAction+1:numel(ActionList)-1);
    21062107        ActionPathListUser=ActionPathList(NbBuiltinAction+1:numel(ActionList)-1);
    2107 %         ActionExtListUser={};
    2108 %         if numel(ActionExtList)>2
    2109 %             ActionExtListUser=ActionExtList(3:end);
    2110 %         end
     2108        ActionExtListUser={};
     2109        if numel(ActionExtList)>2
     2110            ActionExtListUser=ActionExtList(3:end);
     2111        end
    21112112        if exist(profil_perso,'file')
    21122113            save(profil_perso,'ActionListUser','ActionPathListUser','ActionExtListUser','-append')
  • trunk/src/series/civ_series.m

    r885 r886  
    271271
    272272%% prepare output Data
    273 Data.ListGlobalAttribute={'Conventions','Program','CivStage'};
     273ListGlobalAttribute={'Conventions','Program','CivStage'};
    274274Data.Conventions='uvmat/civdata';% states the conventions used for the description of field variables and attributes
    275275Data.Program='civ_series';
     
    412412                Data.(Civ1_param{4+ilist})=Param.ActionInput.Civ1.(list_param{ilist});
    413413            end
    414             Data.ListGlobalAttribute=[Data.ListGlobalAttribute Civ1_param];
     414            Data.ListGlobalAttribute=[ListGlobalAttribute Civ1_param];
    415415            Data.CivStage=1;
    416416        end
  • trunk/src/series/extract_rdvision.m

    r851 r886  
    152152end
    153153t=xmltree;
    154 save(t,fullfile(RootPath,'Running.xml'))%create an xml file to indicate that processing takes place
     154%%% A REMETTREE %%%%%%%%%%%%%%%%%%%%%
     155%save(t,fullfile(RootPath,'Running.xml'))%create an xml file to indicate that processing takes place
    155156
    156157%% calibration data and timing: read the ImaDoc files
     
    309310   
    310311    %% reading the .sqb file
    311     m = memmapfile(filename_sqb,'Format', { 'uint32' [1 1] 'offset'; ...
    312         'uint32' [1 1] 'garbage1';...
    313         'double' [1 1] 'timestamp';...
    314         'uint32' [1 1] 'file_idx';...
    315         'uint32' [1 1] 'garbage2' },'Repeat',SeqData.nb_frames);
     312%     m = memmapfile(filename_sqb,'Format', { 'uint32' [1 1] 'offset'; ...
     313%         'uint32' [1 1] 'garbage1';...
     314%         'double' [1 1] 'timestamp';...
     315%         'uint32' [1 1] 'file_idx';...
     316%         'uint32' [1 1] 'garbage2' },'Repeat',SeqData.nb_frames);
    316317    %%%%%%%BRICOLAGE in case of unreadable .sqb file
    317     %     ind=[60 63:152];%indices of bin files
    318     %     lengthimage=w*h*bpp;% lengthof an image record on the binary file
    319     %     for ii=1:32*numel(ind)
    320     %         data(ii).offset=mod(ii-1,32)*2*lengthimage+lengthimage;%Dalsa_2
    321     %         %data(ii).offset=mod(ii-1,32)*2*lengthimage;%Dalsa_1
    322     %         data(ii).file_idx=ind(ceil(ii/32));
    323     %         data(ii).timestamp=0.2*(ii-1);
    324     %     end
     318        ind=[111 114:211];%indices of bin files
     319        w=1024;%w=width of images in pixels
     320        h=1024;%h=height of images in pixels
     321        bpp=2;% nbre of bytes per pixel
     322        lengthimage=w*h*bpp;% lengthof an image record on the binary file
     323        nbimages=32; %nbre of images of each camera in a bin file
     324        for ii=1:32*numel(ind)
     325            data(ii).offset=mod(ii-1,32)*2*lengthimage+lengthimage;%Dalsa_2
     326            %data(ii).offset=mod(ii-1,32)*2*lengthimage;%Dalsa_1
     327            data(ii).file_idx=ind(ceil(ii/32));
     328            data(ii).timestamp=0.2*(ii-1);
     329        end
     330        m.Data=data;
    325331    %%%%%%%
    326332    for ii=1: numel(m.Data)
    327333        timestamp(ii)=m.Data(ii).timestamp;
    328334    end
    329     timestamp %todo: check withDt from the xml file
     335    %timestamp %todo: check withDt from the xml file
    330336    [BinSize,errormsg]=binread_rdv_series(RootPath,SeqData,m.Data,nbfield2,NomTypeNew)
    331337    if ~isempty(errormsg)
  • trunk/src/series/stereo_civ.m

    r879 r886  
    234234OutputDir=[Param.OutputSubDir Param.OutputDirExt];
    235235
    236 Data.ListGlobalAttribute={'Conventions','Program','CivStage'};
     236ListGlobalAttribute={'Conventions','Program','CivStage'};
    237237Data.Conventions='uvmat/civdata';% states the conventions used for the description of field variables and attributes
    238238Data.Program=mfilename;%gives the name of the current function;
     
    338338            Data.(Civ1_param{4+ilist})=Param.ActionInput.Civ1.(list_param{ilist});
    339339        end
    340         Data.ListGlobalAttribute=[Data.ListGlobalAttribute Civ1_param];
     340        Data.ListGlobalAttribute=[ListGlobalAttribute Civ1_param];
    341341        Data.CivStage=1;
    342342       
Note: See TracChangeset for help on using the changeset viewer.