Context Navigation

← Previous Changeset
Next Changeset →

Changeset 833

Timestamp:

11/18/07 19:20:32 (13 months ago)

Author:

otter

Message:

ticket:3 (partially solved):
- MultiBody.Sensors.AbsoluteSensor/RelativeSensor

moved to ObsoleteModelica3 and provided a much
better implementation, that uses conditional connectors
and no longer cardinality(..)

- Additional sensor objects (introduced since needed for the

new implementation of AbsoluteSensor/RelativeSensor):
AbsolutePosition, AbsoluteVelocits, AbsoluteAngle,
AbsoluteAngularVelocity, RelativePosition, RelativeVelocity,
RelativeAngles, RelativeAngularVelocity, TransformAbsoluteVector,
TransformRelativeVector, and an "Internal" package with used
utility models

Location:

Modelica/trunk

Files:

: 5 modified

Modelica/Mechanics/MultiBody/Joints.mo (modified) (45 diffs)
Modelica/Mechanics/MultiBody/Sensors.mo (modified) (21 diffs)
Modelica/Mechanics/MultiBody/Types.mo (modified) (1 diff)
Modelica/Scripts/ConvertModelica_from_2.2.2_to_3.0.mos (modified) (1 diff)
ObsoleteModelica3.mo (modified) (8 diffs)

Legend:

: Unmodified
: Added
: Removed

Modelica/trunk/Modelica/Mechanics/MultiBody/Joints.mo

r809	r833
87	87	Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,
88	88	100}}), graphics={Text(
89		extent={{-142,62},{147,101}},
90		lineColor={0,0,0},
	89	extent={{-142,62},{147,101}},
	90	lineColor={0,0,0},
91	91	textString="n=%n"), Text(
92		extent={{-135,-117},{141,-60}},
93		textString="%name",
	92	extent={{-135,-117},{141,-60}},
	93	textString="%name",
94	94	lineColor={0,0,255})}),
95	95	Documentation(info="<HTML>
…	…
186	186	grid={1,1}), graphics={
187	187	Rectangle(
188		extent={{90,30},{100,70}},
189		pattern=LinePattern.None,
190		fillColor={192,192,192},
191		fillPattern=FillPattern.Solid,
192		lineColor={0,0,255}),
	188	extent={{90,30},{100,70}},
	189	pattern=LinePattern.None,
	190	fillColor={192,192,192},
	191	fillPattern=FillPattern.Solid,
	192	lineColor={0,0,255}),
193	193	Text(
194		extent={{-141,-92},{148,-53}},
195		lineColor={0,0,0},
196		textString="n=%n"),
	194	extent={{-141,-92},{148,-53}},
	195	lineColor={0,0,0},
	196	textString="n=%n"),
197	197	Text(
198		extent={{-132,-153},{144,-96}},
199		textString="%name",
	198	extent={{-132,-153},{144,-96}},
	199	textString="%name",
200	200	lineColor={0,0,255})}),
201	201	Documentation(info="<HTML>
…	…
251	251	100}}), graphics={
252	252	Text(
253		extent={{-146,70},{143,109}},
254		lineColor={0,0,0},
255		textString="n=%n"),
	253	extent={{-146,70},{143,109}},
	254	lineColor={0,0,0},
	255	textString="n=%n"),
256	256	Text(
257		extent={{-137,-125},{139,-68}},
258		textString="%name",
259		lineColor={0,0,255}),
	257	extent={{-137,-125},{139,-68}},
	258	textString="%name",
	259	lineColor={0,0,255}),
260	260	Rectangle(
261		extent={{-20,10},{20,-10}},
262		lineColor={0,0,0},
263		fillColor={192,192,192},
264		fillPattern=FillPattern.Solid),
	261	extent={{-20,10},{20,-10}},
	262	lineColor={0,0,0},
	263	fillColor={192,192,192},
	264	fillPattern=FillPattern.Solid),
265	265	Rectangle(
266		extent={{-100,-60},{-20,60}},
267		lineColor={0,0,0},
268		fillPattern=FillPattern.HorizontalCylinder,
269		fillColor={192,192,192}),
	266	extent={{-100,-60},{-20,60}},
	267	lineColor={0,0,0},
	268	fillPattern=FillPattern.HorizontalCylinder,
	269	fillColor={192,192,192}),
