Changeset 183 for trunk/src/set_object.m

Timestamp:

Jan 26, 2011, 5:03:40 PM (13 years ago)

Author:

sommeria

Message:

small bug repair: reading movies in read_fields, plotting rectangles and ellipes

File:

• trunk/src/set_object.m (modified) (10 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)
-% if ~exist('PlotHandles','var')
-%      PlotHandles=[];
-% end
 enable_plot=0;%default: does not allow plot of object and projection
-% SetData.PlotHandles=PlotHandles;
-% set(hObject,'UserData',SetData)
 
 % fill the interface as set in the input data:
@@ -99 +93 @@
     if isfield(data,'Name')
         set(handles.TITLE,'String',data.Name)
-%         set(hObject,'name',data.Name)
     end
     if ~isfield(data,'NbDim')||~isequal(data.NbDim,3)%2D case
@@ -125 +118 @@
     ObjectStyle_Callback(hObject, eventdata, handles)
     if isfield(data,'ProjMenu')
-        set(handles.ProjMode,'String',data.ProjMenu);
+        set(handles.ProjMode,'String',data.ProjMenu);%overset the standard menu
     end
     if isfield(data,'ProjMode')
@@ -244 +237 @@
         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
@@ -267 +253 @@
 end
 
+%------------------------------------------------------------------------
 % --- Outputs from this function are returned to the command line.
 function varargout = set_object_OutputFcn(hObject, eventdata, handles)
-% varargout  cell array for returning output args (see VARARGOUT);
-% hObject    handle to figure
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
+%------------------------------------------------------------------------
 % Get default command line output from handles structure
 varargout{1} = handles.output;
@@ -281 +264 @@
 % --- Executes on selection change in ObjectStyle.
 function ObjectStyle_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
 style_prev=get(handles.ObjectStyle,'UserData');%previous object style
 str=get(handles.ObjectStyle,'String');
@@ -286 +270 @@
 style=str{val};
 % make correspondance between different object styles
-% if ~isequal(str{val},style_prev)
 Xcolumn=get(handles.XObject,'String');
 Ycolumn=get(handles.YObject,'String');
@@ -333 +316 @@
      set(handles.ZObject,'String',z_new)
 end
-% end
+
 switch style
     case {'points','line','polyline','plane'}
@@ -542 +525 @@
      s.ProjMode='none';
  end
-%Display title
-% title=set_title(s.Style,s.ProjMode);%update the title
-% if ~isempty(huvmat)
-%     hhuvmat=guidata(huvmat);
-% end
-% menu=get(handles.TITLE,'String');
-% for iline=1:length(menu)
-%      if isequal(menu{iline},title)
-%          set(handles.TITLE,'Value',iline)
-%          break
-%      end
-% end
-%TITLE_Callback(hObject, eventdata, handles)
 teststyle=0;
 
@@ -585 +555 @@
 
 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,'XMax')
     set(handles.XMax,'String',s.XMax)