Changeset 499 for trunk

Timestamp:

Jul 23, 2012, 11:53:25 PM (12 years ago)

Author:

sommeria

Message:

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

Location:

trunk/src

Files:

• PARAM.xml.default (modified) (2 diffs)
• delete_object.m (modified) (3 diffs)
• update_imadoc.m (modified) (1 diff)
• uvmat.m (modified) (1 diff)

trunk/src/PARAM.xml.default

@@ -3 +3 @@
 <RunParam>
 <MaxCivProcesses>20</MaxCivProcesses>
+<RunTime>${MCRROOT712}</RunTime>
 <CivBin>bin/civ<!--binary for the new civx version (relative or
 absolute path)--></CivBin>
@@ -9 +10 @@
 <Civ2Bin>bin/civ2<!--binary for civ2 (relative or absolute path)
 --></Civ2Bin>
+<CivmBin>bin/run_civ_matlab.sh<!--binary from compilation of civ_matlab.
+m (relative or absolute path)--></CivmBin>
 <Civ3D3CBin>bin/civ3d3c</Civ3D3CBin>
 <FixBin>bin/fix_flag</FixBin>

trunk/src/delete_object.m

@@ -14 +14 @@
 list_str=get(hlist_object,'String');%objet list
 if isequal(floor(hObject),hObject) %case of an index
-    if  ~isempty(UvData) & isfield(UvData, 'Object') & length(UvData.Object)>=hObject 
-        if isfield(UvData.Object{hObject},'DisplayHandle_uvmat') 
-            hdisplay=UvData.Object{hObject}.DisplayHandle_uvmat;
+    if  ~isempty(UvData) && isfield(UvData, 'Object') && length(UvData.Object)>=hObject 
+        if isfield(UvData.Object{hObject},'DisplayHandle') && isfield(UvData.Object{hObject}.DisplayHandle,'uvmat')
+            hdisplay=UvData.Object{hObject}.DisplayHandle.uvmat;
             for iview=1:length(hdisplay)
-                if ishandle(hdisplay(iview)) & ~isequal(hdisplay(iview),0)
+                if ishandle(hdisplay(iview)) && ~isequal(hdisplay(iview),0)
                     ObjectData=get(hdisplay(iview),'UserData');
                     if isfield(ObjectData,'SubObject') & ishandle(ObjectData.SubObject)
@@ -30 +30 @@
                 ishandle(hdisplay(iview))
             end
-        end   
-        for iobj=hObject+1:length(UvData.Object)
-            hdisplay=UvData.Object{iobj}.DisplayHandle_uvmat;
-            for iview=1:length(hdisplay)
-                if ishandle(hdisplay(iview)) && ~isequal(hdisplay(iview),0)
-                    PlotData=get(hdisplay(iview),'UserData');
-                    PlotData.IndexObj=iobj-1;
-                    set(hdisplay(iview),'UserData',PlotData);
+            for iobj=hObject+1:length(UvData.Object)
+                hdisplay=UvData.Object{iobj}.DisplayHandle.uvmat;
+                for iview=1:length(hdisplay)
+                    if ishandle(hdisplay(iview)) && ~isequal(hdisplay(iview),0)
+                        PlotData=get(hdisplay(iview),'UserData');
+                        PlotData.IndexObj=iobj-1;
+                        set(hdisplay(iview),'UserData',PlotData);
+                    end
                 end
             end
@@ -80 +80 @@
     set(hlist_object_1,'Value',old_index-1)
 end
-% hlist_object=findobj(huvmat,'Tag','list_object_2');%handles of the object liçst in the uvmat interface
+% hlist_object=findobj(huvmat,'Tag','list_object_2');%handles of the object liï¿œst in the uvmat interface
 % set(hlist_object,'String',[list_str;{'...'}])
 % set(hlist_object,'Value',length(list_str)+1)

trunk/src/update_imadoc.m

@@ -26 +26 @@
     t=xmltree(outputfile); %read the file
     title=get(t,1,'name');
-    if strcmp(title,'ImaDoc'))
+    if strcmp(title,'ImaDoc')
         testappend=1;
         %if the xml file is  ImaDoc

trunk/src/uvmat.m

@@ -4312 +4312 @@
 function delete_object_Callback(hObject, eventdata, handles)
 %------------------------------------------------------------------------
-IndexObj=get(handles.ListObject,'Value');
-IndexObj_1=get(handles.ListObject_1,'Value');
-if IndexObj>1 && ~isequal(IndexObj,IndexObj_1)
+IndexObj=get(handles.ListObject,'Value');%projection object selected for view_field
+IndexObj_1=get(handles.ListObject_1,'Value');%projection object selected for uvmat plot
+if IndexObj>1 && ~isequal(IndexObj,IndexObj_1) % do not delete the object used for the uvmat plot
     delete_object(IndexObj)
 end