Changeset 880 for trunk/src/series.m

Timestamp:

Mar 4, 2015, 12:01:38 AM (9 years ago)

Author:

sommeria

Message:

various bug fixes

File:

• trunk/src/series.m (modified) (9 diffs)

trunk/src/series.m

@@ -140 +140 @@
     ActionExtList={'.m';'.sh';'.py (in dev.)'};% default choice of extensions (Matlab fct .m or compiled version .sh
 else
-    ActionExtList={'.m';'.sh'};
-    disp('python library not installed')
+    ActionExtList={'.m';'.sh'};  % python options not installed
 end
 ActionPathList=cell(NbBuiltinAction,1);%initiate the cell matrix of Action fct paths
@@ -149 +148 @@
 if isequal(s,0)
     RunModeList=[RunModeList;{'cluster_oar'}];
+    set(handles.MonitorCluster,'Visible','on'); % make visible button for access to Monika
 end
 [s,w]=system('qstat');% look for cluster system 'sge'
@@ -596 +596 @@
 function InputTable_KeyPressFcn(hObject, eventdata, handles)
 set(handles.REFRESH,'BackgroundColor',[1 0 1])% set REFRESH button to magenta color to indicate that input refresh is needed
+set(handles.OutputSubDir,'BackgroundColor',[1 0 1])% set edit box OutputSubDir to magenta color to indicate that refresh may be needed
 xx=double(get(handles.series,'CurrentCharacter')); %get the keyboard character
 if ~isempty(xx)
@@ -1500 +1501 @@
             compile(ActionName,TransformPath)
             cd(currentdir)
+        else
+            errormsg='Action launch interrupted';
+            return
         end       
     else
@@ -1530 +1534 @@
         if strcmp(ActionExt,'.m')% case of Matlab function (uncompiled)
             NbCore=1;% one core used only (limitation of Matlab licences)
-            msgbox_uvmat('WARNING','Number of cores =1: select the compiled version .sh for multi-core processing');
+            answer=msgbox_uvmat('INPUT_Y-N','Number of cores =1: select the compiled version .sh for multi-core processing. Proceed with the .m version?');
+            if ~strcmp(answer,'Yes')
+                errormsg='Action launch interrupted';
+                return
+            end
             extra_oar='';
         else
@@ -1558 +1566 @@
         answer=msgbox_uvmat('INPUT_Y-N-Cancel',['use existing ouput directory: ' fullfile(Param.InputTable{1,1},SubDirOutNew) ', possibly delete previous data']);
         if strcmp(answer,'Cancel')
-            set(handles.RUN,'backgroundcolor',[1 0 0])
             return
         elseif strcmp(answer,'Yes')
@@ -3298 +3305 @@
     'Callback',@(hObject,eventdata)num_ref_j_Callback(hObject,eventdata),'String',num2str(ref_j),'FontUnits','points','FontSize',12,'FontWeight','bold',...
     'Tag','num_ref_j','TooltipString','''num_ref_j'': reference field index i used to display dt in ''list_pair_civ''');
+uicontrol('Style','pushbutton','Units','normalized', 'Position', [0.01 0.01 0.3 0.12],'BackgroundColor',[0 1 0],...
+    'Callback',@(hObject,eventdata)OK_Callback(hObject,eventdata),'String','OK','FontUnits','points','FontSize',12,'FontWeight','bold',...
+    'Tag','OK','TooltipString','''OK'': validate the choice');
 %  last raw  of the GUI: pushbuttons
 % uicontrol('Style','pushbutton','Units','normalized', 'Position', [0.35 0.01 0.3 0.15],'BackgroundColor',[0 1 0],'String','OK','Callback',@(hObject,eventdata)OK_Callback(hObject,eventdata),...
@@ -3387 +3397 @@
 
 %------------------------------------------------------------------------
+function OK_Callback(hObject, eventdata)
+%------------------------------------------------------------------------
+delete(get(hObject,'parent'))
+
+
+%------------------------------------------------------------------------
 % --- Executes on button press in ClearLine.
 %------------------------------------------------------------------------
@@ -3396 +3412 @@
     set(handles.InputTable,'Data',InputTable);
 end
+
+
+% --- Executes on button press in MonitorCluster.
+function MonitorCluster_Callback(hObject, eventdata, handles)
+web('https://www.legi.grenoble-inp.fr/servload/monika')
+
+
+
+function OutputSubDir_Callback(hObject, eventdata, handles)
+set(handles.OutputSubDir,'BackgroundColor',[1 1 1])
+% hObject    handle to OutputSubDir (see GCBO)
+% eventdata  reserved - to be defined in a future version of MATLAB
+% handles    structure with handles and user data (see GUIDATA)
+
+% Hints: get(hObject,'String') returns contents of OutputSubDir as text
+%        str2double(get(hObject,'String')) returns contents of OutputSubDir as a double