Commit 7e46a035 authored by María's avatar María
Browse files

updated diagrams

according to saref 2.0
parent 8a925d0a
Loading
Loading
Loading
Loading
+14 −14
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
	<key>MasterSheets</key>
	<array/>
	<key>ModificationDate</key>
	<string>2016-11-28 10:34:56 +0000</string>
	<string>2016-11-29 15:46:14 +0000</string>
	<key>Modifier</key>
	<string>María Poveda</string>
	<key>NotesVisible</key>
@@ -39149,7 +39149,7 @@ ComputerScienceBuilding1}</string>
				</dict>
				<dict>
					<key>Bounds</key>
					<string>{{79.415577327780056, 601.84355082633874}, {76.363261654226733, 26.054414605402712}}</string>
					<string>{{79.415577327780056, 595.30176198564493}, {76.363261654226733, 26.054414605402712}}</string>
					<key>Class</key>
					<string>ShapedGraphic</string>
					<key>FontInfo</key>
@@ -39177,7 +39177,7 @@ ComputerScienceBuilding1}</string>
						<key>ID</key>
						<integer>34890</integer>
						<key>Position</key>
						<real>0.10714872926473618</real>
						<real>0.084101647138595581</real>
						<key>RotationType</key>
						<integer>0</integer>
					</dict>
@@ -40264,7 +40264,7 @@ saref:UnifOfMeasure}</string>
{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
\ls1\ilvl0
\f0\fs26 \cf2 saref:
\f0\fs26 \cf2 s4bldg:
\fs24 \cf3 \expnd0\expndtw0\kerning0
Measurement}</string>
					</dict>
@@ -45012,9 +45012,9 @@ Device information}</string>
			<key>RowSpacing</key>
			<real>36</real>
			<key>SheetTitle</key>
			<string>Example</string>
			<string>Example-</string>
			<key>UniqueID</key>
			<integer>13</integer>
			<integer>15</integer>
			<key>VPages</key>
			<integer>2</integer>
		</dict>
@@ -50646,7 +50646,7 @@ ComputerScienceBuilding1}</string>
				</dict>
				<dict>
					<key>Bounds</key>
					<string>{{79.415577327780056, 595.30176198564493}, {76.363261654226733, 26.054414605402712}}</string>
					<string>{{79.415577327780056, 601.84355082633874}, {76.363261654226733, 26.054414605402712}}</string>
					<key>Class</key>
					<string>ShapedGraphic</string>
					<key>FontInfo</key>
@@ -50674,7 +50674,7 @@ ComputerScienceBuilding1}</string>
						<key>ID</key>
						<integer>34890</integer>
						<key>Position</key>
						<real>0.084101647138595581</real>
						<real>0.10714872926473618</real>
						<key>RotationType</key>
						<integer>0</integer>
					</dict>
@@ -51761,7 +51761,7 @@ saref:UnifOfMeasure}</string>
{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}}
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
\ls1\ilvl0
\f0\fs26 \cf2 s4bldg:
\f0\fs26 \cf2 saref:
\fs24 \cf3 \expnd0\expndtw0\kerning0
Measurement}</string>
					</dict>
@@ -56509,9 +56509,9 @@ Device information}</string>
			<key>RowSpacing</key>
			<real>36</real>
			<key>SheetTitle</key>
			<string>Example-SAREF2</string>
			<string>Example -Saref2.0</string>
			<key>UniqueID</key>
			<integer>15</integer>
			<integer>13</integer>
			<key>VPages</key>
			<integer>2</integer>
		</dict>
@@ -82062,7 +82062,7 @@ Class}</string>
		<key>FitInWindow</key>
		<true/>
		<key>Frame</key>
		<string>{{81, -955}, {1439, 873}}</string>
		<string>{{74, -896}, {1439, 873}}</string>
		<key>ShowInfo</key>
		<true/>
		<key>ShowRuler</key>
@@ -82093,7 +82093,7 @@ Class}</string>
				<real>1</real>
			</array>
			<array>
				<string>Example</string>
				<string>Example -Saref2.0</string>
				<real>0.0</real>
				<real>1</real>
			</array>
@@ -82103,7 +82103,7 @@ Class}</string>
				<real>1</real>
			</array>
			<array>
				<string>Example-SAREF2</string>
				<string>Example-</string>
				<real>0.0</real>
				<real>1</real>
			</array>
