Changeset 534


Ignore:
Timestamp:
Aug 31, 2012, 4:20:32 PM (8 years ago)
Author:
sommeria
Message:

bugs repaired. color images

Location:
trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/mouse_down.m

    r521 r534  
    181181
    182182%% delete the current zoom rectangle
    183 if isfield(AxeData,'CurrentRectZoom') && ishandle(AxeData.CurrentRectZoom)
     183if isfield(AxeData,'CurrentRectZoom') && ~isempty(AxeData.CurrentRectZoom) && ishandle(AxeData.CurrentRectZoom)
    184184    delete(AxeData.CurrentRectZoom)
    185185    AxeData.CurrentRectZoom=[];
     
    345345            ObjectName=ObjectNameNew;
    346346            set(sethandles.Name,'String',ObjectName)% display the default name in set_object
     347            if isempty(ListObject)
     348                ListObject={ObjectName};
     349            else
    347350            ListObject{end}=ObjectName;
     351            end
    348352            set(hhuvmat.ListObject,'String',ListObject);%complement the object list
    349353            set(hhuvmat.ListObject_1,'String',ListObject);%complement the object list
  • trunk/src/nc2struct.m

    r527 r534  
    1515%                  ListDimName=list of dimension (added information, not requested for field description)
    1616%                  DimValue= vlalues of dimensions (added information, not requested for field description)
     17%         .Txt: error message
    1718%  var_detect: vector with same length as the cell array ListVarName, = 1 for each detected variable and 0 else.
    1819%            var_detect=[] in the absence of input cell array
  • trunk/src/plot_object.m

    r432 r534  
    4141hh=[];%default output
    4242% object representation is canceled if the field is not projected on a plane or is the same as the represented object
    43 if ~isfield(ObjectData,'Type')|| isequal(ProjObject,ObjectData)|| ~strcmp(ProjObject.Type,'plane')
     43if ~isfield(ObjectData,'Type')|| isequal(ProjObject,ObjectData)||~isfield(ProjObject,'Type')|| ~strcmp(ProjObject.Type,'plane')
    4444    if ~isempty(hplot) && ishandle(hplot) && ~strcmp(get(hplot,'Type'),'axes')
    4545        ObjectPlotData=get(hplot,'UserData');
  • trunk/src/proj_field.m

    r533 r534  
    12511251                    return
    12521252                else
    1253                     if numel(find(VarType.coord))==2% the third matrix dimension does not correspond to a space coordinate
     1253                    if numel(CellInfo{icell}.CoordIndex)==2% the third matrix dimension does not correspond to a space coordinate
    12541254                        nbcolor=DimValue(3);
    12551255                        DimValue(3)=[]; %number of 'color' components updated
  • trunk/src/read_field.m

    r527 r534  
    8585        end
    8686        [Field,var_detect,ichoice]=nc2struct(FileName,[ParamIn.Coord_x ParamIn.Coord_y ListVar]);
     87        if isfield(Field,'Txt')
     88            errormsg=Field.Txt;
     89            return
     90        end
    8791        for ivar=1:numel(ListVar)
    8892            Field.VarAttribute{ivar+2}.Role=Role{ivar};
  • trunk/src/uvmat.m

    r530 r534  
    44594459set(handles.edit_object,'BackgroundColor',[0.7,0.7,0.7]) 
    44604460ListObject=get(handles.ListObject,'String');
     4461if isempty(ListObject)
     4462    ListObject={''};
     4463end
    44614464if ~strcmp(ListObject{end},'')
    44624465    ListObject=[ListObject;{''}]; %append a blank to the list (if nort already done) to indicate the creation of a new object
Note: See TracChangeset for help on using the changeset viewer.