Changeset 975


Ignore:
Timestamp:
Nov 23, 2016, 2:48:07 PM (4 years ago)
Author:
sommeria
Message:

various update

Location:
trunk/src
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/series.m

    r973 r975  
    15831583%             extra_oar='';
    15841584 %       else
    1585             answer=inputdlg({'Number of cores (max 36)','extra oar options'},'oarsub parameter',1,{'12',''});
     1585            answer=inputdlg({'Number of cores (max 36)','extra oar options'},'oarsub parameter',1,{'16',''});
    15861586            if isempty(answer)
    15871587                                errormsg='Action launch interrupted by user';
     
    36693669% --- Executes on button press in MonitorCluster.
    36703670function MonitorCluster_Callback(hObject, eventdata, handles)
    3671 web('https://www.legi.grenoble-inp.fr/servload/monika')
    3672 
    3673 
     3671web('https://www.legi.grenoble-inp.fr/servfill/monika')
    36743672
    36753673function OutputSubDir_Callback(hObject, eventdata, handles)
  • trunk/src/series/extract_multitif_parallel.m

    r972 r975  
    161161if Param.IndexRange.first_i==1% first slice of processing
    162162    firstindex=0;
    163     count=0;
     163   count=0;
     164%     count=3;
    164165else
    165166    firstindex=Param.IndexRange.first_i;
    166167    ImageName=fullfile(Param.InputTable{1,1},Param.InputTable{1,2},'im.tif');
    167168    NbFrames=numel(imfinfo(ImageName));
    168     count=Param.IndexRange.first_i*NbFrames;
     169   count=Param.IndexRange.first_i*NbFrames;
     170 %   count=Param.IndexRange.first_i*NbFrames+3;
    169171end
    170172for ifile=firstindex:Param.IndexRange.last_i
  • trunk/src/series/merge_proj.m

    r960 r975  
    296296        end
    297297        % get the time defined in the current file if not already defined from the xml file
    298         if ~isempty(time) && isfield(Data{iview},'Time')
     298        if isempty(time) && isfield(Data{iview},'Time')
    299299            timeread(iview)=Data{iview}.Time;
    300300        end
  • trunk/src/uvmat.m

    r972 r975  
    588588    FigName=get(ListFig(ilist),'name');
    589589    if isempty(FigName)
    590         FigName=['figure ' num2str(ListFig(ilist))];
     590        FigName=['figure ' num2str(get(ListFig(ilist),'number'))];
    591591    end
    592592    if ~strcmp(FigName,'uvmat')
     
    11751175%  raw 6 of the GUI
    11761176uicontrol('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],...
    1177     '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
     1177    '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
    11781178uicontrol('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],...
    1179     '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
     1179    '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
    11801180uicontrol('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],...
    1181     '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
     1181    '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
    11821182uicontrol('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],...
    1183     '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
     1183    '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
    11841184
    11851185%  raw 7 of the GUI: pushbuttons
Note: See TracChangeset for help on using the changeset viewer.