+60 −73
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@
	<key>MasterSheets</key>
	<array/>
	<key>ModificationDate</key>
	<string>2016-11-28 11:08:56 +0000</string>
	<string>2016-11-29 16:31:08 +0000</string>
	<key>Modifier</key>
	<string>María Poveda</string>
	<key>NotesVisible</key>
@@ -85,7 +85,7 @@
			<key>BackgroundGraphic</key>
			<dict>
				<key>Bounds</key>
				<string>{{0, 0}, {1173, 1381}}</string>
				<string>{{0, 0}, {1673.1346153846155, 1381}}</string>
				<key>Class</key>
				<string>SolidGraphic</string>
				<key>ID</key>
@@ -104,7 +104,7 @@
			<key>CanvasOrigin</key>
			<string>{0, 0}</string>
			<key>CanvasSize</key>
			<string>{1173, 1381}</string>
			<string>{1673.1346153846155, 1381}</string>
			<key>ColumnAlign</key>
			<integer>1</integer>
			<key>ColumnSpacing</key>
@@ -3396,17 +3396,19 @@ saref:UnitOfMeasure}</string>
\f0\b\fs24 \cf2 Prefixes:\
base (saref4env): http://saref.linkeddata.es/def/env#                       
\b0 saref: https://w3id.org/saref#
\b                                                 
\b0 mo:http://www.wurvoc.org/vocabularies/om-1.8/
\b                \
\b0 \cf2 saref: https://w3id.org/saref#
\b \cf2                                                 
\b0 \cf2 mo:http://www.wurvoc.org/vocabularies/om-1.8/
\b \cf2                \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 geo:http://www.w3.org/2003/01/geo/wgs84_pos#
\b                                   
\b0 \cf2 geo:http://www.w3.org/2003/01/geo/wgs84_pos#
\b \cf2                                   
\b0 \cf0 rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
\b \cf2                 
\b0 \cf0 rdfs: http://www.w3.org/2000/01/rdf-schema#
\b \cf2           \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \cf0 owl: http://www.w3.org/2002/07/owl#                                                     time:http://www.w3.org/2006/time#\cf2 \
\
@@ -11401,7 +11403,7 @@ applicable to the attached classes}</string>
\pard\tx60\tx300\tx940\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li20\fi-20\pardirnatural\qc
\ls1\ilvl0
\f0\fs24 \cf2 \expnd0\expndtw0\kerning0
Property}</string>
saref:Property}</string>
					</dict>
					<key>VFlip</key>
					<string>YES</string>
@@ -16124,8 +16126,9 @@ Class}</string>
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\f0\b\fs24 \cf2 Legend:\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \
\b0 \cf2 \
\
}</string>
					</dict>
@@ -19902,17 +19905,19 @@ saref:UnitOfMeasure}</string>
\f0\b\fs24 \cf2 Prefixes:\
base (saref4env): http://saref.linkeddata.es/def/env#                       
\b0 saref: https://w3id.org/saref#
\b                                                 
\b0 mo:http://www.wurvoc.org/vocabularies/om-1.8/
\b                \
\b0 \cf2 saref: https://w3id.org/saref#
\b \cf2                                                 
\b0 \cf2 mo:http://www.wurvoc.org/vocabularies/om-1.8/
\b \cf2                \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 geo:http://www.w3.org/2003/01/geo/wgs84_pos#
\b                                   
\b0 \cf2 geo:http://www.w3.org/2003/01/geo/wgs84_pos#
\b \cf2                                   
\b0 \cf0 rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
\b \cf2                 
\b0 \cf0 rdfs: http://www.w3.org/2000/01/rdf-schema#
\b \cf2           \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \cf0 owl: http://www.w3.org/2002/07/owl#                                                     time:http://www.w3.org/2006/time#\cf2 \
\
@@ -27862,18 +27867,6 @@ applicable to the attached classes}</string>
					<string>Rectangle</string>
					<key>Style</key>
					<dict>
						<key>fill</key>
						<dict>
							<key>Color</key>
							<dict>
								<key>b</key>
								<string>0.895596</string>
								<key>g</key>
								<string>0.895596</string>
								<key>r</key>
								<string>0.895596</string>
							</dict>
						</dict>
						<key>shadow</key>
						<dict>
							<key>Draws</key>
