Changeset 497 for trunk/src/uvmat.m


Ignore:
Timestamp:
Jul 21, 2012, 11:15:52 PM (9 years ago)
Author:
sommeria
Message:

cleaning and small bug repair.
pb of histogram for filter data solved
display of uicontrol by right mouse selection improved

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/uvmat.m

    r496 r497  
    936936        if isfield(XmlData, 'GeometryCalib') && ~isempty(XmlData.GeometryCalib)
    937937            if isfield(XmlData.GeometryCalib,'VolumeScan') && isequal(XmlData.GeometryCalib.VolumeScan,'y')
    938                 set (handles.nb_slice,'String','volume')
     938                set (handles.num_NbSlice,'String','volume')
    939939            end
    940940            hgeometry_calib=findobj('tag','geometry_calib');
     
    10161016           end
    10171017           if isfield(GeometryCalib,'VolumeScan') && isequal(GeometryCalib.VolumeScan,'y')
    1018                set(handles.nb_slice,'String','volume')
     1018               set(handles.num_NbSlice,'String','volume')
    10191019           else
    1020                set(handles.nb_slice,'String',num2str(NbSlice))
     1020               set(handles.num_NbSlice,'String',num2str(NbSlice))
    10211021           end
    10221022           slices_Callback([],[], handles)
     
    12291229if get(handles.slices,'Value')==1
    12301230    set(handles.slices,'BackgroundColor',[1 1 0])
    1231     set(handles.nb_slice,'Visible','on')
     1231    set(handles.num_NbSlice,'Visible','on')
    12321232    set(handles.z_text,'Visible','on')
    12331233    set(handles.z_index,'Visible','on')
    1234     nb_slice_Callback(hObject, eventdata, handles)
     1234    num_NbSlice_Callback(hObject, eventdata, handles)
    12351235else
    1236     set(handles.nb_slice,'Visible','off')
     1236    set(handles.num_NbSlice,'Visible','off')
    12371237    set(handles.slices,'BackgroundColor',[0.7 0.7 0.7])
    12381238    set(handles.z_text,'Visible','off')
     
    12431243
    12441244%------------------------------------------------------------------------
    1245 function nb_slice_Callback(hObject, eventdata, handles)
    1246 %------------------------------------------------------------------------
    1247 nb_slice_str=get(handles.nb_slice,'String');
     1245function num_NbSlice_Callback(hObject, eventdata, handles)
     1246%------------------------------------------------------------------------
     1247nb_slice_str=get(handles.num_NbSlice,'String');
    12481248if isequal(nb_slice_str,'volume')
    12491249    num=stra2num(get(handles.j1,'String'));
     
    12521252else
    12531253    num=str2double(get(handles.i1,'String'));
    1254     nbslice=str2double(get(handles.nb_slice,'String'));
     1254    nbslice=str2double(get(handles.num_NbSlice,'String'));
    12551255end
    12561256z=mod(num-1,nbslice)+1;
     
    13261326            mdetect=exist(maskname,'file');
    13271327            if mdetect
    1328                 set(handles.nb_slice,'String',Name(i+1:ind_mask-1));
    1329                 set(handles.nb_slice,'BackgroundColor',[1 1 0])
     1328                set(handles.num_NbSlice,'String',Name(i+1:ind_mask-1));
     1329                set(handles.num_NbSlice,'BackgroundColor',[1 1 0])
    13301330                set(handles.CheckMask,'UserData',Mask);
    13311331                set(handles.CheckMask,'BackgroundColor',[1 1 0])
     
    14121412        Mask.CoordUnit='pixel';
    14131413        if isequal(get(handles.slices,'Value'),1)
    1414            NbSlice=str2num(get(handles.nb_slice,'String'));
     1414           NbSlice=str2num(get(handles.num_NbSlice,'String'));
    14151415           num_i1=str2num(get(handles.i1,'String'));
    14161416           Mask.ZIndex=mod(num_i1-1,NbSlice)+1;
     
    18421842Field_b.AY=Field_a.AY;
    18431843% z index
    1844 nbslice=str2double(get(handles.nb_slice,'String'));
     1844nbslice=str2double(get(handles.num_NbSlice,'String'));
    18451845if ~isempty(nbslice)
    18461846    Field_b.ZIndex=mod(num_i2-1,nbslice)+1;
     
    19871987% NomType=get(handles.FileIndex,'UserData');
    19881988%update the z position index
    1989 nbslice_str=get(handles.nb_slice,'String');
     1989nbslice_str=get(handles.num_NbSlice,'String');
    19901990if isequal(nbslice_str,'volume')%NOT USED
    19911991    z_index=num_j1;
     
    23902390        {'nb_tps','nb_coord','nb_subdomain'},{'nb_tps','nb_subdomain'},{'nb_tps','nb_subdomain'}}];
    23912391    Field{1}.VarAttribute{nbvar+3}.Role='coord_tps';
    2392     Field{1}.VarAttribute{nbvar+4}.Role='vector_x';
    2393     Field{1}.VarAttribute{nbvar+5}.Role='vector_y';
     2392    Field{1}.VarAttribute{nbvar+4}.Role='vector_x_tps';
     2393    Field{1}.VarAttribute{nbvar+5}.Role='vector_y_tps';
    23942394    if isfield(Field{1},'ListDimName')%cleaning
    23952395        Field{1}=rmfield(Field{1},'ListDimName');
     
    48804880    web(helpfile);
    48814881end
     4882
Note: See TracChangeset for help on using the changeset viewer.