Changeset 850 for trunk

Timestamp:

Jan 16, 2015, 11:32:34 AM (10 years ago)

Author:

sommeria

Message:

add command clear line on set-object

Location:

trunk/src

Files:

• series/civ_input.fig (modified) (previous)
• series/civ_input.m (modified) (2 diffs)
• set_object.fig (modified) (previous)
• set_object.m (modified) (5 diffs)

trunk/src/series/civ_input.m

@@ -2103 +2103 @@
  par_civ1.FrameIndexB=num2str(i2);
  par_civ1.ImageName_B=ImageName_B;
- 
-
-% handles    structure with handles and user data (see GUIDATA)
-
 
 % --- Executes on button press in InportParam.
@@ -2148 +2144 @@
         return
     end
-%     Param=rmfield(Param,'InputTable');% do not refresh Input files and index range
-%     Param=rmfield(Param,'IndexRange');  
-%     fill_GUI(Param,handles.civ_input)% fill the elements of the GUI series with the input parameters
-% %     SeriesData=get(h,'UserData');
-%     if isfield(Param,'InputFields')
-%         ListField=Param.InputFields.FieldName;
-%         set(handles.FieldName,'String',[ListField;{'get-field...'}])
-%          set(handles.FieldName,'Value',1:numel(ListField))
-%     end       
-%     if isfield(Param,'ActionInput')%  introduce  parameters specific to an Action fct, for instance PIV parameters
-%         set(handles.ActionInput,'Visible','on')
-%         set(handles.ActionInput,'Value',0)
-%         Param.ActionInput.ConfigSource=filexml;% record the source of config for future info
-%         SeriesData.ActionInput=Param.ActionInput;
-%     end
-%     if isfield(Param,'ProjObject') %introduce projection object if relevant
-%         SeriesData.ProjObject=Param.ProjObject;
-%     end
-%     set(handles.series,'UserData',SeriesData)
-%     if isfield(Param,'CheckObject') && isequal(Param.CheckObject,1)
-%         set(handles.ProjObject,'String',Param.ProjObject.Name)
-%         set(handles.ViewObject,'Visible','on')
-%         set(handles.EditObject,'Visible','on')
-%         set(handles.DeleteObject,'Visible','on')
-%     else     
-%         set(handles.ProjObject,'String','')
-%         set(handles.ProjObject,'Visible','off')
-%         set(handles.ViewObject,'Visible','off')
-%         set(handles.EditObject,'Visible','off')
-%         set(handles.DeleteObject,'Visible','off')     
-%     end     
-%     set(handles.REFRESH,'BackgroundColor',[1 0 1]); %paint REFRESH button in magenta to indicate that it should be activated
-end
-
-
-% --- Executes on selection change in popupmenu11.
-function popupmenu11_Callback(hObject, eventdata, handles)
-% hObject    handle to popupmenu11 (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hints: contents = cellstr(get(hObject,'String')) returns popupmenu11 contents as cell array
-%        contents{get(hObject,'Value')} returns selected item from popupmenu11
-
-
-% --- Executes during object creation, after setting all properties.
-function popupmenu11_CreateFcn(hObject, eventdata, handles)
-% hObject    handle to popupmenu11 (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    empty - handles not created until after all CreateFcns called
-
-% Hint: popupmenu controls usually have a white background on Windows.
-%       See ISPC and COMPUTER.
-if ispc && isequal(get(hObject,'BackgroundColor'), get(0,'defaultUicontrolBackgroundColor'))
-    set(hObject,'BackgroundColor','white');
-end
+end
+
+
+% --- Executes on selection change in iterate.
+function iterate_Callback(hObject, eventdata, handles)
+

trunk/src/set_object.m

@@ -38 +38 @@
 function varargout = set_object(varargin)
 
-% Last Modified by GUIDE v2.5 08-May-2014 23:03:29
+% Last Modified by GUIDE v2.5 16-Jan-2015 11:03:00
 
 % Begin initialization code - DO NOT REFRESH
@@ -593 +593 @@
 
 set(handles.REFRESH,'BackgroundColor',[1 0 0])
-%set(handles.Coord,'BackgroundColor',[1 1 1])
 set(handles.num_RangeY_2,'BackgroundColor',[1 1 1])
 
@@ -715 +714 @@
 %------------------------------------------------------------------------
 web('http://servforge.legi.grenoble-inp.fr/projects/soft-uvmat/wiki/UvmatHelp#ProjObject')
-% path_to_uvmat=which ('uvmat');% check the path of uvmat
-% pathelp=fileparts(path_to_uvmat);
-% helpfile=fullfile(pathelp,'uvmat_doc','uvmat_doc.html');
-% if ~isempty(dir(helpfile)), msgbox_uvmat('ERROR','Please put the help file uvmat_doc.html in the sub-directory /uvmat_doc of the UVMAT package')
-%     addpath (fullfile(pathelp,'uvmat_doc'))
-%     web([helpfile '#set_object']) 
-% end
-%------------------------------------------------------------------------
-
-function Name_Callback(hObject, eventdata, handles)
-% hObject    handle to Name (see GCBO)
-% eventdata  reserved - to be defined in a future version of MATLAB
-% handles    structure with handles and user data (see GUIDATA)
-
-% Hints: get(hObject,'String') returns contents of Name as text
-%        str2double(get(hObject,'String')) returns contents of Name as a double
-
-%------------------------------------------------------------------------
-% --- Executes when entered data in editable cell(s) in Coord.
-function Coord_CellEditCallback(hObject, eventdata, handles)
-%------------------------------------------------------------------------
-%set(handles.Coord,'BackgroundColor',[1 1 0])
-% ListType=get(handles.Type,'String');
-% Type=ListType{get(handles.Type,'Value')};
-% switch Type
-%     % add lines if multi line input needed
-%     case{'points','polyline','polygon'}
-%         Input=str2num(eventdata.EditData);%pasted input
-%         Coord=get(handles.Coord,'Data');
-%         iline=eventdata.Indices(1);% selected line number
-%         if size(Coord,1)<iline+numel(Input)
-%             Coord=[Coord ; zeros(iline+numel(Input)-size(Coord,1),size(Coord,2))];% append zeros to fit the new column
-%         end
-%         Coord(iline:iline+numel(Input)-1,eventdata.Indices(2))=Input';
-%         set(handles.Coord,'Data',Coord)
-% end
-%------------------------------------------------------------------------
+
+%------------------------------------------------------------------------ 
 % --- Executes when selected cell(s) is changed in ListCoord.
-%------------------------------------------------------------------------
+%------------------------------------------------------------------------ 
 function Coord_CellSelectionCallback(hObject, eventdata, handles)
-
 if ~isempty(eventdata.Indices)
     iline=eventdata.Indices(1);% selected line number
-    set(handles.Coord,'UserData',iline)% used possibly for line deletion or table extension, using key_press_fcn
+    set(handles.CoordLine,'String',num2str(iline))
 end
 
@@ -785 +748 @@
 if ismember(xx,[127 31])% delete, or downward
     Coord=get(handles.Coord,'Data');
-    iline=get(handles.Coord,'UserData');
+    iline=str2double(get(handles.CoordLine,'String'));
             if isequal(xx, 31)
                 if isequal(iline,size(Coord,1))% arrow downward
@@ -795 +758 @@
     set(handles.Coord,'Data',Coord);
 end
+
+%------------------------------------------------------------------------
+% --- Executes on button press in clear_line.
+%------------------------------------------------------------------------
+function clear_line_Callback(hObject, eventdata, handles)
+
+Coord=get(handles.Coord,'Data');
+iline=str2double(get(handles.CoordLine,'String'));
+if isempty(iline)
+    msgbox_uvmat('WARNING','no line suppressed, select a line in the table')
+else
+    Coord(iline,:)=[];
+    set(handles.REFRESH,'BackgroundColor',[1 0 1])
+    set(handles.Coord,'Data',Coord);
+    set(handles.CoordLine,'String','')
+    REFRESH_Callback(hObject,eventdata,handles)
+end