@@ -27907,7 +27900,7 @@ applicable to the attached classes}</string>
\pard\tx60\tx300\tx940\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li20\fi-20\pardirnatural\qc
\ls1\ilvl0
\f0\fs24 \cf2 \expnd0\expndtw0\kerning0
Property}</string>
saref:Property}</string>
					</dict>
					<key>VFlip</key>
					<string>YES</string>
@@ -32444,8 +32437,9 @@ Class}</string>
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\f0\b\fs24 \cf2 Legend:\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \
\b0 \cf2 \
\
}</string>
					</dict>
@@ -32853,7 +32847,7 @@ Class}</string>
			<key>BackgroundGraphic</key>
			<dict>
				<key>Bounds</key>
				<string>{{0, 0}, {1115.8269230769231, 921}}</string>
				<string>{{0, 0}, {1031, 921}}</string>
				<key>Class</key>
				<string>SolidGraphic</string>
				<key>ID</key>
@@ -32872,7 +32866,7 @@ Class}</string>
			<key>CanvasOrigin</key>
			<string>{0, 0}</string>
			<key>CanvasSize</key>
			<string>{1115.8269230769231, 921}</string>
			<string>{1031, 921}</string>
			<key>ColumnAlign</key>
			<integer>1</integer>
			<key>ColumnSpacing</key>
@@ -47878,7 +47872,7 @@ s4envi:
						<key>ID</key>
						<integer>35073</integer>
						<key>Position</key>
						<real>0.4400555542658065</real>
						<real>0.44005554914474487</real>
						<key>RotationType</key>
						<integer>0</integer>
					</dict>
@@ -48136,7 +48130,7 @@ s4envi:
						<key>ID</key>
						<integer>35070</integer>
						<key>Position</key>
						<real>0.43570950220208982</real>
						<real>0.43570950627326965</real>
						<key>RotationType</key>
						<integer>0</integer>
					</dict>
@@ -48394,7 +48388,7 @@ s4envi:
						<key>ID</key>
						<integer>35067</integer>
						<key>Position</key>
						<real>0.43332395365814713</real>
						<real>0.43332394957542419</real>
						<key>RotationType</key>
						<integer>0</integer>
					</dict>
@@ -50571,7 +50565,7 @@ s4envi:
\pard\tx60\tx300\tx940\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li20\fi-20\pardirnatural\qc
\f0\fs24 \cf2 \expnd0\expndtw0\kerning0
s4envi:
saref:
\fs26 \cf2 \kerning1\expnd0\expndtw0 makes\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\qc
\cf2 Measurement}</string>
@@ -52461,7 +52455,7 @@ s4envi:\ul \ulc2 LightMagnitude}</string>
				</dict>
				<dict>
					<key>Bounds</key>
					<string>{{182.77746487026786, 323.58009145804232}, {104.39999766647816, 30.447466314572353}}</string>
					<string>{{182.77746487026786, 323.58009145804232}, {96.448929284949145, 30.447466314572353}}</string>
					<key>Class</key>
					<string>ShapedGraphic</string>
					<key>FontInfo</key>
@@ -52555,7 +52549,7 @@ s4envi:\ul \ulc2 LightMagnitude}</string>
\pard\tx60\tx300\tx940\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li20\fi-20\pardirnatural\qc
\f0\fs24 \cf2 \expnd0\expndtw0\kerning0
s4envi:
saref:
\fs26 \cf2 measuresProperty}</string>
					</dict>
					<key>VFlip</key>
@@ -85300,7 +85294,7 @@ System}</string>
				</dict>
				<dict>
					<key>Bounds</key>
					<string>{{267.53786910109847, 125.79755882848575}, {94.263624935766074, 23.012603759765625}}</string>
					<string>{{244.44149666006496, 125.79755882848576}, {117.35999737679958, 23.012603759765625}}</string>
					<key>Class</key>
					<string>ShapedGraphic</string>
					<key>FontInfo</key>
@@ -85350,18 +85344,6 @@ System}</string>
					<string>Rectangle</string>
					<key>Style</key>
					<dict>
						<key>fill</key>
						<dict>
							<key>Color</key>
							<dict>
								<key>b</key>
								<string>0.895596</string>
								<key>g</key>
								<string>0.895596</string>
								<key>r</key>
								<string>0.895596</string>
							</dict>
						</dict>
						<key>shadow</key>
						<dict>
							<key>Draws</key>
