Changeset 1120 for trunk/src/series

Timestamp:

Dec 15, 2022, 6:21:53 PM (2 years ago)

Author:

sommeria

Message:

various corrections

Location:

trunk/src/series

Files:

• stereo_civ.m (modified) (4 diffs)
• stereo_input.fig (modified) (previous)

trunk/src/series/stereo_civ.m

@@ -1 @@
-%'civ_series': PIV function activated by the general GUI series
+%'stereo_series': PIV function activated by the general GUI series
 % --- call the sub-functions:
 %   civ: PIV function itself
@@ -41 +41 @@
 Data=[];
 errormsg='';
+
 %% set the input elements needed on the GUI series when the action is selected in the menu ActionName or InputTable refreshed
 if isstruct(Param) && isequal(Param.Action.RUN,0)% function activated from the GUI series but not RUN 
@@ -49 +50 @@
     path_series=fileparts(which('series'));
     addpath(fullfile(path_series,'series'))
-    Data=stereo_input(Param);% introduce the civ parameters using the GUI civ_input
+    Data=stereo_input(Param);% introduce the civ parameters using the GUI stereo_input
     if isempty(Data)
         Data=Param;% if  civ_input has been cancelled, keep previous parameters
@@ -1309 +1310 @@
 mtz=(XmlData{1}.GeometryCalib.Tx_Ty_Tz(1,3)+XmlData{2}.GeometryCalib.Tx_Ty_Tz(1,3))/2;
 
-Error=(sqrt(mfx^2+mfy^2)/(2*sqrt(2)*mtz)).*(((Dyb-Dya).*(-u)-(Dxb-Dxa).*(-v))./Den);
-
+%Error=(sqrt(mfx^2+mfy^2)/(2*sqrt(2)*mtz)).*(((Dyb-Dya).*(-u)-(Dxb-Dxa).*(-v))./sqrt(Den));
+Error=(((Dyb-Dya).*(-u)-(Dxb-Dxa).*(-v))./sqrt(Den));
 z=((Dxb-Dxa).*(-u)+(Dyb-Dya).*(-v))./Den;