Changeset 499
- Timestamp:
- Jul 23, 2012, 11:53:25 PM (12 years ago)
- Location:
- trunk/src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/PARAM.xml.default
r489 r499 3 3 <RunParam> 4 4 <MaxCivProcesses>20</MaxCivProcesses> 5 <RunTime>${MCRROOT712}</RunTime> 5 6 <CivBin>bin/civ<!--binary for the new civx version (relative or 6 7 absolute path)--></CivBin> … … 9 10 <Civ2Bin>bin/civ2<!--binary for civ2 (relative or absolute path) 10 11 --></Civ2Bin> 12 <CivmBin>bin/run_civ_matlab.sh<!--binary from compilation of civ_matlab. 13 m (relative or absolute path)--></CivmBin> 11 14 <Civ3D3CBin>bin/civ3d3c</Civ3D3CBin> 12 15 <FixBin>bin/fix_flag</FixBin> -
trunk/src/delete_object.m
r410 r499 14 14 list_str=get(hlist_object,'String');%objet list 15 15 if isequal(floor(hObject),hObject) %case of an index 16 if ~isempty(UvData) & isfield(UvData, 'Object')& length(UvData.Object)>=hObject17 if isfield(UvData.Object{hObject},'DisplayHandle _uvmat')18 hdisplay=UvData.Object{hObject}.DisplayHandle _uvmat;16 if ~isempty(UvData) && isfield(UvData, 'Object') && length(UvData.Object)>=hObject 17 if isfield(UvData.Object{hObject},'DisplayHandle') && isfield(UvData.Object{hObject}.DisplayHandle,'uvmat') 18 hdisplay=UvData.Object{hObject}.DisplayHandle.uvmat; 19 19 for iview=1:length(hdisplay) 20 if ishandle(hdisplay(iview)) & ~isequal(hdisplay(iview),0)20 if ishandle(hdisplay(iview)) && ~isequal(hdisplay(iview),0) 21 21 ObjectData=get(hdisplay(iview),'UserData'); 22 22 if isfield(ObjectData,'SubObject') & ishandle(ObjectData.SubObject) … … 30 30 ishandle(hdisplay(iview)) 31 31 end 32 end33 for iobj=hObject+1:length(UvData.Object)34 hdisplay=UvData.Object{iobj}.DisplayHandle_uvmat;35 for iview=1:length(hdisplay)36 if ishandle(hdisplay(iview)) && ~isequal(hdisplay(iview),0)37 PlotData=get(hdisplay(iview),'UserData');38 PlotData.IndexObj=iobj-1;39 set(hdisplay(iview),'UserData',PlotData);32 for iobj=hObject+1:length(UvData.Object) 33 hdisplay=UvData.Object{iobj}.DisplayHandle.uvmat; 34 for iview=1:length(hdisplay) 35 if ishandle(hdisplay(iview)) && ~isequal(hdisplay(iview),0) 36 PlotData=get(hdisplay(iview),'UserData'); 37 PlotData.IndexObj=iobj-1; 38 set(hdisplay(iview),'UserData',PlotData); 39 end 40 40 end 41 41 end … … 80 80 set(hlist_object_1,'Value',old_index-1) 81 81 end 82 % hlist_object=findobj(huvmat,'Tag','list_object_2');%handles of the object li çst in the uvmat interface82 % hlist_object=findobj(huvmat,'Tag','list_object_2');%handles of the object liï¿œst in the uvmat interface 83 83 % set(hlist_object,'String',[list_str;{'...'}]) 84 84 % set(hlist_object,'Value',length(list_str)+1) -
trunk/src/update_imadoc.m
r498 r499 26 26 t=xmltree(outputfile); %read the file 27 27 title=get(t,1,'name'); 28 if strcmp(title,'ImaDoc') )28 if strcmp(title,'ImaDoc') 29 29 testappend=1; 30 30 %if the xml file is ImaDoc -
trunk/src/uvmat.m
r498 r499 4312 4312 function delete_object_Callback(hObject, eventdata, handles) 4313 4313 %------------------------------------------------------------------------ 4314 IndexObj=get(handles.ListObject,'Value'); 4315 IndexObj_1=get(handles.ListObject_1,'Value'); 4316 if IndexObj>1 && ~isequal(IndexObj,IndexObj_1) 4314 IndexObj=get(handles.ListObject,'Value');%projection object selected for view_field 4315 IndexObj_1=get(handles.ListObject_1,'Value');%projection object selected for uvmat plot 4316 if IndexObj>1 && ~isequal(IndexObj,IndexObj_1) % do not delete the object used for the uvmat plot 4317 4317 delete_object(IndexObj) 4318 4318 end
Note: See TracChangeset
for help on using the changeset viewer.