270	270	Rectangle(
271		extent={{20,-60},{100,60}},
272		lineColor={0,0,0},
273		fillPattern=FillPattern.HorizontalCylinder,
274		fillColor={192,192,192}),
275		Rectangle(extent={{-100,59},{-20,-60}}, lineColor={0,0,0}),
276		Rectangle(extent={{20,60},{100,-60}}, lineColor={0,0,0}),
	271	extent={{20,-60},{100,60}},
	272	lineColor={0,0,0},
	273	fillPattern=FillPattern.HorizontalCylinder,
	274	fillColor={192,192,192}),
	275	Rectangle(extent={{-100,59},{-20,-60}}, lineColor={0,0,0}),
	276	Rectangle(extent={{20,60},{100,-60}}, lineColor={0,0,0}),
277	277	Text(
278		extent={{-90,14},{-54,-11}},
279		lineColor={128,128,128},
280		textString="a"),
	278	extent={{-90,14},{-54,-11}},
	279	lineColor={128,128,128},
	280	textString="a"),
281	281	Text(
282		extent={{51,11},{87,-14}},
283		lineColor={128,128,128},
	282	extent={{51,11},{87,-14}},
	283	lineColor={128,128,128},
284	284	textString="b")}),
285	285	Documentation(info="<HTML>
…	…
371	371	grid={1,1}), graphics={
372	372	Text(
373		extent={{-146,70},{143,109}},
374		lineColor={0,0,0},
375		textString="n=%n"),
	373	extent={{-146,70},{143,109}},
	374	lineColor={0,0,0},
	375	textString="n=%n"),
376	376	Text(
377		extent={{-137,-125},{139,-68}},
378		textString="%name",
379		lineColor={0,0,255}),
	377	extent={{-137,-125},{139,-68}},
	378	textString="%name",
	379	lineColor={0,0,255}),
380	380	Rectangle(
381		extent={{-20,10},{20,-10}},
382		lineColor={0,0,0},
383		fillColor={192,192,192},
384		fillPattern=FillPattern.Solid),
	381	extent={{-20,10},{20,-10}},
	382	lineColor={0,0,0},
	383	fillColor={192,192,192},
	384	fillPattern=FillPattern.Solid),
385	385	Rectangle(
386		extent={{-100,-60},{-20,60}},
387		lineColor={0,0,0},
388		fillPattern=FillPattern.HorizontalCylinder,
389		fillColor={192,192,192}),
	386	extent={{-100,-60},{-20,60}},
	387	lineColor={0,0,0},
	388	fillPattern=FillPattern.HorizontalCylinder,
	389	fillColor={192,192,192}),
390	390	Rectangle(
391		extent={{20,-60},{100,60}},
392		lineColor={0,0,0},
393		fillPattern=FillPattern.HorizontalCylinder,
394		fillColor={192,192,192}),
395		Rectangle(extent={{-100,59},{-20,-60}}, lineColor={0,0,0}),
396		Rectangle(extent={{20,60},{100,-60}}, lineColor={0,0,0}),
	391	extent={{20,-60},{100,60}},
	392	lineColor={0,0,0},
	393	fillPattern=FillPattern.HorizontalCylinder,
	394	fillColor={192,192,192}),
	395	Rectangle(extent={{-100,59},{-20,-60}}, lineColor={0,0,0}),
	396	Rectangle(extent={{20,60},{100,-60}}, lineColor={0,0,0}),
397	397	Text(
398		extent={{-90,14},{-54,-11}},
399		lineColor={128,128,128},
400		textString="a"),
	398	extent={{-90,14},{-54,-11}},
	399	lineColor={128,128,128},
	400	textString="a"),
401	401	Text(
402		extent={{51,11},{87,-14}},
403		lineColor={128,128,128},
404		textString="b"),
	402	extent={{51,11},{87,-14}},
	403	lineColor={128,128,128},
	404	textString="b"),
