Skip to content

Commit 9a7dd60

Browse files
Shortening some too long lines
1 parent be38de3 commit 9a7dd60

File tree

3 files changed

+33
-19
lines changed

3 files changed

+33
-19
lines changed

doc/Analytics.xml

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4887,7 +4887,8 @@ xmlns:acme="http://www.acme.com/schema">
48874887
<title>Motion region detector</title>
48884888
<para>The region motion detector detects any motion against the specified motion region. The rule is configured for an area (region of interest on the image source) which can be armed or disarmed. The region shall be defined by a Polygon structure. Although this rule is defined within the context of the analytics service, it is intended to allow configuration of hardware motion detection as opposed to motion detection from scene description data. For a description of the parameters see <xref linkend="_Ref522789617" />.</para>
48894889
<programlisting><![CDATA[<tt:RuleDescription Name="tt:MotionRegionDetector">
4890-
<tt:Parameters> <tt:ElementItemDescription Name="MotionRegion" Type="axt:MotionRegionConfig"/>
4890+
<tt:Parameters>
4891+
<tt:ElementItemDescription Name="MotionRegion" Type="axt:MotionRegionConfig"/>
48914892
</tt:Parameters>
48924893
<tt:Messages IsProperty="true">
48934894
<tt:Source>
@@ -4897,7 +4898,8 @@ xmlns:acme="http://www.acme.com/schema"&gt;
48974898
<tt:Key/>
48984899
<tt:Data>
48994900
<tt:SimpleItemDescription Name="State" Type="xs:boolean"/>
4900-
</tt:Data> <tt:ParentTopic>tns1:RuleEngine/MotionRegionDetector/Motion</tt:ParentTopic>
4901+
</tt:Data>
4902+
<tt:ParentTopic>tns1:RuleEngine/MotionRegionDetector/Motion</tt:ParentTopic>
49014903
</tt:Messages>
49024904
</tt:RuleDescription>
49034905
]]></programlisting>
@@ -5183,12 +5185,14 @@ xmlns:acme="http://www.acme.com/schema"&gt;
51835185
<para>As described in the introduction of this Annex, Spot Measurement Modules can be defined as “Screen” elements, points on the image, or as “Geo-referenced” elements, points in the PTZ space around the Device. The use of the “AbsoluteCoords” item will allow to differentiate this behaviour.</para>
51845186
<programlisting><![CDATA[<tt:AnalyticsModuleDescription Name="ttr:RadiometrySpot">
51855187
<tt:Parameters>
5186-
<tt:ElementItemDescription Name="RadiometrySpot" Type="ttr:RadiometrySpotModuleConfig"/>
5188+
<tt:ElementItemDescription Name="RadiometrySpot"
5189+
Type="ttr:RadiometrySpotModuleConfig"/>
51875190
</tt:Parameters>
51885191
<tt:MessageDescription>
51895192
<tt:Source>
51905193
<tt:SimpleItemDescription Name="VideoSourceToken" Type="tt:ReferenceToken"/>
5191-
<tt:SimpleItemDescription Name="VideoAnalyticsConfigurationToken" Type="tt:ReferenceToken"/>
5194+
<tt:SimpleItemDescription Name="VideoAnalyticsConfigurationToken"
5195+
Type="tt:ReferenceToken"/>
51925196
<tt:SimpleItemDescription Name="AnalyticsModuleName" Type="xs:string"/>
51935197
</tt:Source>
51945198
<tt:Data>
@@ -5319,7 +5323,8 @@ xmlns:acme="http://www.acme.com/schema"&gt;
53195323
<tt:MessageDescription>
53205324
<tt:Source>
53215325
<tt:SimpleItemDescription Name="VideoSourceToken" Type="tt:ReferenceToken"/>
5322-
<tt:SimpleItemDescription Name="VideoAnalyticsConfigurationToken" Type="tt:ReferenceToken"/>
5326+
<tt:SimpleItemDescription Name="VideoAnalyticsConfigurationToken"
5327+
Type="tt:ReferenceToken"/>
53235328
<tt:SimpleItemDescription Name="AnalyticsModuleName" Type="xs:string"/>
53245329
</tt:Source>
53255330
<tt:Data>
@@ -5335,7 +5340,8 @@ xmlns:acme="http://www.acme.com/schema"&gt;
53355340
<para>The above analytics module description defines that a Box Module instance produces Measurement Events (when new temperature values are produced by the video source), attached to the topic <emphasis role="bold">tns1:</emphasis><emphasis role="bold">VideoAnalytics/Radiometry/BoxTemperatureReading</emphasis>. These <emphasis role="bold">Temperature Measurement Events</emphasis> shall contain the following data payload:</para>
53365341
<programlisting><![CDATA[<xs:complexType name="BoxTemperatureReading">
53375342
<xs:sequence>
5338-
<xs:element name="RadiometryParameters" type="ttr:RadiometryParameters" minOccurs="0">
5343+
<xs:element name="RadiometryParameters" type="ttr:RadiometryParameters"
5344+
minOccurs="0">
53395345
<xs:annotation>
53405346
<xs:documentation>
53415347
Not present means Global Parameters from Thermal Service are being used.
@@ -5707,12 +5713,14 @@ xmlns:acme="http://www.acme.com/schema"&gt;
57075713
<para>A Temperature Rule is the most basic rule in Radiometry. It evaluates one of the output temperature values of a single Analytics Module, to trigger Temperature Alarm events when it meets a certain condition. The Rule shall only apply when its associated Analytics Module is Active, and providing valid readings.</para>
57085714
<programlisting><![CDATA[<xs:RuleDescription Name="ttr:RadiometryTemperatureRule">
57095715
<xs:Parameters>
5710-
<xs:ElementItemDescription Name="RadiometryTemperatureRule" Type="ttr:RadiometryTemperatureRuleConfig"/>
5716+
<xs:ElementItemDescription Name="RadiometryTemperatureRule"
5717+
Type="ttr:RadiometryTemperatureRuleConfig"/>
57115718
</xs:Parameters>
57125719
<xs:MessageDescription IsProperty="true">
57135720
<xs:Source>
57145721
<xs:SimpleItemDescription Name="VideoSourceToken" Type="tt:ReferenceToken"/>
5715-
<xs:SimpleItemDescription Name="VideoAnalyticsConfigurationToken" Type="tt:ReferenceToken"/>
5722+
<xs:SimpleItemDescription Name="VideoAnalyticsConfigurationToken"
5723+
Type="tt:ReferenceToken"/>
57165724
<xs:SimpleItemDescription Name="RuleName" Type="xs:string"/>
57175725
</xs:Source>
57185726
<xs:Key>
@@ -5721,7 +5729,8 @@ xmlns:acme="http://www.acme.com/schema"&gt;
57215729
<xs:Data>
57225730
<xs:SimpleItemDescription Name="AlarmActive" Type="xs:boolean"/>
57235731
<tt:SimpleItemDescription Name="TimeStamp" Type="xs:dateTime"/>
5724-
<xs:ElementItemDescription Name="AlarmGeoLocation" Type="tt:GeoLocation" minOccurs=0/>
5732+
<xs:ElementItemDescription Name="AlarmGeoLocation" Type="tt:GeoLocation"
5733+
minOccurs=0/>
57255734
</xs:Data>
57265735
<xs:ParentTopic>
57275736
tns1:RuleEngine/Radiometry/TemperatureAlarm
@@ -5870,7 +5879,8 @@ xmlns:acme="http://www.acme.com/schema"&gt;
58705879
</xs:Source>
58715880
<xs:Data>
58725881
<xs:SimpleItemDescription Name="AlarmActive" Type="xs:boolean"/>
5873-
<xs:ElementItemDescription Name="AlarmGeoLocation" Type="tt:GeoLocation" minOccurs=0/>
5882+
<xs:ElementItemDescription Name="AlarmGeoLocation" Type="tt:GeoLocation"
5883+
minOccurs=0/>
58745884
</xs:Data>
58755885
<xs:ParentTopic>
58765886
tns1:RuleEngine/Radiometry/TemperatureMeasurementAlarm
@@ -7649,7 +7659,8 @@ xmlns:acme="http://www.acme.com/schema"&gt;
76497659
<tt:MessageDescription IsProperty="false">
76507660
<tt:Source>
76517661
<tt:SimpleItemDescription Name="AudioSource" Type="tt:ReferenceToken"/>
7652-
<tt:SimpleItemDescription Name="AnalyticsConfiguration" Type="tt:ReferenceToken"/>
7662+
<tt:SimpleItemDescription Name="AnalyticsConfiguration"
7663+
Type="tt:ReferenceToken"/>
76537664
<tt:SimpleItemDescription Name="Rule" Type="xs:string"/>
76547665
</tt:Source>
76557666
<tt:Data>

doc/Core.xml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6861,14 +6861,15 @@ onvif://www.onvif.org/name/ARV-453
68616861
<programlisting><![CDATA[Topic: tns1:Monitoring/AsynchronousOperationStatus
68626862
<tt:MessageDescription IsProperty="true">
68636863
<tt:Source>
6864-
<tt:SimpleItemDescription Name=Token" Type=tt:ReferenceToken"/>
6865-
<tt:SimpleItemDescription Name=OperationName" Type=xs:string"/>
6866-
<tt:SimpleItemDescription Name=ServiceName" Type=xs:string/>
6864+
<tt:SimpleItemDescription Name="Token" Type="tt:ReferenceToken"/>
6865+
<tt:SimpleItemDescription Name="OperationName" Type="xs:string"/>
6866+
<tt:SimpleItemDescription Name="ServiceName" Type="xs:string"/>
68676867
</tt:Source>
68686868
<tt:Data>
6869-
<tt:SimpleItemDescription Name=“Progress" Type="xs:float"/> <!– [0.0,1.0] -- >
6870-
<tt:ElementItemDescription Name=“FileProgressStatus" Type=“tt:ArrayOfFileProgress"/> <!– optional ->
6871-
<tt:ElementItemDescription Name=“Error" Type=“soapenv:Fault"/> <!– optional ->
6869+
<tt:SimpleItemDescription Name="Progress" Type="xs:float"/> <!– [0.0,1.0] -- >
6870+
<tt:ElementItemDescription Name="FileProgressStatus"
6871+
Type="tt:ArrayOfFileProgress"/> <!– optional -- >
6872+
<tt:ElementItemDescription Name="Error" Type="soapenv:Fault"/> <!– optional -- >
68726873
</tt:Data>
68736874
</tt:MessageDescription>
68746875
]]></programlisting>

doc/RecordingControl.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,8 @@ Change Request 2061, 2063, 2065, 2109</revremark>
17111711
</tt:Source>
17121712
<tt:Data>
17131713
<tt:SimpleItemDescription Name="State" Type="xs:String"/>
1714-
<tt:ElementItemDescription Name="Information" Type="tt:RecordingJobStateInformation"/>
1714+
<tt:ElementItemDescription Name="Information"
1715+
Type="tt:RecordingJobStateInformation"/>
17151716
</tt:Data>
17161717
</tt:MessageDescription>
17171718
]]></programlisting>
@@ -2169,7 +2170,8 @@ secfrac = "." 1*6DIGIT</programlisting>
21692170
<section>
21702171
<title>Syntax</title>
21712172
<programlisting><![CDATA[
2172-
aligned(8) class ProtectionSystemSpecificHeaderBox extends FullBox('pssh', version=1, flags=0)
2173+
aligned(8) class ProtectionSystemSpecificHeaderBox extends FullBox('pssh', version=1,
2174+
flags=0)
21732175
{
21742176
unsigned int(8)[16] SystemID;
21752177
unsigned int(32) KID_count;

0 commit comments

Comments
 (0)