From 0cebbbd311bd3e7c9081e7d8843f5081255039e9 Mon Sep 17 00:00:00 2001 From: tobolar Date: Fri, 10 Nov 2023 16:32:54 +0100 Subject: [PATCH] Inherit from PartialAbsoluteSensor from Interfaces --- .../Internal/BasicAbsoluteAngularVelocity.mo | 4 ---- .../Sensors/Internal/BasicAbsolutePosition.mo | 4 ---- .../Internal/PartialAbsoluteBaseSensor.mo | 24 +++---------------- 3 files changed, 3 insertions(+), 29 deletions(-) diff --git a/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicAbsoluteAngularVelocity.mo b/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicAbsoluteAngularVelocity.mo index 90e2279ced..ffcf5ee05d 100644 --- a/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicAbsoluteAngularVelocity.mo +++ b/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicAbsoluteAngularVelocity.mo @@ -28,10 +28,6 @@ equation annotation ( Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={ - Text( - extent={{-130,76},{131,124}}, - textString="%name", - textColor={0,0,255}), Text( extent={{-50,-14},{50,-54}}, textColor={64,64,64}, diff --git a/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicAbsolutePosition.mo b/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicAbsolutePosition.mo index 41aa7dcd9c..f2ae220891 100644 --- a/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicAbsolutePosition.mo +++ b/Modelica/Mechanics/MultiBody/Sensors/Internal/BasicAbsolutePosition.mo @@ -28,10 +28,6 @@ equation annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100, -100},{100,100}}), graphics={ - Text( - extent={{-127,75},{134,123}}, - textString="%name", - textColor={0,0,255}), Text( extent={{-50,-14},{50,-54}}, textColor={64,64,64}, diff --git a/Modelica/Mechanics/MultiBody/Sensors/Internal/PartialAbsoluteBaseSensor.mo b/Modelica/Mechanics/MultiBody/Sensors/Internal/PartialAbsoluteBaseSensor.mo index 90f95a7067..43fcddeed6 100644 --- a/Modelica/Mechanics/MultiBody/Sensors/Internal/PartialAbsoluteBaseSensor.mo +++ b/Modelica/Mechanics/MultiBody/Sensors/Internal/PartialAbsoluteBaseSensor.mo @@ -1,16 +1,10 @@ within Modelica.Mechanics.MultiBody.Sensors.Internal; model PartialAbsoluteBaseSensor "Base class for absolute sensor models defined by equations (frame_resolve must be connected exactly once)" - extends PartialAbsoluteSensor; - - Modelica.Mechanics.MultiBody.Interfaces.Frame_resolve frame_resolve - "Coordinate system in which output vector(s) is optionally resolved" - annotation (Placement(transformation(extent={{-16,-16},{16,16}}, - rotation=-90, - origin={0,-100}))); + extends Interfaces.PartialAbsoluteSensor( + break y); equation - assert(cardinality(frame_resolve) == 1, "Connector frame_resolve must be connected exactly once"); frame_a.f = zeros(3); frame_a.t = zeros(3); frame_resolve.f = zeros(3); @@ -18,20 +12,8 @@ equation annotation (Icon(coordinateSystem(preserveAspectRatio=true, extent={{-100,-100},{100,100}}), graphics={ - Text( - extent={{-108,43},{-72,18}}, - textColor={95,95,95}, - textString="a"), - Line( - points={{-70,0},{-96,0},{-96,0}}), - Line( - points={{0,15},{0,-15}}, - color={0,0,127}, - origin={85,0}, - rotation=90), Line( - points={{0,-95},{0,-95},{0,-70},{0,-70}}, - pattern=LinePattern.Dot), + points={{-70,0},{-100,0}}), Text( extent={{0,-75},{131,-100}}, textColor={95,95,95},