Changeset 566

Timestamp:

Jan 30, 2013, 11:35:02 PM (12 years ago)

Author:

sommeria

Message:

introduce LIF, first step

Location:

trunk/src

Files:

• LIF_series.m (added)
• concentration.m (added)
• lumin_calib.m (added)
• uvmat.fig (modified) (previous)
• uvmat.m (modified) (4 diffs)

trunk/src/uvmat.m

@@ -4594 +4594 @@
 set(handles.MenuCalib,'checked','on')% indicate that MenuCalib is activated, test used by mouse action
 
+
+%-----------------------------------------------------------------------
+function MenuLIFCalib_Callback(hObject, eventdata, handles)
+%------------------------------------------------------------------------
+UvData=get(handles.uvmat,'UserData');%read UvData properties stored on the uvmat interface 
+ListObj=UvData.Object;
+select=zeros(1,numel(ListObj));
+for iobj=1:numel(ListObj);
+    if strcmp(ListObj{iobj}.Type,'line')
+        select(iobj)=1;
+    end
+end
+val=find(select);
+if numel(val)<2
+    msgbox_uvmat('ERROR','light rays must be defined by at least two lines created by Projection object/line in the menu bar');
+    return
+else
+    set(handles.ListObject,'Value',val);
+    ObjectData=UvData.Object(val);
+    flag=1;
+    npx=size(UvData.Field.A,2);
+    npy=size(UvData.Field.A,1);
+    xi=0.5:npx-0.5;
+    yi=0.5:npy-0.5;
+    [Xi,Yi]=meshgrid(xi,yi);
+    for iobj=1:length(ObjectData)
+        flagobj=1;
+        testphys=0; %coordinates in pixels by default
+        if isfield(ObjectData,'CoordUnit') && ~isequal(ObjectData.CoordUnit,'pixel')
+            if isfield(UvData,'XmlData')&& isfield(UvData.XmlData{1},'GeometryCalib')
+                Calib=UvData.XmlData{1}.GeometryCalib;
+                testphys=1;
+            end
+        end
+        if isfield(ObjectData{iobj},'Coord')
+            x1(iobj)=ObjectData{iobj}.Coord(1,1);
+            y1(iobj)=ObjectData{iobj}.Coord(1,2);
+            x2(iobj)=ObjectData{iobj}.Coord(2,1);
+            y2(iobj)=ObjectData{iobj}.Coord(2,2);
+        end
+    end
+end
+    %determine the ray origin
+    x1
+    y1
+    x2
+    y2
+    % update the xml file
+
+
+
 %------------------------------------------------------------------------
 function MenuMask_Callback(hObject, eventdata, handles)
@@ -4617 +4668 @@
     yi=0.5:npy-0.5;
     [Xi,Yi]=meshgrid(xi,yi);
-    if isfield(UvData,'Object')
+%     if isfield(UvData,'Object')
         for iobj=1:length(UvData.Object)
             ObjectData=UvData.Object{iobj};
@@ -4676 +4727 @@
             end
         end
-    end 
+%     end 
     %mask name
     RootPath=get(handles.RootPath,'String');
@@ -4846 +4897 @@
 
 % Hint: get(hObject,'Value') returns toggle state of CheckColorBar
+