405	405	Line(
406		points={{-91,-76},{-33,15},{30,-49},{87,61}},
407		color={255,0,0},
408		thickness=2,
	406	points={{-91,-76},{-33,15},{30,-49},{87,61}},
	407	color={255,0,0},
	408	thickness=2,
409	409	smooth=Smooth.None)}),
410	410	Diagram(coordinateSystem(
…	…
551	551	grid={1,1}), graphics={
552	552	Rectangle(
553		extent={{-20,10},{20,-10}},
554		lineColor={0,0,0},
555		fillColor={192,192,192},
556		fillPattern=FillPattern.Solid),
	553	extent={{-20,10},{20,-10}},
	554	lineColor={0,0,0},
	555	fillColor={192,192,192},
	556	fillPattern=FillPattern.Solid),
557	557	Rectangle(
558		extent={{-100,-60},{-30,60}},
559		lineColor={0,0,0},
560		fillPattern=FillPattern.HorizontalCylinder,
561		fillColor={192,192,192}),
	558	extent={{-100,-60},{-30,60}},
	559	lineColor={0,0,0},
	560	fillPattern=FillPattern.HorizontalCylinder,
	561	fillColor={192,192,192}),
562	562	Rectangle(
563		extent={{30,-60},{100,60}},
564		lineColor={0,0,0},
565		fillPattern=FillPattern.HorizontalCylinder,
566		fillColor={192,192,192}),
567		Rectangle(extent={{-100,59},{-30,-60}}, lineColor={0,0,0}),
568		Rectangle(extent={{30,60},{100,-60}}, lineColor={0,0,0}),
	563	extent={{30,-60},{100,60}},
	564	lineColor={0,0,0},
	565	fillPattern=FillPattern.HorizontalCylinder,
	566	fillColor={192,192,192}),
	567	Rectangle(extent={{-100,59},{-30,-60}}, lineColor={0,0,0}),
	568	Rectangle(extent={{30,60},{100,-60}}, lineColor={0,0,0}),
569	569	Text(
570		extent={{-90,14},{-54,-11}},
571		lineColor={128,128,128},
572		textString="a"),
	570	extent={{-90,14},{-54,-11}},
	571	lineColor={128,128,128},
	572	textString="a"),
573	573	Text(
574		extent={{51,11},{87,-14}},
575		lineColor={128,128,128},
576		textString="b"),
577		Line(points={{-20,70},{-60,70}}, color={0,0,0}),
578		Line(points={{-20,80},{-20,60}}, color={0,0,0}),
579		Line(points={{20,80},{20,60}}, color={0,0,0}),
580		Line(points={{20,70},{41,70}}, color={0,0,0}),
	574	extent={{51,11},{87,-14}},
	575	lineColor={128,128,128},
	576	textString="b"),
	577	Line(points={{-20,70},{-60,70}}, color={0,0,0}),
	578	Line(points={{-20,80},{-20,60}}, color={0,0,0}),
	579	Line(points={{20,80},{20,60}}, color={0,0,0}),
	580	Line(points={{20,70},{41,70}}, color={0,0,0}),
581	581	Rectangle(
582		extent={{-10,100},{10,50}},
583		lineColor={0,0,0},
584		fillPattern=FillPattern.VerticalCylinder,
585		fillColor={192,192,192}),
	582	extent={{-10,100},{10,50}},
	583	lineColor={0,0,0},
	584	fillPattern=FillPattern.VerticalCylinder,
	585	fillColor={192,192,192}),
586	586	Polygon(
587		points={{-10,30},{10,30},{30,50},{-30,50},{-10,30}},
588		lineColor={0,0,0},
589		fillColor={192,192,192},
590		fillPattern=FillPattern.Solid),
591		Line(points={{-60,60},{-60,90}}, color={0,0,0}),
	587	points={{-10,30},{10,30},{30,50},{-30,50},{-10,30}},
	588	lineColor={0,0,0},
	589	fillColor={192,192,192},
	590	fillPattern=FillPattern.Solid),
	591	Line(points={{-60,60},{-60,90}}, color={0,0,0}),
592	592	Rectangle(
593		extent={{-30,11},{10,-10}},
594		lineColor={0,0,0},
595		fillColor={192,192,192},
596		fillPattern=FillPattern.Solid),
	593	extent={{-30,11},{10,-10}},
	594	lineColor={0,0,0},
	595	fillColor={192,192,192},
	596	fillPattern=FillPattern.Solid),
