Changeset 158 for trunk/src/set_object.m

Timestamp:

Dec 22, 2010, 5:12:31 PM (13 years ago)

Author:

sommeria

Message:

CoordType? not used, replaced by CoordUnit?
bug repair in check_field_structure

File:

• trunk/src/set_object.m (modified) (4 diffs)

trunk/src/set_object.m

@@ -84 +84 @@
 end
 set(hObject,'KeyPressFcn',{'keyboard_callback',handles})%set keyboard action function (allow action on uvmat when set_object is in front)
-set(handles.MenuCoord,'ListboxTop',1)
+%set(handles.MenuCoord,'ListboxTop',1)
 % if ~exist('PlotHandles','var')
 %      PlotHandles=[];
@@ -241 +241 @@
         set(handles.DZ,'String',data.DZ)
     end
-    if isfield(data,'CoordType')&& isequal(data.CoordType,'px')
-%         if isequal(data.CoordType,'phys')
-%             set(handles.MenuCoord,'Value',1)
-%         elseif isequal(data.CoordType,'px')
-             set(handles.MenuCoord,'Value',2)
-%         end
-    end
+    if isfield(data,'CoordUnit')
+        set(handles.CoordUnit,'String',data.CoordUnit)
+    end
+%     if isfield(data,'CoordType')&& isequal(data.CoordType,'px')
+% %         if isequal(data.CoordType,'phys')
+% %             set(handles.MenuCoord,'Value',1)
+% %         elseif isequal(data.CoordType,'px')
+%              set(handles.MenuCoord,'Value',2)
+% %         end
+%     end
 end
 if enable_plot
@@ -582 +585 @@
 
 ProjMode_Callback(hObject, eventdata, handles);%visualize the appropriate edit boxes
-if isfield(s,'CoordType')
-    if isequal(s.CoordType,'phys')
-        set(handles.MenuCoord,'Value',1)
-    elseif isequal(s.CoordType,'px')
-        set(handles.MenuCoord,'Value',2)
-    else
-        warndlg('unknown CoordType (px or phys) in set_object.m')
-    end
-end
+% if isfield(s,'CoordType')
+%     if isequal(s.CoordType,'phys')
+%         set(handles.MenuCoord,'Value',1)
+%     elseif isequal(s.CoordType,'px')
+%         set(handles.MenuCoord,'Value',2)
+%     else
+%         warndlg('unknown CoordType (px or phys) in set_object.m')
+%     end
+% end
 if isfield(s,'XMax')
     set(handles.XMax,'String',s.XMax)
@@ -873 +876 @@
 ObjectName=get(handles.TITLE,'String');
 if ~isempty(ObjectName)&&~strcmp(ObjectName,'')
-    def={fullfile(dir_save,[ObjectName Object.CoordType '.xml'])};
+    def={fullfile(dir_save,[ObjectName '.xml'])};
 else
-    def={fullfile(dir_save,[Object.Style Object.CoordType '.xml'])};
+    def={fullfile(dir_save,[Object.Style '.xml'])};
 end
 options.Resize='on';