Changeset 876 for trunk/src/series/civ_input.m

Timestamp:

Feb 22, 2015, 11:07:07 PM (9 years ago)

Author:

sommeria

Message:

deformation modified in civ_series and bug corrections

File:

• trunk/src/series/civ_input.m (modified) (3 diffs)

trunk/src/series/civ_input.m

@@ -1860 +1860 @@
      end
      if isfield(Param,'OutputSubDir')
-     Param=rmfield(Param,'OutputSubDir'); %remove output file option from civ_series
+         Param=rmfield(Param,'OutputSubDir'); %remove output file option from civ_series
      end
      ParamPatch1=Param.ActionInput.Patch1; %store the patch1 parameters
      Param.ActionInput=rmfield(Param.ActionInput,'Patch1');% does not execute Patch
+     Param.IndexRange.first_i=str2num(get(handles.ref_i,'String'));
+     Param.IndexRange.last_i=Param.IndexRange.first_i;
+     if strcmp(get(handles.ref_j,'Visible'),'on')
+         Param.IndexRange.first_j=str2num(get(handles.ref_j,'String'));
+         Param.IndexRange.last_j=Param.IndexRange.first_j;
+     else
+         Param.IndexRange.first_j=1;
+         Param.IndexRange.last_j=1;
+     end
      [Data,errormsg]=civ_series(Param);% get the civ1+fix1 results
      bckcolor=get(handles.civ_input,'Color');
@@ -1938 +1947 @@
      set(handles.Fix1,'BackgroundColor',[1 1 0])
      set(handles.Patch1,'BackgroundColor',[1 1 0])
+     Param.IndexRange.first_i=str2num(get(handles.ref_i,'String'));
+     Param.IndexRange.last_i=Param.IndexRange.first_i;
+     if strcmp(get(handles.ref_j,'Visible'),'on')
+         Param.IndexRange.first_j=str2num(get(handles.ref_j,'String'));
+         Param.IndexRange.last_j=Param.IndexRange.first_j;
+     else
+         Param.IndexRange.first_j=1;
+         Param.IndexRange.last_j=1;
+     end
      [Data,errormsg]=civ_series(Param);% get the civ1+fix1 results
      
@@ -2031 +2049 @@
      ParamPatch2=Param.ActionInput.Patch2; %store the patch1 parameters
      Param.ActionInput=rmfield(Param.ActionInput,'Patch2');% does not execute Patch
+     Param.IndexRange.first_i=str2num(get(handles.ref_i,'String'));
+     Param.IndexRange.last_i=Param.IndexRange.first_i;
+     if strcmp(get(handles.ref_j,'Visible'),'on')
+         Param.IndexRange.first_j=str2num(get(handles.ref_j,'String'));
+         Param.IndexRange.last_j=Param.IndexRange.first_j;
+     else
+         Param.IndexRange.first_j=1;
+         Param.IndexRange.last_j=1;
+     end
      [Data,errormsg]=civ_series(Param);% get the civ1+fix1 results
      bckcolor=get(handles.civ_input,'Color');