Changeset 499


Ignore:
Timestamp:
Jul 23, 2012, 11:53:25 PM (8 years ago)
Author:
sommeria
Message:

various bugs corrected. PARAM.xml complemented to provide info for 'RUN' mode

Location:
trunk/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/PARAM.xml.default

    r489 r499  
    33<RunParam>
    44<MaxCivProcesses>20</MaxCivProcesses>
     5<RunTime>${MCRROOT712}</RunTime>
    56<CivBin>bin/civ<!--binary for the new civx version (relative or
    67absolute path)--></CivBin>
     
    910<Civ2Bin>bin/civ2<!--binary for civ2 (relative or absolute path)
    1011--></Civ2Bin>
     12<CivmBin>bin/run_civ_matlab.sh<!--binary from compilation of civ_matlab.
     13m (relative or absolute path)--></CivmBin>
    1114<Civ3D3CBin>bin/civ3d3c</Civ3D3CBin>
    1215<FixBin>bin/fix_flag</FixBin>
  • trunk/src/delete_object.m

    r410 r499  
    1414list_str=get(hlist_object,'String');%objet list
    1515if isequal(floor(hObject),hObject) %case of an index
    16     if  ~isempty(UvData) & isfield(UvData, 'Object') & length(UvData.Object)>=hObject
    17         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;
    1919            for iview=1:length(hdisplay)
    20                 if ishandle(hdisplay(iview)) & ~isequal(hdisplay(iview),0)
     20                if ishandle(hdisplay(iview)) && ~isequal(hdisplay(iview),0)
    2121                    ObjectData=get(hdisplay(iview),'UserData');
    2222                    if isfield(ObjectData,'SubObject') & ishandle(ObjectData.SubObject)
     
    3030                ishandle(hdisplay(iview))
    3131            end
    32         end   
    33         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
    4040                end
    4141            end
     
    8080    set(hlist_object_1,'Value',old_index-1)
    8181end
    82 % hlist_object=findobj(huvmat,'Tag','list_object_2');%handles of the object liçst in the uvmat interface
     82% hlist_object=findobj(huvmat,'Tag','list_object_2');%handles of the object liï¿œst in the uvmat interface
    8383% set(hlist_object,'String',[list_str;{'...'}])
    8484% set(hlist_object,'Value',length(list_str)+1)
  • trunk/src/update_imadoc.m

    r498 r499  
    2626    t=xmltree(outputfile); %read the file
    2727    title=get(t,1,'name');
    28     if strcmp(title,'ImaDoc'))
     28    if strcmp(title,'ImaDoc')
    2929        testappend=1;
    3030        %if the xml file is  ImaDoc
  • trunk/src/uvmat.m

    r498 r499  
    43124312function delete_object_Callback(hObject, eventdata, handles)
    43134313%------------------------------------------------------------------------
    4314 IndexObj=get(handles.ListObject,'Value');
    4315 IndexObj_1=get(handles.ListObject_1,'Value');
    4316 if IndexObj>1 && ~isequal(IndexObj,IndexObj_1)
     4314IndexObj=get(handles.ListObject,'Value');%projection object selected for view_field
     4315IndexObj_1=get(handles.ListObject_1,'Value');%projection object selected for uvmat plot
     4316if IndexObj>1 && ~isequal(IndexObj,IndexObj_1) % do not delete the object used for the uvmat plot
    43174317    delete_object(IndexObj)
    43184318end
Note: See TracChangeset for help on using the changeset viewer.