Changeset 881 for trunk/src/series

Timestamp:

Mar 6, 2015, 9:10:16 PM (9 years ago)

Author:

sommeria

Message:

various bug fix

Location:

trunk/src/series

Files:

• aver_stat.m (modified) (1 diff)
• civ_input.m (modified) (4 diffs)
• time_series.m (modified) (2 diffs)

trunk/src/series/aver_stat.m

@@ -88 +88 @@
         if ismember(SeriesData.ProjObject.ProjMode,{'inside','outside'})
             answer=msgbox_uvmat('INPUT_TXT','set bin size for histograms (or keep ''auto'' by default)?','auto');
-            ParamOut.ActionInput.VarMesh=str2double(answer);
+            ParamOut.ActionInput.VarMesh=str2num(answer);
         end
     end

trunk/src/series/civ_input.m

@@ -332 +332 @@
 %% list the possible index pairs, depending on the option set in ListPairMode
 ListPairMode_Callback([], [], handles)
-ListPairCiv1_Callback(hObject, eventdata, handles)
+%ListPairCiv1_Callback(hObject, eventdata, handles)
 
 %% set the GUI to modal: wait for OK to close
@@ -875 +875 @@
 end
 nom_type_ima=CivInputData.NomTypeIma;
-initial=get(handles.ListPairCiv1,'Value');%previous choice of pair
-menu_pair=get(handles.ListPairCiv1,'String');%previous choice of pair.ListPairCiv1
-init_choice=menu_pair{initial};
+menu_pair=get(handles.ListPairCiv1,'String');%previous menu of ListPairCiv1
+PairCiv1Init=menu_pair{get(handles.ListPairCiv1,'Value')};%previous choice of pair
+menu_pair=get(handles.ListPairCiv2,'String');%previous menu of ListPairCiv1
+PairCiv2Init=menu_pair{get(handles.ListPairCiv2,'Value')};%previous choice of pair
 
 %% determine nom_type_nc, nomenclature type of the .nc files:
@@ -973 +974 @@
 
 %% determine the default selection in the pair menu for Civ1
-ichoice=find(select,1);% index of first selected pair
-if (isempty(ichoice) || ichoice < 1); ichoice=1; end;
-ichoice=find(strcmp(init_choice,displ_pair'),1);
+%ichoice=find(select,1);% index of first selected pair
+%if (isempty(ichoice) || ichoice < 1); ichoice=1; end;
+ichoice=find(strcmp(PairCiv1Init,displ_pair'),1);
 if ~isempty(ichoice)
     set(handles.ListPairCiv1,'Value',ichoice);% first valid pair proposed by default in the menu
@@ -987 +988 @@
 %% determine the default selection in the pair menu for Civ2
 if strcmp(get(handles.ListPairCiv2,'Visible'),'on')
-    initial=get(handles.ListPairCiv2,'Value');
-    if initial>length(displ_pair')%|~isequal(select(initial),1)
-        if ichoice <= length(displ_pair')
-            set(handles.ListPairCiv2,'Value',ichoice);% same pair proposed by default for civ2
-        else
-            set(handles.ListPairCiv2,'Value',1);% same pair proposed by default for civ2
-        end
-    end
+    ichoice=find(strcmp(PairCiv2Init,displ_pair'),1);
+    if ~isempty(ichoice)
+        set(handles.ListPairCiv2,'Value',ichoice);% first valid pair proposed by default in the menu
+    else
+        set(handles.ListPairCiv2,'Value',1)
+    end
+    
+    %
+    %     initial=get(handles.ListPairCiv2,'Value');
+    %
+    %
+    %     if initial>length(displ_pair')%|~isequal(select(initial),1)
+    %         if ichoice <= length(displ_pair')
+    %             set(handles.ListPairCiv2,'Value',ichoice);% same pair proposed by default for civ2
+    %         else
+    %             set(handles.ListPairCiv2,'Value',1);% same pair proposed by default for civ2
+    %         end
+    %     end
 else
     set(handles.ListPairCiv2,'Value',get(handles.ListPairCiv1,'Value'))% initiate the choice of Civ2 as a reproduction of if civ1

trunk/src/series/time_series.m

@@ -471 +471 @@
                 DataOut.([VarName 'Histo'])(index,ind_start:ind_start+MaxIndex_new-MinIndex_new)=...
                     DataOut.([VarName 'Histo'])(index,ind_start:ind_start+MaxIndex_new-MinIndex_new)+Field.([VarName 'Histo']);
-                VarVal=pdf2stat(Field.(VarName),Field.([VarName 'Histo']));% max of the current field
+                VarVal=pdf2stat((Field.(VarName))',(Field.([VarName 'Histo']))');% max of the current field
                 for istat=1:numel(VarVal)
                     DataOut.([VarName StatName{istat}])(index)=VarVal(istat);
@@ -506 +506 @@
         DataOut.Time(index,1)=time(index);%
     end
-    
+    index
     % record the number of missing input fields
     if ~isempty(errormsg)