Changeset 975

Timestamp:

Nov 23, 2016, 2:48:07 PM (8 years ago)

Author:

sommeria

Message:

various update

Location:

trunk/src

Files:

• series.m (modified) (2 diffs)
• series/extract_multitif_parallel.m (modified) (1 diff)
• series/get_times_rdvision.m (added)
• series/merge_proj.m (modified) (1 diff)
• uvmat.m (modified) (2 diffs)

trunk/src/series.m

@@ -1583 +1583 @@
 %             extra_oar='';
  %       else
-            answer=inputdlg({'Number of cores (max 36)','extra oar options'},'oarsub parameter',1,{'12',''});
+            answer=inputdlg({'Number of cores (max 36)','extra oar options'},'oarsub parameter',1,{'16',''});
             if isempty(answer)
                                 errormsg='Action launch interrupted by user';
@@ -3669 +3669 @@
 % --- Executes on button press in MonitorCluster.
 function MonitorCluster_Callback(hObject, eventdata, handles)
-web('https://www.legi.grenoble-inp.fr/servload/monika')
-
-
+web('https://www.legi.grenoble-inp.fr/servfill/monika')
 
 function OutputSubDir_Callback(hObject, eventdata, handles)

trunk/src/series/extract_multitif_parallel.m

@@ -161 +161 @@
 if Param.IndexRange.first_i==1% first slice of processing
     firstindex=0;
-    count=0;
+   count=0;
+%     count=3;
 else
     firstindex=Param.IndexRange.first_i;
     ImageName=fullfile(Param.InputTable{1,1},Param.InputTable{1,2},'im.tif');
     NbFrames=numel(imfinfo(ImageName));
-    count=Param.IndexRange.first_i*NbFrames;
+   count=Param.IndexRange.first_i*NbFrames;
+ %   count=Param.IndexRange.first_i*NbFrames+3;
 end
 for ifile=firstindex:Param.IndexRange.last_i

trunk/src/series/merge_proj.m

@@ -296 +296 @@
         end
         % get the time defined in the current file if not already defined from the xml file
-        if ~isempty(time) && isfield(Data{iview},'Time')
+        if isempty(time) && isfield(Data{iview},'Time')
             timeread(iview)=Data{iview}.Time;
         end

trunk/src/uvmat.m

@@ -588 +588 @@
     FigName=get(ListFig(ilist),'name');
     if isempty(FigName)
-        FigName=['figure ' num2str(ListFig(ilist))];
+        FigName=['figure ' num2str(get(ListFig(ilist),'number'))];
     end
     if ~strcmp(FigName,'uvmat')
@@ -1175 +1175 @@
 %  raw 6 of the GUI
 uicontrol('Style','edit','Units','normalized', 'Position', [3*ii+2*ww 0.95-5*ii-4.2*hh ww hh],'tag','num_SliceAngle_1_1','BackgroundColor',[1 1 1],...
-    'String',num2str(SliceAngle(1)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceAngle_1_1'':first slice angle of inclination around the x axis');%edit box
+    'String',num2str(SliceAngle(1,1)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceAngle_1_1'':first slice angle of inclination around the x axis');%edit box
 uicontrol('Style','edit','Units','normalized', 'Position', [4*ii+3*ww 0.95-5*ii-4.2*hh ww hh],'tag','num_SliceAngle_1_2','BackgroundColor',[1 1 1],...
-    'String',num2str(SliceAngle(1)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceAngle_1_2'':last slice angle of inclination around the x axis');%edit box
+    'String',num2str(SliceAngle(end,1)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceAngle_1_2'':last slice angle of inclination around the x axis');%edit box
 uicontrol('Style','edit','Units','normalized', 'Position', [3*ii+2*ww 0.95-6*ii-5.2*hh ww hh],'tag','num_SliceAngle_2_1','BackgroundColor',[1 1 1],...
-    'String',num2str(SliceAngle(2)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceAngle_2_1'':first slice angle of inclination around the y axis');%edit box
+    'String',num2str(SliceAngle(1,2)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceAngle_2_1'':first slice angle of inclination around the y axis');%edit box
 uicontrol('Style','edit','Units','normalized', 'Position', [4*ii+3*ww 0.95-6*ii-5.2*hh ww hh],'tag','num_SliceAngle_2_2','BackgroundColor',[1 1 1],...
-    'String',num2str(SliceAngle(2)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceAngle_2_2'':last slice angle of inclination around the y axis');%edit box
+    'String',num2str(SliceAngle(end,2)),'FontUnits','points','FontSize',12,'FontWeight','bold','TooltipString','''num_SliceAngle_2_2'':last slice angle of inclination around the y axis');%edit box
 
 %  raw 7 of the GUI: pushbuttons