Skip to content

Commit 22d9714

Browse files
meynardcmeynardc
committed
Merge branch 'apib11'
2 parents 2c65c2b + 1ec939f commit 22d9714

22 files changed

+531
-108
lines changed

‎MMVII/MMVII-TestDir/Input/Saisies-MMV1/Ground-Pts3D.xml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0" ?>
2+
<DicoAppuisFlottant>
3+
<OneAppuisDAF>
4+
<Pt>0.182895665614618341 -3.78002060469805157 2.56022810571964277</Pt>
5+
<NamePt>Stone-1</NamePt>
6+
<Incertitude>1 1 1</Incertitude>
7+
</OneAppuisDAF>
8+
<OneAppuisDAF>
9+
<Pt>0.234792215591026754 -5.36333800580974884 2.42659720440635063</Pt>
10+
<NamePt>Stone-2</NamePt>
11+
<Incertitude>1 1 1</Incertitude>
12+
</OneAppuisDAF>
13+
<OneAppuisDAF>
14+
<Pt>0.194213046998492761 -4.82293063921051068 1.75377255914109642</Pt>
15+
<NamePt>Stone-3</NamePt>
16+
<Incertitude>1 1 1</Incertitude>
17+
</OneAppuisDAF>
18+
<OneAppuisDAF>
19+
<Pt>0.754045221758523621 0.496427193197002514 0.431416432371162006</Pt>
20+
<NamePt>I-of-I</NamePt>
21+
<Incertitude>1 1 1</Incertitude>
22+
</OneAppuisDAF>
23+
<OneAppuisDAF>
24+
<Pt>0.898750585424819226 1.10409507249266081 0.444680581722013746</Pt>
25+
<NamePt>Acute</NamePt>
26+
<Incertitude>1 1 1</Incertitude>
27+
</OneAppuisDAF>
28+
<OneAppuisDAF>
29+
<Pt>1.31771333753878528 0.989188464947304724 0.370627429238321537</Pt>
30+
<NamePt>Finger-1</NamePt>
31+
<Incertitude>1 1 1</Incertitude>
32+
</OneAppuisDAF>
33+
<OneAppuisDAF>
34+
<Pt>0.150697933447584281 1.10818337179321613 0.773464897817899177</Pt>
35+
<NamePt>Stone-6</NamePt>
36+
<Incertitude>1 1 1</Incertitude>
37+
</OneAppuisDAF>
38+
<OneAppuisDAF>
39+
<Pt>0.256396378205514475 2.35318759021626445 2.23887785258234207</Pt>
40+
<NamePt>Stone-7</NamePt>
41+
<Incertitude>1 1 1</Incertitude>
42+
</OneAppuisDAF>
43+
<OneAppuisDAF>
44+
<Pt>1.40207519252831658 2.1945458898399548 0.40382985984277503</Pt>
45+
<NamePt>Grille</NamePt>
46+
<Incertitude>1 1 1</Incertitude>
47+
</OneAppuisDAF>
48+
</DicoAppuisFlottant>

