Skip to content

Commit 28c5de1

Browse files
Section 5.7.1.5
1 parent c92a0f5 commit 28c5de1

File tree

5 files changed

+79
-48
lines changed

5 files changed

+79
-48
lines changed

doc/PTZ.xml

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,42 +1513,21 @@ Add GeoMove</revremark>
15131513
</inlinemediaobject> is the current focal length.</para>
15141514
<para>The current angle of view can be calculated with the following formula:</para>
15151515
<para>
1516-
<inlineequation>
1517-
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
1518-
<mml:mo>∝</mml:mo>
1519-
<mml:mi>
1520-
</mml:mi>
1521-
<mml:mo>=</mml:mo>
1522-
<mml:mi>
1523-
</mml:mi>
1524-
<mml:mn>2</mml:mn>
1525-
<mml:mi>
1526-
</mml:mi>
1527-
<mml:mi mathvariant="normal">a</mml:mi>
1528-
<mml:mi mathvariant="normal">r</mml:mi>
1529-
<mml:mi mathvariant="normal">c</mml:mi>
1530-
<mml:mi mathvariant="normal">t</mml:mi>
1531-
<mml:mi mathvariant="normal">a</mml:mi>
1532-
<mml:mi mathvariant="normal">n</mml:mi>
1533-
<mml:mfrac>
1534-
<mml:mrow>
1535-
<mml:mi>d</mml:mi>
1536-
</mml:mrow>
1537-
<mml:mrow>
1538-
<mml:mn>2</mml:mn>
1539-
<mml:mi>f</mml:mi>
1540-
<mml:mi>c</mml:mi>
1541-
</mml:mrow>
1542-
</mml:mfrac>
1543-
<mml:mi>
1544-
</mml:mi>
1545-
<mml:mi>
1546-
</mml:mi>
1547-
<mml:mo>,</mml:mo>
1548-
</mml:math>
1549-
</inlineequation>
1516+
<inlinemediaobject>
1517+
<imageobject>
1518+
<imagedata fileref="equations/PTZ/view_angle_calculation.svg" contentdepth="12mm"/>
1519+
</imageobject>
1520+
</inlinemediaobject>
15501521
</para>
1551-
<para>where <inlineequation><mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mi>d</mml:mi></mml:math></inlineequation> represents the size of the sensor in the direction of interest and <inlineequation><mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML"><mml:mi>f</mml:mi><mml:mi>c</mml:mi></mml:math></inlineequation> is the current focal length.</para>
1522+
<para>where <inlinemediaobject>
1523+
<imageobject>
1524+
<imagedata fileref="equations/PTZ/d.svg" contentdepth="5mm"/>
1525+
</imageobject>
1526+
</inlinemediaobject> represents the size of the sensor in the direction of interest and <inlinemediaobject>
1527+
<imageobject>
1528+
<imagedata fileref="equations/PTZ/f_c.svg" contentdepth="5mm"/>
1529+
</imageobject>
1530+
</inlinemediaobject> is the current focal length.</para>
15521531
</section>
15531532
<section xml:id="_Ref469302658">
15541533
<title>Normalized digital zoom position space</title>

doc/equations/PTZ/S_w.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
2+
<mml:msub>
3+
<mml:mi>S</mml:mi>
4+
<mml:mi>w</mml:mi>
5+
</mml:msub>
6+
</mml:math>

doc/equations/PTZ/W_w.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
2+
<mml:msub>
3+
<mml:mi>W</mml:mi>
4+
<mml:mi>w</mml:mi>
5+
</mml:msub>
6+
</mml:math>
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<mml:math xmlns:mml="http://www.w3.org/1998/Math/MathML">
2+
<mml:mi>Z</mml:mi>
3+
<mml:mo>=</mml:mo>
4+
<mml:mfrac>
5+
<mml:mrow>
6+
<mml:mn>1</mml:mn>
7+
</mml:mrow>
8+
<mml:mrow>
9+
<mml:mfrac>
10+
<mml:mrow>
11+
<mml:msub>
12+
<mml:mi>W</mml:mi>
13+
<mml:mi>w</mml:mi>
14+
</mml:msub>
15+
</mml:mrow>
16+
<mml:mrow>
17+
<mml:msub>
18+
<mml:mi>S</mml:mi>
19+
<mml:mi>w</mml:mi>
20+
</mml:msub>
21+
</mml:mrow>
22+
</mml:mfrac>
23+
</mml:mrow>
24+
</mml:mfrac>
25+
<mml:mo>=</mml:mo>
26+
<mml:mfrac>
27+
<mml:mrow>
28+
<mml:msub>
29+
<mml:mi>S</mml:mi>
30+
<mml:mi>w</mml:mi>
31+
</mml:msub>
32+
</mml:mrow>
33+
<mml:mrow>
34+
<mml:msub>
35+
<mml:mi>W</mml:mi>
36+
<mml:mi>w</mml:mi>
37+
</mml:msub>
38+
</mml:mrow>
39+
</mml:mfrac>
40+
</mml:math>

doc/equations/PTZ/view_angle_calculation.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
<mo>&#x22C5;</mo>
66
<mml:mi mathvariant="normal">arctan</mml:mi>
77
<mml:mo>(</mml:mo>
8-
<mml:mfrac>
9-
<mml:mrow>
10-
<mml:mi>d</mml:mi>
11-
</mml:mrow>
12-
<mml:mrow>
13-
<mml:mn>2</mml:mn>
14-
<mo>&#x22C5;</mo>
15-
<mml:msub>
16-
<mml:mi>f</mml:mi>
17-
<mml:mi>c</mml:mi>
18-
</mml:msub>
19-
</mml:mrow>
20-
</mml:mfrac>
8+
<mml:mfrac>
9+
<mml:mrow>
10+
<mml:mi>d</mml:mi>
11+
</mml:mrow>
12+
<mml:mrow>
13+
<mml:mn>2</mml:mn>
14+
<mo>&#x22C5;</mo>
15+
<mml:msub>
16+
<mml:mi>f</mml:mi>
17+
<mml:mi>c</mml:mi>
18+
</mml:msub>
19+
</mml:mrow>
20+
</mml:mfrac>
2121
<mml:mo>)</mml:mo>
2222
<mml:mo>,</mml:mo>
2323
</mml:math>

0 commit comments

Comments
 (0)