Changeset 853 for trunk

Timestamp:

Jan 21, 2015, 12:30:26 AM (10 years ago)

Author:

sommeria

Message:

bugs

Location:

trunk/src

Files:

• fileparts_uvmat.m (modified) (1 diff)
• series/civ_input.m (modified) (2 diffs)
• uvmat.m (modified) (1 diff)

trunk/src/fileparts_uvmat.m

@@ -76 +76 @@
 %% recursive test on FileName starting from the end
 % test whether FileName ends with a number or not
-r=regexp(FileName,'.*\D(?<num1>\d+)$','names');% \D = not a digit, \d =digit
+r=regexp(FileName,'(?<num1>\d+)$','names');% \D = not a digit, \d =digit
 
 if ~isempty(r)% FileName end matches num1
     num1=r.num1;
-    r=regexp(FileName,['.*\D(?<num2>\d+)(?<delim1>[-_])' num1 '$'],'names');
+    r=regexp(FileName,['(?<num2>\d+)(?<delim1>[-_])' num1 '$'],'names');
     if ~isempty(r)% FileName end matches num2+delim1+num1
         delim1=r.delim1;

trunk/src/series/civ_input.m

@@ -519 +519 @@
     checkeven=(mod(ActionInput.Civ1.CorrBoxSize,2)==0);
     ActionInput.Civ1.CorrBoxSize(checkeven)=ActionInput.Civ1.CorrBoxSize(checkeven)+1;% set correlation box sizes to odd values
-    ActionInput.Civ1.SearchBoxSize=max(ActionInput.Civ1.SearchBoxSize,ActionInput.Civ1.CorrBoxSize+10);% insure that the search box size is large enough
+    ActionInput.Civ1.SearchBoxSize=max(ActionInput.Civ1.SearchBoxSize,ActionInput.Civ1.CorrBoxSize+8);% insure that the search box size is large enough
     checkeven=(mod(ActionInput.Civ1.SearchBoxSize,2)==0);
     ActionInput.Civ1.SearchBoxSize(checkeven)=ActionInput.Civ1.SearchBoxSize(checkeven)+1;% set search box sizes to odd values
@@ -526 +526 @@
     checkeven=(mod(ActionInput.Civ2.CorrBoxSize,2)==0);
     ActionInput.Civ2.CorrBoxSize(checkeven)=ActionInput.Civ2.CorrBoxSize(checkeven)+1;% set correlation box sizes to odd values
-    ActionInput.Civ2.SearchBoxSize=max(ActionInput.Civ2.SearchBoxSize,ActionInput.Civ2.CorrBoxSize+10);
+    ActionInput.Civ2.SearchBoxSize=max(ActionInput.Civ2.SearchBoxSize,ActionInput.Civ2.CorrBoxSize+6);
     checkeven=(mod(ActionInput.Civ2.SearchBoxSize,2)==0);
     ActionInput.Civ2.SearchBoxSize(checkeven)=ActionInput.Civ2.SearchBoxSize(checkeven)+1;% set search box sizes to odd values

trunk/src/uvmat.m

@@ -5330 +5330 @@
 ProjData= proj_field(UvData.Field,ObjectData);%project the current input field on object ObjectData
 plot_field(ProjData,handles.PlotAxes,read_GUI(handles.uvmat));% plot the projected field;
+UvData.PlotAxes=ProjData;% store the plotted field for further update
 %replot all the objects within the new projected field
 for IndexObj=1:numel(list_str)