‎MMVII/MMVII-TestDir/Input/Saisies-MMV1/GroundMeasure.xml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
<?xml version="1.0" ?>
2+
<SetOfMesureAppuisFlottants>
3+
<MesureAppuiFlottant1Im>
4+
<NameIm>IMGP4170.JPG</NameIm>
5+
<OneMesureAF1I>
6+
<NamePt>I-of-I</NamePt>
7+
<PtIm>452.278142467572422 808.192805895297056</PtIm>
8+
</OneMesureAF1I>
9+
<OneMesureAF1I>
10+
<NamePt>u-of-You</NamePt>
11+
<PtIm>521.272784862528056 1015.52756464228401</PtIm>
12+
</OneMesureAF1I>
13+
<OneMesureAF1I>
14+
<NamePt>Acute</NamePt>
15+
<PtIm>458.441997415626133 1100.83130652515365</PtIm>
16+
</OneMesureAF1I>
17+
<OneMesureAF1I>
18+
<NamePt>Finger-1</NamePt>
19+
<PtIm>344.785721369910448 1112.92280566175327</PtIm>
20+
</OneMesureAF1I>
21+
</MesureAppuiFlottant1Im>
22+
<MesureAppuiFlottant1Im>
23+
<NameIm>IMGP4168.JPG</NameIm>
24+
<OneMesureAF1I>
25+
<NamePt>I-of-I</NamePt>
26+
<PtIm>430.52658272147653 227.090326619720145</PtIm>
27+
</OneMesureAF1I>
28+
<OneMesureAF1I>
29+
<NamePt>u-of-You</NamePt>
30+
<PtIm>495.717626755149013 454.825546116027397</PtIm>
31+
</OneMesureAF1I>
32+
<OneMesureAF1I>
33+
<NamePt>Acute</NamePt>
34+
<PtIm>431.735281413390453 510.222991095907105</PtIm>
35+
</OneMesureAF1I>
36+
<OneMesureAF1I>
37+
<NamePt>Finger-1</NamePt>
38+
<PtIm>316.373353330086218 471.678176822389275</PtIm>
39+
</OneMesureAF1I>
40+
<OneMesureAF1I>
41+
<NamePt>Stone-6</NamePt>
42+
<PtIm>667.402028214032839 479.731591690534685</PtIm>
43+
</OneMesureAF1I>
44+
<OneMesureAF1I>
45+
<NamePt>Stone-7</NamePt>
46+
<PtIm>1284.05120739189965 981.021140912616147</PtIm>
47+
</OneMesureAF1I>
48+
<OneMesureAF1I>
49+
<NamePt>Grille</NamePt>
50+
<PtIm>362.602015084684353 1078.96450589692108</PtIm>
51+
</OneMesureAF1I>
52+
</MesureAppuiFlottant1Im>
53+
<MesureAppuiFlottant1Im>
54+
<NameIm>IMGP4169.JPG</NameIm>
55+
<OneMesureAF1I>
56+
<NamePt>I-of-I</NamePt>
57+
<PtIm>475.161154787777321 516.404520623212079</PtIm>
58+
</OneMesureAF1I>
59+
<OneMesureAF1I>
60+
<NamePt>u-of-You</NamePt>
61+
<PtIm>538.999416573275425 732.995393503311675</PtIm>
62+
</OneMesureAF1I>
63+
<OneMesureAF1I>
64+
<NamePt>Acute</NamePt>
65+
<PtIm>475.850364860953221 802.548038024082189</PtIm>
66+
</OneMesureAF1I>
67+
<OneMesureAF1I>
68+
<NamePt>Finger-1</NamePt>
69+
<PtIm>362.721106696891582 789.307120972098687</PtIm>
70+
</OneMesureAF1I>
71+
<OneMesureAF1I>
72+
<NamePt>Stone-6</NamePt>
73+
<PtIm>706.139274179003905 741.525951210447488</PtIm>
74+
</OneMesureAF1I>
75+
</MesureAppuiFlottant1Im>
76+
<MesureAppuiFlottant1Im>
77+
<NameIm>IMGP4167.JPG</NameIm>
78+
<OneMesureAF1I>
79+
<NamePt>Stone-6</NamePt>
80+
<PtIm>644.286307996218966 232.6833164507199</PtIm>
81+
</OneMesureAF1I>
82+
<OneMesureAF1I>
83+
<NamePt>Stone-7</NamePt>
84+
<PtIm>1265.36807144116688 735.26882940476105</PtIm>
85+
</OneMesureAF1I>
86+
<OneMesureAF1I>
87+
<NamePt>Grille</NamePt>
88+
<PtIm>322.076097286495724 766.811866179541425</PtIm>
89+
</OneMesureAF1I>
90+
</MesureAppuiFlottant1Im>
91+
</SetOfMesureAppuisFlottants>

‎MMVII/MMVII-TestDir/Input/Saisies-MMV1/IMGP4167.JPG‎

1.53 MB
Loading

‎MMVII/MMVII-TestDir/Input/Saisies-MMV1/IMGP4168.JPG‎

1.53 MB
Loading

‎MMVII/MMVII-TestDir/Input/Saisies-MMV1/IMGP4169.JPG‎

1.56 MB
Loading

‎MMVII/MMVII-TestDir/Input/Saisies-MMV1/IMGP4170.JPG‎

1.34 MB
Loading

