Changeset 534

Timestamp:

Aug 31, 2012, 4:20:32 PM (12 years ago)

Author:

sommeria

Message:

bugs repaired. color images

Location:

trunk/src

Files:

• mouse_down.m (modified) (2 diffs)
• nc2struct.m (modified) (1 diff)
• plot_object.m (modified) (1 diff)
• proj_field.m (modified) (1 diff)
• read_field.m (modified) (1 diff)
• uvmat.m (modified) (1 diff)

trunk/src/mouse_down.m

@@ -181 +181 @@
 
 %% delete the current zoom rectangle
-if isfield(AxeData,'CurrentRectZoom') && ishandle(AxeData.CurrentRectZoom)
+if isfield(AxeData,'CurrentRectZoom') && ~isempty(AxeData.CurrentRectZoom) && ishandle(AxeData.CurrentRectZoom)
     delete(AxeData.CurrentRectZoom)
     AxeData.CurrentRectZoom=[];
@@ -345 +345 @@
             ObjectName=ObjectNameNew;
             set(sethandles.Name,'String',ObjectName)% display the default name in set_object
+            if isempty(ListObject)
+                ListObject={ObjectName};
+            else
             ListObject{end}=ObjectName;
+            end
             set(hhuvmat.ListObject,'String',ListObject);%complement the object list
             set(hhuvmat.ListObject_1,'String',ListObject);%complement the object list

trunk/src/nc2struct.m

@@ -15 +15 @@
 %                  ListDimName=list of dimension (added information, not requested for field description)
 %                  DimValue= vlalues of dimensions (added information, not requested for field description)
+%         .Txt: error message
 %  var_detect: vector with same length as the cell array ListVarName, = 1 for each detected variable and 0 else.
 %            var_detect=[] in the absence of input cell array 

trunk/src/plot_object.m

@@ -41 +41 @@
 hh=[];%default output
 % object representation is canceled if the field is not projected on a plane or is the same as the represented object 
-if ~isfield(ObjectData,'Type')|| isequal(ProjObject,ObjectData)|| ~strcmp(ProjObject.Type,'plane')
+if ~isfield(ObjectData,'Type')|| isequal(ProjObject,ObjectData)||~isfield(ProjObject,'Type')|| ~strcmp(ProjObject.Type,'plane')
     if ~isempty(hplot) && ishandle(hplot) && ~strcmp(get(hplot,'Type'),'axes')
         ObjectPlotData=get(hplot,'UserData');

trunk/src/proj_field.m

@@ -1251 +1251 @@
                     return
                 else
-                    if numel(find(VarType.coord))==2% the third matrix dimension does not correspond to a space coordinate
+                    if numel(CellInfo{icell}.CoordIndex)==2% the third matrix dimension does not correspond to a space coordinate
                         nbcolor=DimValue(3);
                         DimValue(3)=[]; %number of 'color' components updated

trunk/src/read_field.m

@@ -85 +85 @@
         end
         [Field,var_detect,ichoice]=nc2struct(FileName,[ParamIn.Coord_x ParamIn.Coord_y ListVar]);
+        if isfield(Field,'Txt')
+            errormsg=Field.Txt;
+            return
+        end
         for ivar=1:numel(ListVar)
             Field.VarAttribute{ivar+2}.Role=Role{ivar};

trunk/src/uvmat.m

@@ -4459 +4459 @@
 set(handles.edit_object,'BackgroundColor',[0.7,0.7,0.7])  
 ListObject=get(handles.ListObject,'String');
+if isempty(ListObject)
+    ListObject={''};
+end
 if ~strcmp(ListObject{end},'')
     ListObject=[ListObject;{''}]; %append a blank to the list (if nort already done) to indicate the creation of a new object