597	597	Polygon(
598		points={{10,30},{30,50},{30,-50},{10,-30},{10,30}},
599		lineColor={0,0,0},
600		fillColor={192,192,192},
601		fillPattern=FillPattern.Solid),
	598	points={{10,30},{30,50},{30,-50},{10,-30},{10,30}},
	599	lineColor={0,0,0},
	600	fillColor={192,192,192},
	601	fillPattern=FillPattern.Solid),
602	602	Text(
603		extent={{-141,-116},{148,-77}},
604		lineColor={0,0,0},
605		textString="n=%n"),
	603	extent={{-141,-116},{148,-77}},
	604	lineColor={0,0,0},
	605	textString="n=%n"),
606	606	Text(
607		extent={{-140,-172},{136,-115}},
608		textString="%name",
	607	extent={{-140,-172},{136,-115}},
	608	textString="%name",
609	609	lineColor={0,0,255})}),
610	610	Diagram(coordinateSystem(
…	…
785	785	grid={1,1}), graphics={
786	786	Rectangle(
787		extent={{-100,-50},{0,50}},
788		lineColor={0,0,0},
789		fillPattern=FillPattern.HorizontalCylinder,
790		fillColor={192,192,192}),
	787	extent={{-100,-50},{0,50}},
	788	lineColor={0,0,0},
	789	fillPattern=FillPattern.HorizontalCylinder,
	790	fillColor={192,192,192}),
791	791	Rectangle(
792		extent={{0,-30},{100,30}},
793		lineColor={0,0,0},
794		fillPattern=FillPattern.HorizontalCylinder,
795		fillColor={192,192,192}),
796		Line(points={{0,-50},{0,50}}, color={0,0,0}),
	792	extent={{0,-30},{100,30}},
	793	lineColor={0,0,0},
	794	fillPattern=FillPattern.HorizontalCylinder,
	795	fillColor={192,192,192}),
	796	Line(points={{0,-50},{0,50}}, color={0,0,0}),
797	797	Text(
798		extent={{-126,116},{134,56}},
799		textString="%name",
800		lineColor={0,0,255}),
	798	extent={{-126,116},{134,56}},
	799	textString="%name",
	800	lineColor={0,0,255}),
801	801	Text(
802		extent={{-118,-65},{120,-102}},
803		lineColor={0,0,0},
	802	extent={{-118,-65},{120,-102}},
	803	lineColor={0,0,0},
804	804	textString="n=%n")}));
805	805
…	…
946	946	grid={1,1}), graphics={
947	947	Rectangle(
948		extent={{-100,15},{-65,-15}},
949		lineColor={0,0,0},
950		fillPattern=FillPattern.HorizontalCylinder,
951		fillColor={235,235,235}),
	948	extent={{-100,15},{-65,-15}},
	949	lineColor={0,0,0},
	950	fillPattern=FillPattern.HorizontalCylinder,
	951	fillColor={235,235,235}),
952	952	Ellipse(
953		extent={{-80,-80},{80,80}},
954		lineColor={160,160,164},
955		fillColor={192,192,192},
956		fillPattern=FillPattern.Solid),
	953	extent={{-80,-80},{80,80}},
	954	lineColor={160,160,164},
	955	fillColor={192,192,192},
	956	fillPattern=FillPattern.Solid),
957	957	Ellipse(
958		extent={{-60,-60},{60,60}},
959		lineColor={160,160,164},
960		fillColor={255,255,255},
961		fillPattern=FillPattern.Solid),
	958	extent={{-60,-60},{60,60}},
	959	lineColor={160,160,164},
	960	fillColor={255,255,255},
	961	fillPattern=FillPattern.Solid),
962	962	Text(
963		extent={{-134,-70},{126,-130}},
964		textString="%name",
965		lineColor={0,0,255}),
	963	extent={{-134,-70},{126,-130}},
	964	textString="%name",
	965	lineColor={0,0,255}),
966	966	Rectangle(
967		extent={{12,82},{80,-82}},
968		lineColor={255,255,255},
969		fillColor={255,255,255},
970		fillPattern=FillPattern.Solid),
	967	extent={{12,82},{80,-82}},
	968	lineColor={255,255,255},
	969	fillColor={255,255,255},
	970	fillPattern=FillPattern.Solid),
