Changeset 853


Ignore:
Timestamp:
Jan 21, 2015, 12:30:26 AM (6 years ago)
Author:
sommeria
Message:

bugs

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/fileparts_uvmat.m

    r809 r853  
    7676%% recursive test on FileName starting from the end
    7777% test whether FileName ends with a number or not
    78 r=regexp(FileName,'.*\D(?<num1>\d+)$','names');% \D = not a digit, \d =digit
     78r=regexp(FileName,'(?<num1>\d+)$','names');% \D = not a digit, \d =digit
    7979
    8080if ~isempty(r)% FileName end matches num1
    8181    num1=r.num1;
    82     r=regexp(FileName,['.*\D(?<num2>\d+)(?<delim1>[-_])' num1 '$'],'names');
     82    r=regexp(FileName,['(?<num2>\d+)(?<delim1>[-_])' num1 '$'],'names');
    8383    if ~isempty(r)% FileName end matches num2+delim1+num1
    8484        delim1=r.delim1;
  • trunk/src/series/civ_input.m

    r852 r853  
    519519    checkeven=(mod(ActionInput.Civ1.CorrBoxSize,2)==0);
    520520    ActionInput.Civ1.CorrBoxSize(checkeven)=ActionInput.Civ1.CorrBoxSize(checkeven)+1;% set correlation box sizes to odd values
    521     ActionInput.Civ1.SearchBoxSize=max(ActionInput.Civ1.SearchBoxSize,ActionInput.Civ1.CorrBoxSize+10);% insure that the search box size is large enough
     521    ActionInput.Civ1.SearchBoxSize=max(ActionInput.Civ1.SearchBoxSize,ActionInput.Civ1.CorrBoxSize+8);% insure that the search box size is large enough
    522522    checkeven=(mod(ActionInput.Civ1.SearchBoxSize,2)==0);
    523523    ActionInput.Civ1.SearchBoxSize(checkeven)=ActionInput.Civ1.SearchBoxSize(checkeven)+1;% set search box sizes to odd values
     
    526526    checkeven=(mod(ActionInput.Civ2.CorrBoxSize,2)==0);
    527527    ActionInput.Civ2.CorrBoxSize(checkeven)=ActionInput.Civ2.CorrBoxSize(checkeven)+1;% set correlation box sizes to odd values
    528     ActionInput.Civ2.SearchBoxSize=max(ActionInput.Civ2.SearchBoxSize,ActionInput.Civ2.CorrBoxSize+10);
     528    ActionInput.Civ2.SearchBoxSize=max(ActionInput.Civ2.SearchBoxSize,ActionInput.Civ2.CorrBoxSize+6);
    529529    checkeven=(mod(ActionInput.Civ2.SearchBoxSize,2)==0);
    530530    ActionInput.Civ2.SearchBoxSize(checkeven)=ActionInput.Civ2.SearchBoxSize(checkeven)+1;% set search box sizes to odd values
  • trunk/src/uvmat.m

    r851 r853  
    53305330ProjData= proj_field(UvData.Field,ObjectData);%project the current input field on object ObjectData
    53315331plot_field(ProjData,handles.PlotAxes,read_GUI(handles.uvmat));% plot the projected field;
     5332UvData.PlotAxes=ProjData;% store the plotted field for further update
    53325333%replot all the objects within the new projected field
    53335334for IndexObj=1:numel(list_str)
Note: See TracChangeset for help on using the changeset viewer.