Skip to content

Use vector for visualization of physical quantities #4248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobolar merged 3 commits into from
Jan 12, 2024
Merged

Use vector for visualization of physical quantities #4248

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e72e516
Use Vector for visualization of forces and torques
tobolar Jan 10, 2024
7d555ad
Use Vector for visualization of positions in Sensors and Joints
tobolar Jan 10, 2024
9a76cd9
Use Vector for visualization
tobolar Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Modelica/Mechanics/MultiBody/Forces/Force.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ model Force
annotation (Dialog(group="if animation = true", enable=animation));

protected
Visualizers.Advanced.Arrow forceArrow(
Visualizers.Advanced.Vector forceArrow(
color=forceColor,
specularCoefficient=specularCoefficient,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Force,
R=frame_b.R,
r=frame_b.r_0,
r_head=-frame_b.f,
coordinates=-frame_b.f,
headAtOrigin=true) if world.enableAnimation and animation;
Visualizers.Advanced.Shape connectionLine(
shapeType="cylinder",
Expand Down
9 changes: 5 additions & 4 deletions Modelica/Mechanics/MultiBody/Forces/ForceAndTorque.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,22 +47,23 @@ model ForceAndTorque
annotation (Dialog(group="if animation = true", enable=animation));

protected
Visualizers.Advanced.Arrow forceArrow(
Visualizers.Advanced.Vector forceArrow(
color=forceColor,
specularCoefficient=specularCoefficient,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Force,
R=frame_b.R,
r=frame_b.r_0,
headAtOrigin=true,
r_head=-frame_b.f) if world.enableAnimation and animation;
Visualizers.Advanced.DoubleArrow torqueArrow(
coordinates=-frame_b.f) if world.enableAnimation and animation;
Visualizers.Advanced.Vector torqueArrow(
color=torqueColor,
specularCoefficient=specularCoefficient,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Torque,
R=frame_b.R,
r=frame_b.r_0,
headAtOrigin=true,
r_head=-frame_b.t) if world.enableAnimation and animation;
twoHeadedArrow=true,
coordinates=-frame_b.t) if world.enableAnimation and animation;
Visualizers.Advanced.Shape connectionLine(
shapeType="cylinder",
lengthDirection = to_unit1(basicForce.r_0),
Expand Down
5 changes: 3 additions & 2 deletions Modelica/Mechanics/MultiBody/Forces/Torque.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,15 @@ model Torque
annotation (Dialog(group="if animation = true", enable=animation));

protected
Visualizers.Advanced.DoubleArrow torqueArrow(
Visualizers.Advanced.Vector torqueArrow(
color=torqueColor,
specularCoefficient=specularCoefficient,
R=frame_b.R,
r=frame_b.r_0,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Torque,
headAtOrigin=true,
r_head=-frame_b.t) if world.enableAnimation and animation;
twoHeadedArrow=true,
coordinates=-frame_b.t) if world.enableAnimation and animation;
Visualizers.Advanced.Shape connectionLine(
shapeType="cylinder",
lengthDirection = to_unit1(basicTorque.r_0),
Expand Down
4 changes: 2 additions & 2 deletions Modelica/Mechanics/MultiBody/Forces/WorldForce.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ model WorldForce
annotation (Dialog(group="if animation = true", enable=animation));

protected
Visualizers.Advanced.Arrow arrow(
Visualizers.Advanced.Vector arrow(
color=color,
specularCoefficient=specularCoefficient,
R=frame_b.R,
r=frame_b.r_0,
headAtOrigin=true,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Force,
r_head=-frame_b.f) if world.enableAnimation and animation;
coordinates=-frame_b.f) if world.enableAnimation and animation;

public
Internal.BasicWorldForce basicWorldForce(resolveInFrame=resolveInFrame)
Expand Down
9 changes: 5 additions & 4 deletions Modelica/Mechanics/MultiBody/Forces/WorldForceAndTorque.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,22 @@ model WorldForceAndTorque
annotation (Dialog(group="if animation = true", enable=animation));

protected
Visualizers.Advanced.Arrow forceArrow(
Visualizers.Advanced.Vector forceArrow(
color=forceColor,
specularCoefficient=specularCoefficient,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Force,
R=frame_b.R,
r=frame_b.r_0,
r_head=-frame_b.f,
coordinates=-frame_b.f,
headAtOrigin=true) if world.enableAnimation and animation;
Visualizers.Advanced.DoubleArrow torqueArrow(
Visualizers.Advanced.Vector torqueArrow(
color=torqueColor,
specularCoefficient=specularCoefficient,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Torque,
R=frame_b.R,
r=frame_b.r_0,
r_head=-frame_b.t,
coordinates=-frame_b.t,
twoHeadedArrow=true,
headAtOrigin=true) if world.enableAnimation and animation;
public
Internal.BasicWorldForce basicWorldForce(resolveInFrame=resolveInFrame)
Expand Down
5 changes: 3 additions & 2 deletions Modelica/Mechanics/MultiBody/Forces/WorldTorque.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ model WorldTorque
annotation (Dialog(group="if animation = true", enable=animation));

protected
Visualizers.Advanced.DoubleArrow arrow(
Visualizers.Advanced.Vector arrow(
color=color,
specularCoefficient=specularCoefficient,
R=frame_b.R,
r=frame_b.r_0,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Torque,
headAtOrigin=true,
r_head=-frame_b.t) if world.enableAnimation and animation;
twoHeadedArrow=true,
coordinates=-frame_b.t) if world.enableAnimation and animation;
public
Internal.BasicWorldTorque basicWorldTorque(resolveInFrame=resolveInFrame)
annotation (Placement(transformation(extent={{-10,-10},{10,10}})));
Expand Down
5 changes: 3 additions & 2 deletions Modelica/Mechanics/MultiBody/Joints/FreeMotion.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,11 @@ model FreeMotion
"Orientation object from frame_a to frame_b at initial time";

protected
Visualizers.Advanced.Arrow arrow(
r_head=r_rel_a,
Visualizers.Advanced.Vector arrow(
coordinates=r_rel_a,
color=arrowColor,
specularCoefficient=specularCoefficient,
quantity=Types.VectorQuantity.RelativePosition,
r=frame_a.r_0,
R=frame_a.R) if world.enableAnimation and animation;

Expand Down
7 changes: 4 additions & 3 deletions Modelica/Mechanics/MultiBody/Sensors/AbsoluteSensor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,11 @@ protected
protected
outer Modelica.Mechanics.MultiBody.World world;

Modelica.Mechanics.MultiBody.Visualizers.Advanced.Arrow arrow(
r_head=frame_a.r_0,
Modelica.Mechanics.MultiBody.Visualizers.Advanced.Vector arrow(
coordinates=frame_a.r_0,
quantity=Types.VectorQuantity.RelativePosition,
color=arrowColor,
specularCoefficient) if world.enableAnimation and animation;
specularCoefficient=specularCoefficient) if world.enableAnimation and animation;

protected
AbsoluteVelocity absoluteVelocity(resolveInFrame=Modelica.Mechanics.MultiBody.Types.ResolveInFrameA.world) if get_a
Expand Down
4 changes: 2 additions & 2 deletions Modelica/Mechanics/MultiBody/Sensors/CutForce.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ model CutForce "Measure cut force vector"
extends Modelica.Mechanics.MultiBody.Sensors.Internal.PartialCutForceSensor;

protected
Visualizers.Advanced.Arrow forceArrow(
Visualizers.Advanced.Vector forceArrow(
color=forceColor,
specularCoefficient=specularCoefficient,
R=frame_b.R,
r=frame_b.r_0,
headAtOrigin=true,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Force,
r_head=-frame_a.f*(if positiveSign then +1 else -1)) if world.enableAnimation and animation;
coordinates=-frame_a.f*(if positiveSign then +1 else -1)) if world.enableAnimation and animation;

Internal.BasicCutForce cutForce(resolveInFrame=resolveInFrame, positiveSign=
positiveSign)
Expand Down
9 changes: 5 additions & 4 deletions Modelica/Mechanics/MultiBody/Sensors/CutForceAndTorque.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,23 @@ model CutForceAndTorque "Measure cut force and cut torque vector"

protected
parameter Integer csign=if positiveSign then +1 else -1;
Visualizers.Advanced.Arrow forceArrow(
Visualizers.Advanced.Vector forceArrow(
color=forceColor,
specularCoefficient=specularCoefficient,
R=frame_b.R,
r=frame_b.r_0,
headAtOrigin=true,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Force,
r_head=-frame_a.f*csign) if world.enableAnimation and animation;
Visualizers.Advanced.DoubleArrow torqueArrow(
coordinates=-frame_a.f*csign) if world.enableAnimation and animation;
Visualizers.Advanced.Vector torqueArrow(
color=torqueColor,
specularCoefficient=specularCoefficient,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Torque,
R=frame_b.R,
r=frame_b.r_0,
headAtOrigin=true,
r_head=-frame_a.t*csign) if world.enableAnimation and animation;
twoHeadedArrow=true,
coordinates=-frame_a.t*csign) if world.enableAnimation and animation;
Internal.BasicCutForce cutForce(resolveInFrame=resolveInFrame, positiveSign=
positiveSign)
annotation (Placement(transformation(extent={{-60,-10},{-40,10}})));
Expand Down
5 changes: 3 additions & 2 deletions Modelica/Mechanics/MultiBody/Sensors/CutTorque.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ model CutTorque "Measure cut torque vector"
extends Modelica.Mechanics.MultiBody.Sensors.Internal.PartialCutForceSensor;

protected
Visualizers.Advanced.DoubleArrow torqueArrow(
Visualizers.Advanced.Vector torqueArrow(
color=torqueColor,
specularCoefficient=specularCoefficient,
quantity=Modelica.Mechanics.MultiBody.Types.VectorQuantity.Torque,
R=frame_b.R,
r=frame_b.r_0,
headAtOrigin=true,
r_head=-frame_a.t*(if positiveSign then +1 else -1)) if world.enableAnimation and animation;
twoHeadedArrow=true,
coordinates=-frame_a.t*(if positiveSign then +1 else -1)) if world.enableAnimation and animation;
Internal.BasicCutTorque cutTorque(resolveInFrame=resolveInFrame, positiveSign=
positiveSign)
annotation (Placement(transformation(extent={{-62,-10},{-42,10}})));
Expand Down
5 changes: 3 additions & 2 deletions Modelica/Mechanics/MultiBody/Sensors/Distance.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ model Distance
"Prevent zero-division if distance between frame_a and frame_b is zero"
annotation (Dialog(tab="Advanced"));
protected
Modelica.Mechanics.MultiBody.Visualizers.Advanced.Arrow arrow(
Modelica.Mechanics.MultiBody.Visualizers.Advanced.Vector arrow(
r=frame_a.r_0,
r_head=frame_b.r_0 - frame_a.r_0,
coordinates=frame_b.r_0 - frame_a.r_0,
quantity=Types.VectorQuantity.RelativePosition,
color=arrowColor,
specularCoefficient=specularCoefficient) if world.enableAnimation and animation;

Expand Down
11 changes: 6 additions & 5 deletions Modelica/Mechanics/MultiBody/Sensors/RelativeSensor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,12 @@ protected
protected
outer Modelica.Mechanics.MultiBody.World world;

Modelica.Mechanics.MultiBody.Visualizers.Advanced.Arrow arrow(
Modelica.Mechanics.MultiBody.Visualizers.Advanced.Vector arrow(
r=frame_a.r_0,
r_head=frame_b.r_0 - frame_a.r_0,
coordinates=frame_b.r_0 - frame_a.r_0,
quantity=Types.VectorQuantity.RelativePosition,
color=arrowColor,
specularCoefficient) if world.enableAnimation and animation;
specularCoefficient=specularCoefficient) if world.enableAnimation and animation;
equation
connect(relativePosition.frame_a, frame_a) annotation (Line(
points={{-80,0},{-100,0}},
Expand Down Expand Up @@ -211,7 +212,7 @@ equation
color={95,95,95},
pattern=LinePattern.Dot));
connect(frame_resolve, relativePosition.frame_resolve) annotation (Line(
points={{100,80},{50,80},{50,20},{-30,20},{-30,8.1},{-60,8.1}},
points={{100,80},{50,80},{50,20},{-30,20},{-30,8},{-60,8}},
color={95,95,95},
pattern=LinePattern.Dot));
connect(frame_resolve, zeroForce3.frame_a) annotation (Line(
Expand All @@ -220,7 +221,7 @@ equation
pattern=LinePattern.Dot));
connect(relativeAngularVelocity.frame_resolve, frame_resolve) annotation (
Line(
points={{70,-21.9},{70,-21.9},{70,20},{50,20},{50,80},{100,80}},
points={{70,-22},{70,-22},{70,20},{50,20},{50,80},{100,80}},
color={95,95,95},
pattern=LinePattern.Dot));
connect(der2.y, transformVector_a_rel.r_in) annotation (Line(
Expand Down