971	971	Rectangle(
972		extent={{56,15},{100,-15}},
973		lineColor={0,0,0},
974		fillPattern=FillPattern.HorizontalCylinder,
975		fillColor={235,235,235}),
	972	extent={{56,15},{100,-15}},
	973	lineColor={0,0,0},
	974	fillPattern=FillPattern.HorizontalCylinder,
	975	fillColor={235,235,235}),
976	976	Line(
977		points={{12,78},{12,-78}},
978		color={0,0,0},
979		thickness=2),
	977	points={{12,78},{12,-78}},
	978	color={0,0,0},
	979	thickness=2),
980	980	Ellipse(
981		extent={{-52,-40},{80,40}},
982		lineColor={160,160,164},
983		fillColor={192,192,192},
984		fillPattern=FillPattern.Solid),
	981	extent={{-52,-40},{80,40}},
	982	lineColor={160,160,164},
	983	fillColor={192,192,192},
	984	fillPattern=FillPattern.Solid),
985	985	Ellipse(
986		extent={{-32,-20},{60,26}},
987		lineColor={160,160,164},
988		fillColor={255,255,255},
989		fillPattern=FillPattern.Solid),
	986	extent={{-32,-20},{60,26}},
	987	lineColor={160,160,164},
	988	fillColor={255,255,255},
	989	fillPattern=FillPattern.Solid),
990	990	Polygon(
991		points={{-22,-54},{-60,0},{-22,50},{40,52},{-22,-54}},
992		pattern=LinePattern.None,
993		fillColor={255,255,255},
994		fillPattern=FillPattern.Solid,
995		lineColor={0,0,255}),
	991	points={{-22,-54},{-60,0},{-22,50},{40,52},{-22,-54}},
	992	pattern=LinePattern.None,
	993	fillColor={255,255,255},
	994	fillPattern=FillPattern.Solid,
	995	lineColor={0,0,255}),
996	996	Line(
997		points={{12,78},{12,-20}},
998		color={0,0,0},
999		thickness=2),
	997	points={{12,78},{12,-20}},
	998	color={0,0,0},
	999	thickness=2),
1000	1000	Line(
1001		points={{32,38},{-12,-36}},
1002		color={0,0,0},
	1001	points={{32,38},{-12,-36}},
	1002	color={0,0,0},
1003	1003	thickness=2)}),
1004	1004	Diagram(coordinateSystem(
…	…
1145	1145	grid={1,1}), graphics={
1146	1146	Rectangle(
1147		extent={{-30,-60},{-10,60}},
1148		lineColor={0,0,0},
1149		pattern=LinePattern.None,
1150		fillColor={192,192,192},
1151		fillPattern=FillPattern.Solid),
	1147	extent={{-30,-60},{-10,60}},
	1148	lineColor={0,0,0},
	1149	pattern=LinePattern.None,
	1150	fillColor={192,192,192},
	1151	fillPattern=FillPattern.Solid),
1152	1152	Rectangle(
1153		extent={{10,-60},{30,60}},
1154		lineColor={0,0,0},
1155		pattern=LinePattern.None,
1156		fillColor={192,192,192},
1157		fillPattern=FillPattern.Solid),
	1153	extent={{10,-60},{30,60}},
	1154	lineColor={0,0,0},
	1155	pattern=LinePattern.None,
	1156	fillColor={192,192,192},
	1157	fillPattern=FillPattern.Solid),
1158	1158	Rectangle(
1159		extent={{-100,-10},{-30,10}},
1160		lineColor={0,0,0},
1161		pattern=LinePattern.None,
1162		fillColor={192,192,192},
1163		fillPattern=FillPattern.Solid),
	1159	extent={{-100,-10},{-30,10}},
	1160	lineColor={0,0,0},
	1161	pattern=LinePattern.None,
	1162	fillColor={192,192,192},
	1163	fillPattern=FillPattern.Solid),