‎MMVII/apib11/Calib-PerspCentral-Foc-28000_Cam-PENTAX_K5.xml‎ renamed to ‎MMVII/MMVII-TestDir/Input/Saisies-MMV1/Ori-Ground-MMVII/Calib-PerspCentral-Foc-28000_Cam-PENTAX_K5.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@
1111
<DegreeApproxInv>3 1 1</DegreeApproxInv>
1212
</Auxiliary>
1313
<PerfectProj>
14-
<F>2113.26900143641</F>
15-
<PP>857.203461218707 577.076198246255</PP>
14+
<F>2113.29189076302</F>
15+
<PP>857.206754888925 577.075355949847</PP>
1616
</PerfectProj>
1717
<Distorsion>
1818
<Radial>
19-
<K1>-0.0992818343588939</K1> <!--(X,Y) * (X^2+Y^2)-->
20-
<K2>0.105926341210555</K2> <!--(X,Y) * (X^2+Y^2)^2-->
21-
<K3>0.0365920357111148</K3> <!--(X,Y) * (X^2+Y^2)^3-->
19+
<K1>-0.0992778414574082</K1> <!--(X,Y) * (X^2+Y^2)-->
20+
<K2>0.105924077620665</K2> <!--(X,Y) * (X^2+Y^2)^2-->
21+
<K3>0.0366404677720908</K3> <!--(X,Y) * (X^2+Y^2)^3-->
2222
</Radial>
2323
<Decentric>
24-
<p1>6.32129028493475e-05</p1> <!--(3X2+Y2,2XY)-->
25-
<p2>-7.41880900367172e-05</p2> <!--(2XY,X2+3Y2)-->
24+
<p1>6.3479994323078e-05</p1> <!--(3X2+Y2,2XY)-->
25+
<p2>-7.41705215866132e-05</p2> <!--(2XY,X2+3Y2)-->
2626
</Decentric>
2727
<Polynomial>
28-
<b1>-1.24734259119908e-08</b1> <!--(X,0)-->
29-
<b2>4.79395702261653e-07</b2> <!--(Y,0)-->
28+
<b1>-1.62457752333968e-08</b1> <!--(X,0)-->
29+
<b2>4.80179377691907e-07</b2> <!--(Y,0)-->
3030
</Polynomial>
3131
</Distorsion>
3232
<Informations>

‎MMVII/MMVII-TestDir/Input/Saisies-MMV1/Ori-Ground-MMVII/Ori-PerspCentral-IMGP4167.JPG.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="ISO8859-1" standalone="yes" ?>
2+
<MMVII_Serialization>
3+
<NameImage>"IMGP4167.JPG"</NameImage>
4+
<NameInternalCalib>"Calib-PerspCentral-Foc-28000_Cam-PENTAX_K5"</NameInternalCalib>
5+
<Center>5.20644436052294 1.49611001038881 2.11724479232937</Center>
6+
<RotMatrix>
7+
<AxeI>-0.162074830392862 0.0384131738848583 0.986030515463501</AxeI>
8+
<AxeJ>0.0965180346057596 0.995067755113336 -0.0229004744393625</AxeJ>
9+
<AxeK>-0.982046851402196 0.0914581369031654 -0.164983001685735</AxeK>
10+
</RotMatrix>
11+
<EQ>0.645757292454901 -0.0442730622939557 -0.761926109801983 -0.022494852710068</EQ> <!--EigenQuaternion, for information-->
12+
<WPK>-150.998255793775 -79.1267383625106 -149.225556118573</WPK> <!--Omega Phi Kapa in degree, for information-->
13+
<YPR>166.666421173337 -80.4118527918605 -172.097549838315</YPR> <!--Yaw Pitch Roll in degree, for information-->
14+
</MMVII_Serialization>

‎MMVII/apib11/Ori-PerspCentral-IMGP4168.JPG.xml‎ renamed to ‎MMVII/MMVII-TestDir/Input/Saisies-MMV1/Ori-Ground-MMVII/Ori-PerspCentral-IMGP4168.JPG.xml‎

File renamed without changes.

‎MMVII/MMVII-TestDir/Input/Saisies-MMV1/Ori-Ground-MMVII/Ori-PerspCentral-IMGP4169.JPG.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="ISO8859-1" standalone="yes" ?>
2+
<MMVII_Serialization>
3+
<NameImage>"IMGP4169.JPG"</NameImage>
4+
<NameInternalCalib>"Calib-PerspCentral-Foc-28000_Cam-PENTAX_K5"</NameInternalCalib>
5+
<Center>5.15627029486289 0.215205620108451 2.08689313795566</Center>
6+
<RotMatrix>
7+
<AxeI>-0.176953806326696 0.0409905785444553 0.983365203216529</AxeI>
8+
<AxeJ>0.102280177137307 0.994488561576619 -0.0230492138266792</AxeJ>
9+
<AxeK>-0.978890247061056 0.0965001210561815 -0.180171059953831</AxeK>
10+
</RotMatrix>
11+
<EQ>0.63979756472186 -0.0467137347321854 -0.766748561762124 -0.0239488245862174</EQ> <!--EigenQuaternion, for information-->
12+
<WPK>-151.826374151718 -78.2064061610764 -149.971874858426</WPK> <!--Omega Phi Kapa in degree, for information-->
13+
<YPR>166.957716505788 -79.5347343248668 -172.709771641196</YPR> <!--Yaw Pitch Roll in degree, for information-->
14+
</MMVII_Serialization>

0 commit comments

Comments
 (0)