Changeset 763
 Timestamp:
 May 1, 2014, 10:12:07 AM (9 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/src/series/civ_series.m
r761 r763 40 40 function [Data,errormsg,result_conv]= civ_series(Param) 41 41 errormsg=''; 42 path_series=fileparts(which('series')); 43 addpath(fullfile(path_series,'series')) 42 44 43 %% set the input elements needed on the GUI series when the action is selected in the menu ActionName or InputTable refreshed 45 44 if isstruct(Param) && isequal(Param.Action.RUN,0)% function activated from the GUI series but not RUN 45 path_series=fileparts(which('series')); 46 addpath(fullfile(path_series,'series')) 46 47 Data=civ_input(Param);% introduce the civ parameters using the GUI civ_input 47 48 if isempty(Data) … … 91 92 MaxIndex_i=Param.IndexRange.MaxIndex_i; 92 93 MinIndex_i=Param.IndexRange.MinIndex_i; 93 MaxIndex_j= 1;MinIndex_j=1;94 MaxIndex_j=ones(size(MaxIndex_i));MinIndex_j=ones(size(MinIndex_i)); 94 95 if isfield(Param.IndexRange,'MaxIndex_j')&& isfield(Param.IndexRange,'MinIndex_j') 95 96 MaxIndex_j=Param.IndexRange.MaxIndex_j; … … 137 138 if ~isempty(PairCiv2) 138 139 [i1_series_Civ2,i2_series_Civ2,j1_series_Civ2,j2_series_Civ2,check_bounds_Civ2]=... 139 find_pair_indices(PairCiv2,i1_series{1},j1_series{1},MinIndex_i ,MaxIndex_i,MinIndex_j,MaxIndex_j);140 find_pair_indices(PairCiv2,i1_series{1},j1_series{1},MinIndex_i(1),MaxIndex_i(1),MinIndex_j(1),MaxIndex_j(1)); 140 141 check_bounds=check_bounds  check_bounds_Civ2; 141 142 end … … 148 149 if ~isempty(PairCiv2) 149 150 [i1_series_Civ2,i2_series_Civ2,j1_series_Civ2,j2_series_Civ2,check_bounds,NomTypeNc]=... 150 find_pair_indices(PairCiv2,i1_series{2},j1_series{2},MinIndex_i ,MaxIndex_i,MinIndex_j,MaxIndex_j);151 find_pair_indices(PairCiv2,i1_series{2},j1_series{2},MinIndex_i(2),MaxIndex_i(2),MinIndex_j(2),MaxIndex_j(2)); 151 152 % check_bounds=check_bounds  check_bounds_Civ2; 152 153 end
Note: See TracChangeset
for help on using the changeset viewer.