1164	1164	Rectangle(
1165		extent={{100,-10},{30,10}},
1166		lineColor={0,0,0},
1167		pattern=LinePattern.None,
1168		fillColor={192,192,192},
1169		fillPattern=FillPattern.Solid),
	1165	extent={{100,-10},{30,10}},
	1166	lineColor={0,0,0},
	1167	pattern=LinePattern.None,
	1168	fillColor={192,192,192},
	1169	fillPattern=FillPattern.Solid),
1170	1170	Text(
1171		extent={{-131,-74},{133,-112}},
1172		lineColor={0,0,0},
1173		textString="n=%n"),
	1171	extent={{-131,-74},{133,-112}},
	1172	lineColor={0,0,0},
	1173	textString="n=%n"),
1174	1174	Text(
1175		extent={{-124,127},{136,67}},
1176		textString="%name",
	1175	extent={{-124,127},{136,67}},
	1176	textString="%name",
1177	1177	lineColor={0,0,255})}));
1178	1178
…	…
1363	1363	grid={1,1}), graphics={
1364	1364	Ellipse(
1365		extent={{-70,-70},{70,70}},
1366		lineColor={0,0,0},
1367		fillPattern=FillPattern.Sphere,
1368		fillColor={192,192,192}),
	1365	extent={{-70,-70},{70,70}},
	1366	lineColor={0,0,0},
	1367	fillPattern=FillPattern.Sphere,
	1368	fillColor={192,192,192}),
1369	1369	Ellipse(
1370		extent={{-49,-50},{51,50}},
1371		lineColor={128,128,128},
1372		fillColor={255,255,255},
1373		fillPattern=FillPattern.Solid),
	1370	extent={{-49,-50},{51,50}},
	1371	lineColor={128,128,128},
	1372	fillColor={255,255,255},
	1373	fillPattern=FillPattern.Solid),
1374	1374	Rectangle(
1375		extent={{30,70},{71,-68}},
1376		lineColor={255,255,255},
1377		fillColor={255,255,255},
1378		fillPattern=FillPattern.Solid),
	1375	extent={{30,70},{71,-68}},
	1376	lineColor={255,255,255},
	1377	fillColor={255,255,255},
	1378	fillPattern=FillPattern.Solid),
1379	1379	Rectangle(
1380		extent={{-100,10},{-68,-10}},
1381		lineColor={0,0,0},
1382		fillPattern=FillPattern.HorizontalCylinder,
1383		fillColor={192,192,192}),
	1380	extent={{-100,10},{-68,-10}},
	1381	lineColor={0,0,0},
	1382	fillPattern=FillPattern.HorizontalCylinder,
	1383	fillColor={192,192,192}),
1384	1384	Rectangle(
1385		extent={{23,10},{100,-10}},
1386		lineColor={0,0,0},
1387		fillPattern=FillPattern.HorizontalCylinder,
1388		fillColor={192,192,192}),
	1385	extent={{23,10},{100,-10}},
	1386	lineColor={0,0,0},
	1387	fillPattern=FillPattern.HorizontalCylinder,
	1388	fillColor={192,192,192}),
1389	1389	Ellipse(
1390		extent={{-24,25},{26,-25}},
1391		lineColor={0,0,0},
1392		fillPattern=FillPattern.Sphere,
1393		fillColor={160,160,164}),
	1390	extent={{-24,25},{26,-25}},
	1391	lineColor={0,0,0},
	1392	fillPattern=FillPattern.Sphere,
	1393	fillColor={160,160,164}),
1394	1394	Text(
1395		extent={{-100,-132},{100,-72}},
1396		textString="%name",
	1395	extent={{-100,-132},{100,-72}},
	1396	textString="%name",
1397	1397	lineColor={0,0,255})}),
1398	1398	Diagram(coordinateSystem(
…	…
1725	1725	grid={1,1}), graphics={
1726	1726	Line(
1727		points={{-86,31},{-74,61},{-49,83},{-17,92},{19,88},{40,69},{59,48}},
1728		color={160,160,164},
1729		thickness=2),
	1727	points={{-86,31},{-74,61},{-49,83},{-17,92},{19,88},{40,69},{59,48}},
	1728
	1729	color={160,160,164},
	1730	thickness=2),
1730	1731	Polygon(
1731		points={{90,0},{50,20},{50,-20},{90,0}},
1732		lineColor={0,0,0},
1733		fillColor={192,192,192},