@@ -85395,7 +85377,7 @@ System}</string>
\pard\tx60\tx300\tx940\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\li20\fi-20\pardirnatural\qc
\ls1\ilvl0
\f0\fs24 \cf2 \expnd0\expndtw0\kerning0
Measurement}</string>
saref:Measurement}</string>
					</dict>
					<key>VFlip</key>
					<string>YES</string>
@@ -87154,7 +87136,7 @@ saref:hasTimeStamp:: dateTime (F)\
					<key>Points</key>
					<array>
						<string>{341.49429000935334, 256.86235399300608}</string>
						<string>{314.66968344183152, 148.81016258825139}</string>
						<string>{303.12149768019844, 148.81016258825136}</string>
					</array>
					<key>Style</key>
					<dict>
@@ -87294,7 +87276,7 @@ saref:hasTimeStamp:: dateTime (F)\
					<key>Points</key>
					<array>
						<string>{341.49429000935334, 194.18387406802137}</string>
						<string>{314.66968344183152, 148.81016258825139}</string>
						<string>{303.12149768019844, 148.81016258825136}</string>
					</array>
					<key>Style</key>
					<dict>
@@ -90165,12 +90147,13 @@ saref:UnitOfMeasure}</string>
\f0\b\fs24 \cf2 Prefixes:\
base (saref4env): http://saref.linkeddata.es/def/env#              
\b0 saref: https://w3id.org/saref#
\b                                      
\b0 wurvoc:http://www.wurvoc.org/vocabularies/om-1.8/
\b                
\b0 geo:http://www.w3.org/2003/01/geo/wgs84_pos#
\b \
\b0 \cf2 saref: https://w3id.org/saref#
\b \cf2                                      
\b0 \cf2 wurvoc:http://www.wurvoc.org/vocabularies/om-1.8/
\b \cf2                
\b0 \cf2 geo:http://www.w3.org/2003/01/geo/wgs84_pos#
\b \cf2 \
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \cf0 rdf: http://www.w3.org/1999/02/22-rdf-syntax-ns#
\b \cf2                          
@@ -104871,8 +104854,9 @@ Class}</string>
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\f0\b\fs24 \cf2 Legend:\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \
\b0 \cf2 \
\
}</string>
					</dict>
@@ -138574,8 +138558,9 @@ Class}</string>
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\f0\b\fs24 \cf2 Legend:\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \
\b0 \cf2 \
\
}</string>
					</dict>
@@ -157786,8 +157771,9 @@ Class}</string>
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\f0\b\fs24 \cf2 Legend:\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \
\b0 \cf2 \
\
}</string>
					</dict>
@@ -174877,8 +174863,9 @@ Class}</string>
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\f0\b\fs24 \cf2 Legend:\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \
\b0 \cf2 \
\
}</string>
					</dict>
@@ -184686,8 +184673,9 @@ Class}</string>
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\f0\b\fs24 \cf2 Legend:\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \
\b0 \cf2 \
\
}</string>
					</dict>
@@ -187255,8 +187243,9 @@ Class}</string>
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\f0\b\fs24 \cf2 Legend:\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
\b0 \
\b0 \cf2 \
\
}</string>
					</dict>
@@ -203240,13 +203229,11 @@ Measurement}</string>
		<key>BottomSlabHeight</key>
		<real>195</real>
		<key>CurrentSheet</key>
		<integer>3</integer>
		<integer>5</integer>
		<key>Expanded_Canvases</key>
		<array/>
		<key>FitInWindow</key>
		<true/>
		<key>Frame</key>
		<string>{{81, -896}, {1429, 873}}</string>
		<string>{{0, 4}, {1429, 873}}</string>
		<key>ShowInfo</key>
		<true/>
		<key>ShowRuler</key>
@@ -203256,9 +203243,9 @@ Measurement}</string>
		<key>SidebarWidth</key>
		<integer>230</integer>
		<key>VisibleRegion</key>
		<string>{{0, 0}, {1115.8269230769231, 921.00000000000011}}</string>
		<string>{{3, 0}, {882, 728}}</string>
		<key>Zoom</key>
		<real>0.79044516829533118</real>
		<real>1</real>
		<key>ZoomValues</key>
		<array>
			<array>