From 59a3917d9a149fc1dcb207ce7b26cd62059a98ed Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Mon, 14 Oct 2024 14:13:55 +0200 Subject: [PATCH 01/16] 1) changed default sensor display value from 'value' to ' 0.0 ', 2) use 'digits' as significantDigits instead of decimal places (nachkommastellen), i.e. 'DynamicSelect(' 0.0 ', ' '+String(value,significantDigits=digits)+' ')' --- .../Sensors/DifferenceSensorSelect.mo | 6 ++---- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 10 +++------- .../DifferenceTwoPhaseSensorSensorSelect.mo | 6 ++---- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 10 +++------- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 14 ++++---------- ThermofluidStream/Sensors/SingleFlowSensor.mo | 6 ++---- ThermofluidStream/Sensors/SingleSensorSelect.mo | 6 ++---- ThermofluidStream/Sensors/SingleSensorX.mo | 6 ++---- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 6 ++---- .../Undirected/Sensors/Internal/PartialSensor.mo | 2 +- .../Undirected/Sensors/MultiSensor_Tpm.mo | 2 +- .../Undirected/Sensors/SingleFlowSensor.mo | 2 +- .../Undirected/Sensors/SingleSensorSelect.mo | 2 +- .../Undirected/Sensors/SingleSensorX.mo | 4 ++-- .../Undirected/Sensors/TwoPhaseSensorSelect.mo | 2 +- 15 files changed, 29 insertions(+), 55 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo index 896428d0..11af7019 100644 --- a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo @@ -16,7 +16,7 @@ model DifferenceSensorSelect "Sensor for selectable quantatiy difference" Documentation(info="

Medium Model for the negative input of the sensor. Make sure it is the same for the stream the sensors inputs are connected.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits"; + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed"; parameter SI.Density rho_min = dropOfCommons.rho_min "Minimum density" annotation(Dialog(tab="Advanced", group="Regularization")); parameter Quantities quantity "Measured quantity"; @@ -124,9 +124,7 @@ equation Text( extent={{-60,30},{60,-30}}, textColor={28,108,200}, - textString=DynamicSelect("value", String( - value, - format="1."+String(digits)+"f"))), + textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,-40},{150,-70}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index 65c208e1..3bebaf76 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -15,7 +15,7 @@ model DifferenceSensor_Tp "Sensor for Temperature and pressure difference" Documentation(info="

Medium Model for the negative input of the sensor. Make sure it is the same for the stream the sensors inputs are connected.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits"; + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed"; parameter ThermofluidStream.Sensors.Internal.Types.TemperatureUnit temperatureUnit = "K" "Temperature unit (display and output)" annotation(choicesAllMatching = true, Evaluate = true); parameter ThermofluidStream.Sensors.Internal.Types.PressureUnit pressureUnit = "Pa" "Pressure unit (display and output)" @@ -125,15 +125,11 @@ equation Text( extent={{-60,55},{60,5}}, textColor={28,108,200}, - textString=DynamicSelect("T", String( - T, - format="1."+String(digits)+"f"))), + textString=DynamicSelect("T", " "+String(T,significantDigits=digits)+" ")), Text( extent={{-60,-5},{60,-55}}, textColor={28,108,200}, - textString=DynamicSelect("p", String( - p, - format="1."+String(digits)+"f"))), + textString=DynamicSelect("p", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, extent={{70,45},{130,15}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo index d7b5e076..befb7e58 100644 --- a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo @@ -17,7 +17,7 @@ model DifferenceTwoPhaseSensorSensorSelect "Sensor for selectable quantatiy diff

Medium Model for the negative input of the sensor. Make sure it is the same for the stream the sensors inputs are connected.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits"; + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed"; parameter Quantities quantity "Measured quantity"; final parameter String quantityString= @@ -117,9 +117,7 @@ equation Text( extent={{-60,30},{60,-30}}, textColor={28,108,200}, - textString=DynamicSelect("value", String( - value, - format="1."+String(digits)+"f"))), + textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,-70},{150,-40}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index c8502b92..91192ceb 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -10,7 +10,7 @@ model MultiSensor_Tp "Temperature and pressure sensor" Documentation(info="

Medium Model for the sensor. Make sure it is the same as for all lines the sensors input is connected.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits"; + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed"; parameter ThermofluidStream.Sensors.Internal.Types.TemperatureUnit temperatureUnit = "K" "Temperature unit (display and output)" annotation(choicesAllMatching = true, Evaluate = true); parameter ThermofluidStream.Sensors.Internal.Types.PressureUnit pressureUnit = "Pa" "Pressure unit (display and output)" @@ -101,15 +101,11 @@ equation Text( extent={{-60,55},{60,5}}, textColor={28,108,200}, - textString=DynamicSelect("T", String( - T, - format="1."+String(digits)+"f"))), + textString=DynamicSelect("T", " "+String(T,significantDigits=digits)+" ")), Text( extent={{-60,-5},{60,-55}}, textColor={28,108,200}, - textString=DynamicSelect("p", String( - p, - format="1."+String(digits)+"f"))), + textString=DynamicSelect("p", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, extent={{70,45},{130,15}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index fed56c7c..227eb6b8 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -11,7 +11,7 @@ model MultiSensor_Tpm "Sensor for temperature, pressure and mass flow rate" Documentation(info="

Medium Model for the sensor. Make sure it is the same as for all lines the sensors input is connected.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits"; + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed"; parameter ThermofluidStream.Sensors.Internal.Types.TemperatureUnit temperatureUnit = "K" "Temperature unit (display and output)" annotation(choicesAllMatching = true, Evaluate = true); parameter ThermofluidStream.Sensors.Internal.Types.PressureUnit pressureUnit = "Pa" "Pressure unit (display and output)" @@ -169,21 +169,15 @@ equation Text( extent={{-60,80},{60,30}}, textColor={28,108,200}, - textString=DynamicSelect("T", String( - T, - format="1."+String(digits)+"f"))), + textString=DynamicSelect("T", " "+String(T,significantDigits=digits)+" ")), Text( extent={{-60,30},{60,-20}}, textColor={28,108,200}, - textString=DynamicSelect("p", String( - p, - format="1."+String(digits)+"f"))), + textString=DynamicSelect("p", " "+String(p,significantDigits=digits)+" ")), Text( extent={{-60,-20},{60,-70}}, textColor={28,108,200}, - textString=DynamicSelect("m", String( - m_flow, - format="1."+String(digits)+"f"))), + textString=DynamicSelect("m", " "+String(m_flow,significantDigits=digits)+" ")), Line(visible=outputTemperature, points={{60,60},{78,60}}, color={0,0,127}), diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index 15dfbe24..5ebcc8f8 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -12,7 +12,7 @@ model SingleFlowSensor "Flow rate sensor"

Medium Model for the sensor. Make sure it is the same as for all lines the sensors input is connected.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits"; + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed"; parameter Quantities quantity "Measured quantity"; final parameter String quantityString= @@ -109,9 +109,7 @@ equation Text( extent={{-60,90},{60,30}}, textColor={28,108,200}, - textString=DynamicSelect("value", String( - value, - format="1."+String(digits)+"f"))), + textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,130},{150,100}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index 337c1b7a..9a2351fb 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -11,7 +11,7 @@ model SingleSensorSelect "Selectable sensor" Documentation(info="

Medium Model for the sensor. Make sure it is the same as for all lines the sensors input is connected.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits"; + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed"; parameter SI.Density rho_min = dropOfCommons.rho_min "Minimum density" annotation(Dialog(tab="Advanced", group="Regularization")); parameter Quantities quantity "Measured quantity"; @@ -102,9 +102,7 @@ equation Text( extent={{-60,30},{60,-30}}, textColor={28,108,200}, - textString=DynamicSelect("value", String( - value, - format="1."+String(digits)+"f"))), + textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,-70},{150,-40}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 39f344af..04236671 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -10,7 +10,7 @@ model SingleSensorX "Sensor for mass fraction" Documentation(info="

Medium Model for the sensor. Make sure it is the same as for all lines the sensors input is connected.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits"; + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed"; parameter Boolean outputValue = false "= true, if sensor output is enabled" annotation(Dialog(group="Output"),Evaluate=true, HideResult=true, choices(checkBox=true)); parameter Boolean filter_output = false "= true, if sensor output is filtered (to break algebraic loops)" @@ -84,9 +84,7 @@ equation Text( extent={{-60,30},{60,-30}}, textColor={28,108,200}, - textString=DynamicSelect("value", String( - display_value, - format="1."+String(digits)+"f"))), + textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), Text( extent={{-150,-70},{150,-40}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index 9f34f557..d85aeea3 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -11,7 +11,7 @@ model TwoPhaseSensorSelect "Selectable Sensor for two phase medium" Documentation(info="

Medium Model for the sensor. Make sure it is the same as for all lines the sensors input is connected.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits"; + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed"; parameter Quantities quantity "Measured quantity"; final parameter String quantityString= @@ -91,9 +91,7 @@ equation Text( extent={{-60,30},{60,-30}}, textColor={28,108,200}, - textString=DynamicSelect("value", String( - value, - format="1."+String(digits)+"f"))), + textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,-70},{150,-40}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo b/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo index ffd1c1fd..1d79afe0 100644 --- a/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo @@ -8,7 +8,7 @@ partial model PartialSensor "Partial undirected sensor" info="

Replaceable medium package for the sensor.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits" + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed" annotation(Dialog(group="Sensor display")); parameter SI.MassFlowRate m_flow_reg = dropOfCommons.m_flow_reg "Regularization threshold of mass flow rate" annotation(Dialog(tab="Advanced", group="Regularization")); diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 200ac674..7834062a 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -9,7 +9,7 @@ model MultiSensor_Tpm "Undirected sensor for Temperature, pressure and mass flow

Replaceable medium package for the sensor.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits" + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed" annotation(Dialog(group="Sensor display")); parameter SI.MassFlowRate m_flow_reg = dropOfCommons.m_flow_reg "Regularization threshold of mass flow rate" annotation(Dialog(tab="Advanced", group="Regularization")); diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index ce0f1944..a3d6de4d 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -81,7 +81,7 @@ equation Text( extent={{-60,90},{60,30}}, textColor={28,108,200}, - textString=DynamicSelect("value", String(value, format="1."+String(digits)+"f"))), + textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,130},{150,100}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index 87a8b641..19632c7c 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -97,7 +97,7 @@ equation Text( extent={{-60,90},{60,30}}, textColor={28,108,200}, - textString=DynamicSelect("value", String(value, format="1."+String(digits)+"f"))), + textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,130},{150,100}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index 88af3279..cdcf7b11 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -10,7 +10,7 @@ model SingleSensorX "Mass fractions sensor"

Medium Model for the sensor. Make sure it is the same as for all lines the sensors input is connected.

")); - parameter Integer digits(min=0) = 1 "Number of displayed digits"; + parameter Integer digits(final min=0) = 3 "Number of significant digits to be displayed"; parameter Boolean outputValue = false "= true, if sensor output is enabled" annotation(Dialog(group="Output"),Evaluate=true, HideResult=true, choices(checkBox=true)); @@ -83,7 +83,7 @@ equation Text( extent={{-60,90},{60,30}}, textColor={28,108,200}, - textString=DynamicSelect("value", String(display_value, format="1."+String(digits)+"f"))), + textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), Text( extent={{-150,130},{150,100}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index b1379aae..73c58222 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -87,7 +87,7 @@ equation Text( extent={{-60,90},{60,30}}, textColor={28,108,200}, - textString=DynamicSelect("value", String(value, format="1."+String(digits)+"f"))), + textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,130},{150,100}}, textColor={0,0,0}, From b634d0972c81d9022a0a387e1bd2b3e1437f1e49 Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 08:11:28 +0200 Subject: [PATCH 02/16] defaultComponentName --- ThermofluidStream/Sensors/DifferenceSensorSelect.mo | 2 +- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 2 +- .../Sensors/DifferenceTwoPhaseSensorSensorSelect.mo | 2 +- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 2 +- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 2 +- ThermofluidStream/Sensors/SensorState.mo | 2 +- ThermofluidStream/Sensors/SingleFlowSensor.mo | 2 +- ThermofluidStream/Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Sensors/SingleSensorX.mo | 2 +- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 2 +- ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo | 2 +- ThermofluidStream/Undirected/Sensors/SensorState.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleSensorX.mo | 2 +- ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo index 11af7019..8d159ff3 100644 --- a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo @@ -101,7 +101,7 @@ equation value = direct_value; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="differentialSensor",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,80},{150,40}}, textString="%name", diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index 3bebaf76..f549eb10 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -102,7 +102,7 @@ equation T = direct_T; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="differentialSensorTp",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,140},{150,100}}, textString="%name", diff --git a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo index befb7e58..bcefeec7 100644 --- a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo @@ -94,7 +94,7 @@ equation value = direct_value; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="differentialSensor",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,120},{150,80}}, textString="%name", diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index 91192ceb..1fc60a8d 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -78,7 +78,7 @@ equation T = direct_T; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="sensorTp",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,120},{150,80}}, textString="%name", diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index 227eb6b8..cdbd4168 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -109,7 +109,7 @@ equation m_flow = direct_m_flow; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="sensorTpm",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,-160},{150,-120}}, textString="%name", diff --git a/ThermofluidStream/Sensors/SensorState.mo b/ThermofluidStream/Sensors/SensorState.mo index 2a6879e7..e429d198 100644 --- a/ThermofluidStream/Sensors/SensorState.mo +++ b/ThermofluidStream/Sensors/SensorState.mo @@ -18,7 +18,7 @@ equation state_out.state = inlet.state; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="stateSensor",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,80},{150,40}}, textString="%name", diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index 5ebcc8f8..66f47135 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -79,7 +79,7 @@ equation value = direct_value; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="flowSensor",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,-25},{150,-65}}, textString="%name", diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index 9a2351fb..518fe0ee 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -79,7 +79,7 @@ equation value = direct_value; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="sensor", Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,80},{150,40}}, textString="%name", diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 04236671..023752e7 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -61,7 +61,7 @@ equation value = direct_value; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="massFractionSensor",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,80},{150,40}}, textString="%name", diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index d85aeea3..dd605a04 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -68,7 +68,7 @@ equation value = direct_value; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="sensor",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,80},{150,40}}, textString="%name", diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 7834062a..b43a2eaf 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -141,7 +141,7 @@ equation m_flow = direct_m_flow; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="sensorTpm",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,-160},{150,-120}}, textString="%name", diff --git a/ThermofluidStream/Undirected/Sensors/SensorState.mo b/ThermofluidStream/Undirected/Sensors/SensorState.mo index e29254e8..c3bc6d16 100644 --- a/ThermofluidStream/Undirected/Sensors/SensorState.mo +++ b/ThermofluidStream/Undirected/Sensors/SensorState.mo @@ -16,7 +16,7 @@ equation state_out.state = state; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="stateSensor",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,-25},{150,-65}}, textString="%name", diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index a3d6de4d..c35e6bdd 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -62,7 +62,7 @@ equation value = direct_value; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="flowSensor",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,-25},{150,-65}}, textString="%name", diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index 19632c7c..8c113811 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -77,7 +77,7 @@ equation value = direct_value; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="sensor", Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,-25},{150,-65}}, textString="%name", diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index cdcf7b11..e644caae 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -63,7 +63,7 @@ equation value = direct_value; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="massFractionSensor",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,-25},{150,-65}}, textString="%name", diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index 73c58222..0193b091 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -67,7 +67,7 @@ equation value = direct_value; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=true), graphics={ + annotation (defaultComponentName ="sensor",Icon(coordinateSystem(preserveAspectRatio=true), graphics={ Text(visible=displayInstanceName, extent={{-150,-25},{150,-65}}, textString="%name", From 0fa34859c5dbdfacf57a7ed9c133650ee0141fc1 Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 08:41:29 +0200 Subject: [PATCH 03/16] Vertical text size --- .../Sensors/DifferenceSensorSelect.mo | 2 +- .../Sensors/DifferenceSensor_Tp.mo | 8 ++++---- .../DifferenceTwoPhaseSensorSensorSelect.mo | 2 +- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 8 ++++---- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 12 ++++++------ ThermofluidStream/Sensors/SensorState.mo | 2 +- ThermofluidStream/Sensors/SingleFlowSensor.mo | 2 +- .../Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Sensors/SingleSensorX.mo | 2 +- .../Sensors/TwoPhaseSensorSelect.mo | 2 +- .../Undirected/Sensors/MultiSensor_Tpm.mo | 18 ++++++------------ .../Undirected/Sensors/SensorState.mo | 2 +- .../Undirected/Sensors/SingleFlowSensor.mo | 2 +- .../Undirected/Sensors/SingleSensorSelect.mo | 2 +- .../Undirected/Sensors/SingleSensorX.mo | 2 +- .../Undirected/Sensors/TwoPhaseSensorSelect.mo | 2 +- 16 files changed, 32 insertions(+), 38 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo index 8d159ff3..9523c4d3 100644 --- a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo @@ -122,7 +122,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,30},{60,-30}}, + extent={{-60,26},{60,-26}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index f549eb10..fe93fd71 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -123,13 +123,13 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,55},{60,5}}, + extent={{-60,56},{60,6}}, textColor={28,108,200}, - textString=DynamicSelect("T", " "+String(T,significantDigits=digits)+" ")), + textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-60,-5},{60,-55}}, + extent={{-60,-6},{60,-56}}, textColor={28,108,200}, - textString=DynamicSelect("p", " "+String(p,significantDigits=digits)+" ")), + textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, extent={{70,45},{130,15}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo index bcefeec7..a7ce38e2 100644 --- a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo @@ -115,7 +115,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,30},{60,-30}}, + extent={{-60,26},{60,-26}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index 1fc60a8d..b1087410 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -99,13 +99,13 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,55},{60,5}}, + extent={{-60,56},{60,6}}, textColor={28,108,200}, - textString=DynamicSelect("T", " "+String(T,significantDigits=digits)+" ")), + textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-60,-5},{60,-55}}, + extent={{-60,-6},{60,-56}}, textColor={28,108,200}, - textString=DynamicSelect("p", " "+String(p,significantDigits=digits)+" ")), + textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, extent={{70,45},{130,15}}, textColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index cdbd4168..976483fa 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -167,17 +167,17 @@ equation fillPattern=FillPattern.Solid, lineThickness=0.5), Text( - extent={{-60,80},{60,30}}, + extent={{-60,76},{60,28}}, textColor={28,108,200}, - textString=DynamicSelect("T", " "+String(T,significantDigits=digits)+" ")), + textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-60,30},{60,-20}}, + extent={{-60,24},{60,-24}}, textColor={28,108,200}, - textString=DynamicSelect("p", " "+String(p,significantDigits=digits)+" ")), + textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text( - extent={{-60,-20},{60,-70}}, + extent={{-60,-28},{60,-76}}, textColor={28,108,200}, - textString=DynamicSelect("m", " "+String(m_flow,significantDigits=digits)+" ")), + textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line(visible=outputTemperature, points={{60,60},{78,60}}, color={0,0,127}), diff --git a/ThermofluidStream/Sensors/SensorState.mo b/ThermofluidStream/Sensors/SensorState.mo index e429d198..291b244a 100644 --- a/ThermofluidStream/Sensors/SensorState.mo +++ b/ThermofluidStream/Sensors/SensorState.mo @@ -39,7 +39,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,30},{60,-30}}, + extent={{-60,26},{60,-26}}, textColor={28,108,200}, textString="state"), Line( diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index 66f47135..1e917238 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -107,7 +107,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,90},{60,30}}, + extent={{-60,86},{60,34}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index 518fe0ee..ecffc76c 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -100,7 +100,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,30},{60,-30}}, + extent={{-60,26},{60,-26}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 023752e7..2c50df7e 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -82,7 +82,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,30},{60,-30}}, + extent={{-60,26},{60,-26}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index dd605a04..14b84508 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -89,7 +89,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,30},{60,-30}}, + extent={{-60,26},{60,-26}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index b43a2eaf..3ab1ddfa 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -189,23 +189,17 @@ equation fillPattern=FillPattern.Solid), Line(points={{0,-80},{0,-100}},color={0,0,0}), Text( - extent={{-60,80},{60,30}}, + extent={{-60,76},{60,28}}, textColor={28,108,200}, - textString=DynamicSelect("T", String( - T, - format="1."+String(digits)+"f"))), + textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-60,30},{60,-20}}, + extent={{-60,24},{60,-24}}, textColor={28,108,200}, - textString=DynamicSelect("p", String( - p, - format="1."+String(digits)+"f"))), + textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text( - extent={{-60,-20},{60,-70}}, + extent={{-60,-28},{60,-76}}, textColor={28,108,200}, - textString=DynamicSelect("m", String( - m_flow, - format="1."+String(digits)+"f"))), + textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line( points={{-100,-100},{100,-100}}, color={28,108,200}, diff --git a/ThermofluidStream/Undirected/Sensors/SensorState.mo b/ThermofluidStream/Undirected/Sensors/SensorState.mo index c3bc6d16..30015ea0 100644 --- a/ThermofluidStream/Undirected/Sensors/SensorState.mo +++ b/ThermofluidStream/Undirected/Sensors/SensorState.mo @@ -34,7 +34,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,90},{60,30}}, + extent={{-60,86},{60,34}}, textColor={28,108,200}, textString="state"), Ellipse( diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index c35e6bdd..f75ad2ed 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -79,7 +79,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,90},{60,30}}, + extent={{-60,86},{60,34}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index 8c113811..8484d4e6 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -95,7 +95,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,90},{60,30}}, + extent={{-60,86},{60,34}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index e644caae..a3f62726 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -76,7 +76,7 @@ equation pattern=LinePattern.None), Line(points={{0,34},{0,0}}, color={0,0,0}), Rectangle( - extent={{-60,90},{60,30}}, + extent={{-60,86},{60,34}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index 0193b091..6272c334 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -85,7 +85,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,90},{60,30}}, + extent={{-60,86},{60,34}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( From c0706bf22a2947b33a03c69cab0cfd3a512bd801 Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 09:01:59 +0200 Subject: [PATCH 04/16] x_min = -80 instead of x_min = -60 --- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 6 +++--- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 8 ++++---- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 10 +++++----- ThermofluidStream/Sensors/SensorState.mo | 8 ++++---- ThermofluidStream/Sensors/SingleFlowSensor.mo | 6 +++--- ThermofluidStream/Sensors/SingleSensorSelect.mo | 6 +++--- ThermofluidStream/Sensors/SingleSensorX.mo | 6 +++--- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 6 +++--- .../Undirected/Sensors/MultiSensor_Tpm.mo | 10 +++++----- ThermofluidStream/Undirected/Sensors/SensorState.mo | 8 ++++---- .../Undirected/Sensors/SingleFlowSensor.mo | 6 +++--- .../Undirected/Sensors/SingleSensorSelect.mo | 6 +++--- ThermofluidStream/Undirected/Sensors/SingleSensorX.mo | 6 +++--- .../Undirected/Sensors/TwoPhaseSensorSelect.mo | 6 +++--- 14 files changed, 49 insertions(+), 49 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index fe93fd71..a29ecf56 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -118,16 +118,16 @@ equation color={28,108,200}, thickness=0.5), Rectangle( - extent={{-60,60},{60,-60}}, + extent={{-80,60},{60,-60}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,56},{60,6}}, + extent={{-80,56},{60,6}}, textColor={28,108,200}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-60,-6},{60,-56}}, + extent={{-80,-6},{60,-56}}, textColor={28,108,200}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index b1087410..1e6a98c4 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -84,7 +84,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,54},{66,-66}}, + extent={{-74,54},{66,-66}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, @@ -94,16 +94,16 @@ equation color={28,108,200}, thickness=0.5), Rectangle( - extent={{-60,60},{60,-60}}, + extent={{-80,60},{60,-60}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,56},{60,6}}, + extent={{-80,56},{60,6}}, textColor={28,108,200}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-60,-6},{60,-56}}, + extent={{-80,-6},{60,-56}}, textColor={28,108,200}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index 976483fa..d420c3c6 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -145,7 +145,7 @@ equation textString=massFlowString, horizontalAlignment=TextAlignment.Left), Rectangle( - extent={{-54,74},{66,-86}}, + extent={{-74,74},{66,-86}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, @@ -155,7 +155,7 @@ equation color={28,108,200}, thickness=0.5), Rectangle( - extent={{-60,80},{60,-80}}, + extent={{-80,80},{60,-80}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), @@ -167,15 +167,15 @@ equation fillPattern=FillPattern.Solid, lineThickness=0.5), Text( - extent={{-60,76},{60,28}}, + extent={{-80,76},{60,28}}, textColor={28,108,200}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-60,24},{60,-24}}, + extent={{-80,24},{60,-24}}, textColor={28,108,200}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text( - extent={{-60,-28},{60,-76}}, + extent={{-80,-28},{60,-76}}, textColor={28,108,200}, textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line(visible=outputTemperature, diff --git a/ThermofluidStream/Sensors/SensorState.mo b/ThermofluidStream/Sensors/SensorState.mo index 291b244a..d48e230f 100644 --- a/ThermofluidStream/Sensors/SensorState.mo +++ b/ThermofluidStream/Sensors/SensorState.mo @@ -24,7 +24,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,24},{66,-36}}, + extent={{-74,24},{66,-36}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, @@ -34,14 +34,14 @@ equation color={28,108,200}, thickness=0.5), Rectangle( - extent={{-60,30},{60,-30}}, + extent={{-80,30},{60,-30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,26},{60,-26}}, + extent={{-80,26},{60,-26}}, textColor={28,108,200}, - textString="state"), + textString=" state "), Line( points={{60,0},{78,0}}, color={162,29,33})}), diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index 1e917238..fa05d07d 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -85,7 +85,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,84},{66,24}}, + extent={{-74,84},{66,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, @@ -102,12 +102,12 @@ equation fillPattern=FillPattern.Solid, lineThickness=0.5), Rectangle( - extent={{-60,90},{60,30}}, + extent={{-80,90},{60,30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,86},{60,34}}, + extent={{-80,86},{60,34}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index ecffc76c..52c4753f 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -85,7 +85,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,24},{66,-36}}, + extent={{-74,24},{66,-36}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, @@ -95,12 +95,12 @@ equation color={28,108,200}, thickness=0.5), Rectangle( - extent={{-60,30},{60,-30}}, + extent={{-80,30},{60,-30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,26},{60,-26}}, + extent={{-80,26},{60,-26}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 2c50df7e..25c663bf 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -67,7 +67,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,24},{66,-36}}, + extent={{-74,24},{66,-36}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, @@ -77,12 +77,12 @@ equation color={28,108,200}, thickness=0.5), Rectangle( - extent={{-60,30},{60,-30}}, + extent={{-80,30},{60,-30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,26},{60,-26}}, + extent={{-80,26},{60,-26}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index 14b84508..92d89c63 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -74,7 +74,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,24},{66,-36}}, + extent={{-74,24},{66,-36}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, @@ -84,12 +84,12 @@ equation color={28,108,200}, thickness=0.5), Rectangle( - extent={{-60,30},{60,-30}}, + extent={{-80,30},{60,-30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,26},{60,-26}}, + extent={{-80,26},{60,-26}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 3ab1ddfa..2ed7e95f 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -177,27 +177,27 @@ equation textString=massFlowString, horizontalAlignment=TextAlignment.Left), Rectangle( - extent={{-54,74},{66,-86}}, + extent={{-74,74},{66,-86}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-60,80},{60,-80}}, + extent={{-80,80},{60,-80}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Line(points={{0,-80},{0,-100}},color={0,0,0}), Text( - extent={{-60,76},{60,28}}, + extent={{-80,76},{60,28}}, textColor={28,108,200}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-60,24},{60,-24}}, + extent={{-80,24},{60,-24}}, textColor={28,108,200}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text( - extent={{-60,-28},{60,-76}}, + extent={{-80,-28},{60,-76}}, textColor={28,108,200}, textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line( diff --git a/ThermofluidStream/Undirected/Sensors/SensorState.mo b/ThermofluidStream/Undirected/Sensors/SensorState.mo index 30015ea0..ecee5a2e 100644 --- a/ThermofluidStream/Undirected/Sensors/SensorState.mo +++ b/ThermofluidStream/Undirected/Sensors/SensorState.mo @@ -22,21 +22,21 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,84},{66,24}}, + extent={{-74,84},{66,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), Line(points={{0,34},{0,0}}, color={0,0,0}), Rectangle( - extent={{-60,90},{60,30}}, + extent={{-80,90},{60,30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,86},{60,34}}, + extent={{-80,86},{60,34}}, textColor={28,108,200}, - textString="state"), + textString=" state "), Ellipse( extent={{-5,5},{5,-5}}, lineColor={28,108,200}, diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index f75ad2ed..c28700d0 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -68,18 +68,18 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,84},{66,24}}, + extent={{-74,84},{66,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-60,90},{60,30}}, + extent={{-80,90},{60,30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,86},{60,34}}, + extent={{-80,86},{60,34}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index 8484d4e6..0a21a514 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -83,19 +83,19 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,84},{66,24}}, + extent={{-74,84},{66,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), Line(points={{0,34},{0,0}}, color={0,0,0}), Rectangle( - extent={{-60,90},{60,30}}, + extent={{-80,90},{60,30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,86},{60,34}}, + extent={{-80,86},{60,34}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index a3f62726..e0c194bb 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -69,19 +69,19 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,84},{66,24}}, + extent={{-74,84},{66,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), Line(points={{0,34},{0,0}}, color={0,0,0}), Rectangle( - extent={{-60,86},{60,34}}, + extent={{-80,86},{60,34}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,90},{60,30}}, + extent={{-80,90},{60,30}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), Text( diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index 6272c334..0b40198f 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -73,19 +73,19 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,84},{66,24}}, + extent={{-74,84},{66,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), Line(points={{0,34},{0,0}}, color={0,0,0}), Rectangle( - extent={{-60,90},{60,30}}, + extent={{-80,90},{60,30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,86},{60,34}}, + extent={{-80,86},{60,34}}, textColor={28,108,200}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( From c4067e9d62e50e5620da3a9fa91b6d9c50aa501f Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 09:09:41 +0200 Subject: [PATCH 05/16] Text color black --- ThermofluidStream/Sensors/DifferenceSensorSelect.mo | 2 +- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 4 ++-- .../Sensors/DifferenceTwoPhaseSensorSensorSelect.mo | 2 +- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 4 ++-- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 6 +++--- ThermofluidStream/Sensors/SensorState.mo | 2 +- ThermofluidStream/Sensors/SingleFlowSensor.mo | 2 +- ThermofluidStream/Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Sensors/SingleSensorX.mo | 2 +- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 2 +- ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo | 6 +++--- ThermofluidStream/Undirected/Sensors/SensorState.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleSensorX.mo | 2 +- .../Undirected/Sensors/TwoPhaseSensorSelect.mo | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo index 9523c4d3..ad77dea0 100644 --- a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo @@ -123,7 +123,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-60,26},{60,-26}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,-40},{150,-70}}, diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index a29ecf56..165ec404 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -124,11 +124,11 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,56},{60,6}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( extent={{-80,-6},{60,-56}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, extent={{70,45},{130,15}}, diff --git a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo index a7ce38e2..c98272ee 100644 --- a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo @@ -116,7 +116,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-60,26},{60,-26}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,-70},{150,-40}}, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index 1e6a98c4..fae331c1 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -100,11 +100,11 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,56},{60,6}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( extent={{-80,-6},{60,-56}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, extent={{70,45},{130,15}}, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index d420c3c6..7363be0d 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -168,15 +168,15 @@ equation lineThickness=0.5), Text( extent={{-80,76},{60,28}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( extent={{-80,24},{60,-24}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text( extent={{-80,-28},{60,-76}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line(visible=outputTemperature, points={{60,60},{78,60}}, diff --git a/ThermofluidStream/Sensors/SensorState.mo b/ThermofluidStream/Sensors/SensorState.mo index d48e230f..4850cebf 100644 --- a/ThermofluidStream/Sensors/SensorState.mo +++ b/ThermofluidStream/Sensors/SensorState.mo @@ -40,7 +40,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,26},{60,-26}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=" state "), Line( points={{60,0},{78,0}}, diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index fa05d07d..76020662 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -108,7 +108,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,86},{60,34}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,130},{150,100}}, diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index 52c4753f..34d153ee 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -101,7 +101,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,26},{60,-26}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,-70},{150,-40}}, diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 25c663bf..2d4413ec 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -83,7 +83,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,26},{60,-26}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), Text( extent={{-150,-70},{150,-40}}, diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index 92d89c63..a7eec3a8 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -90,7 +90,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,26},{60,-26}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,-70},{150,-40}}, diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 2ed7e95f..c98cbdbe 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -190,15 +190,15 @@ equation Line(points={{0,-80},{0,-100}},color={0,0,0}), Text( extent={{-80,76},{60,28}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( extent={{-80,24},{60,-24}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text( extent={{-80,-28},{60,-76}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line( points={{-100,-100},{100,-100}}, diff --git a/ThermofluidStream/Undirected/Sensors/SensorState.mo b/ThermofluidStream/Undirected/Sensors/SensorState.mo index ecee5a2e..4f29d7d5 100644 --- a/ThermofluidStream/Undirected/Sensors/SensorState.mo +++ b/ThermofluidStream/Undirected/Sensors/SensorState.mo @@ -35,7 +35,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,86},{60,34}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=" state "), Ellipse( extent={{-5,5},{5,-5}}, diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index c28700d0..ed75560d 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -80,7 +80,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,86},{60,34}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,130},{150,100}}, diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index 0a21a514..153773ac 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -96,7 +96,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,86},{60,34}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,130},{150,100}}, diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index e0c194bb..72605a74 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -82,7 +82,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,90},{60,30}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), Text( extent={{-150,130},{150,100}}, diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index 0b40198f..7ac9bc80 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -86,7 +86,7 @@ equation fillPattern=FillPattern.Solid), Text( extent={{-80,86},{60,34}}, - textColor={28,108,200}, + textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( extent={{-150,130},{150,100}}, From 5b12464b6cc421a92de2f900e06b1209dea5359a Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 09:19:06 +0200 Subject: [PATCH 06/16] Remove line (is not visible anymore) --- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 8 -------- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 4 ---- ThermofluidStream/Sensors/SensorState.mo | 4 ---- ThermofluidStream/Sensors/SingleSensorSelect.mo | 4 ---- ThermofluidStream/Sensors/SingleSensorX.mo | 4 ---- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 4 ---- 6 files changed, 28 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index 165ec404..4dee6446 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -113,10 +113,6 @@ equation fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), - Line( - points={{-80,0},{0,0}}, - color={28,108,200}, - thickness=0.5), Rectangle( extent={{-80,60},{60,-60}}, lineColor={0,0,0}, @@ -150,10 +146,6 @@ equation textColor={0,0,0}, textString="%pressureUnit", horizontalAlignment=TextAlignment.Left), - Line( - points={{-80,60},{-80,-60}}, - color={28,108,200}, - thickness=0.5), Line( points={{-100,-60},{-80,-60}}, color={28,108,200}, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index fae331c1..bfbd21f4 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -89,10 +89,6 @@ equation fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), - Line( - points={{-100,0},{0,0}}, - color={28,108,200}, - thickness=0.5), Rectangle( extent={{-80,60},{60,-60}}, lineColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/SensorState.mo b/ThermofluidStream/Sensors/SensorState.mo index 4850cebf..f3ba222f 100644 --- a/ThermofluidStream/Sensors/SensorState.mo +++ b/ThermofluidStream/Sensors/SensorState.mo @@ -29,10 +29,6 @@ equation fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), - Line( - points={{-100,0},{0,0}}, - color={28,108,200}, - thickness=0.5), Rectangle( extent={{-80,30},{60,-30}}, lineColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index 34d153ee..14572ad7 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -90,10 +90,6 @@ equation fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), - Line( - points={{-100,0},{0,0}}, - color={28,108,200}, - thickness=0.5), Rectangle( extent={{-80,30},{60,-30}}, lineColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 2d4413ec..d11937aa 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -72,10 +72,6 @@ equation fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), - Line( - points={{-100,0},{0,0}}, - color={28,108,200}, - thickness=0.5), Rectangle( extent={{-80,30},{60,-30}}, lineColor={0,0,0}, diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index a7eec3a8..db1ea58a 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -79,10 +79,6 @@ equation fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), - Line( - points={{-100,0},{0,0}}, - color={28,108,200}, - thickness=0.5), Rectangle( extent={{-80,30},{60,-30}}, lineColor={0,0,0}, From 7a38518c4483bb444c33915dad627d4bd9444030 Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 09:31:35 +0200 Subject: [PATCH 07/16] RealOutput Connector Position --- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 4 ++-- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 4 ++-- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 6 +++--- ThermofluidStream/Sensors/SensorState.mo | 4 ++-- ThermofluidStream/Sensors/SingleFlowSensor.mo | 3 +-- ThermofluidStream/Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Sensors/SingleSensorX.mo | 2 +- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 2 +- ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo | 9 +++------ ThermofluidStream/Undirected/Sensors/SensorState.mo | 4 ++-- ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo | 3 +-- .../Undirected/Sensors/SingleSensorSelect.mo | 4 +--- ThermofluidStream/Undirected/Sensors/SingleSensorX.mo | 2 +- .../Undirected/Sensors/TwoPhaseSensorSelect.mo | 4 +--- 14 files changed, 22 insertions(+), 31 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index 4dee6446..19f6d0e4 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -46,9 +46,9 @@ model DifferenceSensor_Tp "Sensor for Temperature and pressure difference" Interfaces.Inlet inletB(redeclare package Medium=MediumB) annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,-80}), iconTransformation(extent={{-120,-80},{-80,-40}}))); Modelica.Blocks.Interfaces.RealOutput T_out(final quantity="ThermodynamicTemperature", final unit=temperatureUnit) = T if outputTemperature "Temperature difference output connector" - annotation (Placement(transformation(extent={{70,30},{90,50}}), iconTransformation(extent={{70,30},{90,50}}))); + annotation (Placement(transformation(extent={{100,30},{120,50}}))); Modelica.Blocks.Interfaces.RealOutput p_out(final quantity="Pressure", final unit=pressureUnit) = p if outputPressure "Pressure difference output connector" - annotation (Placement(transformation(extent={{70,-50},{90,-30}}), iconTransformation(extent={{70,-50},{90,-30}}))); + annotation (Placement(transformation(extent={{100,-50},{120,-30}}))); output Real p(final quantity="Pressure", final unit=pressureUnit); output Real T(final quantity="ThermodynamicTemperature", final unit=temperatureUnit); diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index bfbd21f4..338dbe12 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -37,9 +37,9 @@ model MultiSensor_Tp "Temperature and pressure sensor" Interfaces.Inlet inlet(redeclare package Medium=Medium) annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}))); Modelica.Blocks.Interfaces.RealOutput T_out(final quantity="ThermodynamicTemperature", final unit=temperatureUnit) = T if outputTemperature "Temperature output connector" - annotation (Placement(transformation(extent={{70,30},{90,50}}), iconTransformation(extent={{70,30},{90,50}}))); + annotation (Placement(transformation(extent={{100,30},{120,50}}))); Modelica.Blocks.Interfaces.RealOutput p_out(final quantity="Pressure", final unit=pressureUnit) = p if outputPressure "Pressure output connector" - annotation (Placement(transformation(extent={{72,-50},{92,-30}}), iconTransformation(extent={{72,-50},{92,-30}}))); + annotation (Placement(transformation(extent={{100,-50},{120,-30}}))); output Real p(final quantity="Pressure", final unit=pressureUnit); output Real T(final quantity="ThermodynamicTemperature", final unit=temperatureUnit); diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index 7363be0d..5ee447d2 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -50,11 +50,11 @@ model MultiSensor_Tpm "Sensor for temperature, pressure and mass flow rate" Interfaces.Outlet outlet(redeclare package Medium=Medium) annotation (Placement(transformation(extent={{80,-120},{120,-80}}))); Modelica.Blocks.Interfaces.RealOutput T_out(final quantity="ThermodynamicTemperature", final unit=temperatureUnit) = T if outputTemperature "Temperature output connector" - annotation (Placement(transformation(extent={{72,50},{92,70}}))); + annotation (Placement(transformation(extent={{100,50},{120,70}}))); Modelica.Blocks.Interfaces.RealOutput p_out(final quantity="Pressure", final unit=pressureUnit) = p if outputPressure "Pressure output connector" - annotation (Placement(transformation(extent={{72,-10},{92,10}}))); + annotation (Placement(transformation(extent={{100,-10},{120,10}}))); Modelica.Blocks.Interfaces.RealOutput m_flow_out(unit="kg/s") = m_flow if outputMassFlowRate "Mass flow rate output connector" - annotation (Placement(transformation(extent={{72,-70},{92,-50}}))); + annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); output Real p(final quantity="Pressure", final unit=pressureUnit); output Real T(final quantity="ThermodynamicTemperature", final unit=temperatureUnit); diff --git a/ThermofluidStream/Sensors/SensorState.mo b/ThermofluidStream/Sensors/SensorState.mo index f3ba222f..516f959e 100644 --- a/ThermofluidStream/Sensors/SensorState.mo +++ b/ThermofluidStream/Sensors/SensorState.mo @@ -11,7 +11,7 @@ model SensorState "Sensor for thermodynamic state" Interfaces.Inlet inlet(redeclare package Medium=Medium) annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}))); Interfaces.StateOutput state_out(redeclare package Medium = Medium) "State output connector" - annotation (Placement(transformation(extent={{70,-10},{90,10}}), iconTransformation(extent={{70,-10},{90,10}}))); + annotation (Placement(transformation(extent={{100,-10},{120,10}}))); equation inlet.m_flow = 0; @@ -39,7 +39,7 @@ equation textColor={0,0,0}, textString=" state "), Line( - points={{60,0},{78,0}}, + points={{60,0},{100,0}}, color={162,29,33})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index 76020662..159836d2 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -45,8 +45,7 @@ model SingleFlowSensor "Flow rate sensor" annotation (Placement(transformation(extent={{80,-20},{120,20}}), iconTransformation(extent={{80,-20},{120,20}}))); Modelica.Blocks.Interfaces.RealOutput value_out(unit=Internal.getFlowUnit(quantity)) = value if outputValue "Sensor output connector" - annotation (Placement(transformation(extent={{70,50},{90,70}}), - iconTransformation(extent={{70,50},{90,70}}))); + annotation (Placement(transformation(extent={{100,50},{120,70}}))); output Real value(unit=Internal.getFlowUnit(quantity)); diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index 14572ad7..f6b0ac46 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -50,7 +50,7 @@ model SingleSensorSelect "Selectable sensor" Interfaces.Inlet inlet(redeclare package Medium=Medium) annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}))); Modelica.Blocks.Interfaces.RealOutput value_out(unit=Internal.getUnit(quantity)) = value if outputValue "Sensor output connector" - annotation (Placement(transformation(extent={{72,-10},{92,10}}), iconTransformation(extent={{72,-10},{92,10}}))); + annotation (Placement(transformation(extent={{100,-10},{120,10}}))); output Real value(unit=Internal.getUnit(quantity)) "Computed value of the selected quantity"; diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index d11937aa..988618e9 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -27,7 +27,7 @@ model SingleSensorX "Sensor for mass fraction" Interfaces.Inlet inlet(redeclare package Medium=Medium) annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}))); Modelica.Blocks.Interfaces.RealOutput value_out[Medium.nX](each unit="kg/kg") = value if outputValue "Mass fraction output connector" - annotation (Placement(transformation(extent={{70,-10},{90,10}}), iconTransformation(extent={{70,-10},{90,10}}))); + annotation (Placement(transformation(extent={{100,-10},{120,10}}))); output Real value[Medium.nX](each unit="kg/kg") "Computed value of the selected quantity"; output Real display_value(unit="kg/kg") = value[row] "Row of the value vector to display"; diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index db1ea58a..761961e6 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -39,7 +39,7 @@ model TwoPhaseSensorSelect "Selectable Sensor for two phase medium" Interfaces.Inlet inlet(redeclare package Medium=Medium) annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}))); Modelica.Blocks.Interfaces.RealOutput value_out(unit=Internal.getTwoPhaseUnit(quantity)) = value if outputValue "Sensor output connector" - annotation (Placement(transformation(extent={{70,-10},{90,10}}), iconTransformation(extent={{70,-10},{90,10}}))); + annotation (Placement(transformation(extent={{100,-10},{120,10}}))); output Real value(unit=Internal.getTwoPhaseUnit(quantity)) "Computed value of the selected quantity [variable]"; diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index c98cbdbe..67a9b783 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -73,14 +73,11 @@ public Modelica.Blocks.Interfaces.RealOutput T_out(final quantity="ThermodynamicTemperature", final unit=temperatureUnit) = T if outputTemperature "Temperature output connector" - annotation (Placement(transformation(extent={{-20,-20},{20,20}}, origin={100,60}), - iconTransformation(extent={{70,50},{90,70}}))); + annotation (Placement(transformation(extent={{100,50},{120,70}}))); Modelica.Blocks.Interfaces.RealOutput p_out(final quantity="Pressure", final unit=pressureUnit) = p if outputPressure "Pressure output connector" - annotation (Placement(transformation(extent={{-10,-10},{10,10}}, origin={82,0}), - iconTransformation(extent={{72,-10},{92,10}}))); + annotation (Placement(transformation(extent={{100,-10},{120,10}}))); Modelica.Blocks.Interfaces.RealOutput m_flow_out(unit="kg/s") = m_flow if outputMassFlowRate "Mass flow rate output connector" - annotation (Placement(transformation(extent={{-20,-20},{20,20}}, origin={100,-60}), - iconTransformation(extent={{72,-70},{92,-50}}))); + annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); output Real p(final quantity="Pressure", final unit=pressureUnit); output Real T(final quantity="ThermodynamicTemperature", final unit=temperatureUnit); diff --git a/ThermofluidStream/Undirected/Sensors/SensorState.mo b/ThermofluidStream/Undirected/Sensors/SensorState.mo index 4f29d7d5..6418edaa 100644 --- a/ThermofluidStream/Undirected/Sensors/SensorState.mo +++ b/ThermofluidStream/Undirected/Sensors/SensorState.mo @@ -10,7 +10,7 @@ model SensorState "State sensor" ")); ThermofluidStream.Interfaces.StateOutput state_out(redeclare package Medium = Medium) "State output connector" - annotation (Placement(transformation(extent={{70,50},{90,70}}), iconTransformation(extent={{70,50},{90,70}}))); + annotation (Placement(transformation(extent={{100,50},{120,70}}))); equation @@ -44,7 +44,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Line( - points={{60,60},{78,60}}, + points={{60,60},{100,60}}, color={162,29,33})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index ed75560d..e34b6c6a 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -32,8 +32,7 @@ model SingleFlowSensor "Flow sensor" annotation(Dialog(group="Output", enable=outputValue and filter_output and init==InitMode.state)); Modelica.Blocks.Interfaces.RealOutput value_out(unit=ThermofluidStream.Sensors.Internal.getFlowUnit(quantity)) = value if outputValue "Sensor output connector" - annotation (Placement(transformation(extent={{70,50},{90,70}}), - iconTransformation(extent={{70,50},{90,70}}))); + annotation (Placement(transformation(extent={{100,50},{120,70}}))); output Real value(unit=ThermofluidStream.Sensors.Internal.getFlowUnit(quantity)); diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index 153773ac..0bb7cee4 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -44,9 +44,7 @@ model SingleSensorSelect "Selectable sensor" Modelica.Blocks.Interfaces.RealOutput value_out(unit=ThermofluidStream.Sensors.Internal.getUnit(quantity)) = value if outputValue "Sensor output connector" - annotation (Placement( - transformation(extent={{70,50},{90,70}}), - iconTransformation(extent={{70,50},{90,70}}))); + annotation (Placement(transformation(extent={{100,50},{120,70}}))); function getQuantity = ThermofluidStream.Sensors.Internal.getQuantity ( redeclare package Medium = Medium) "Quantity compute function" diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index 72605a74..a64af64c 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -26,7 +26,7 @@ model SingleSensorX "Mass fractions sensor" parameter Integer row(min=1, max=Medium.nX) = 1 "Row of mass fraction vector to display"; Modelica.Blocks.Interfaces.RealOutput value_out[Medium.nX](each unit="kg/kg") = value if outputValue "Measured value [variable]" - annotation (Placement(transformation(extent={{72,50},{92,70}}), iconTransformation(extent={{72,50},{92,70}}))); + annotation (Placement(transformation(extent={{100,50},{120,70}}))); output Real value[Medium.nX](each unit="kg/kg") "Computed value of the selected Quantity"; output Real display_value(unit="kg/kg") = value[row] "Row of the value vector to display"; diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index 7ac9bc80..7b62f260 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -35,9 +35,7 @@ model TwoPhaseSensorSelect "Selectable sensor for two phase medium" annotation(Dialog(group="Output", enable=outputValue and filter_output and init==InitMode.state)); Modelica.Blocks.Interfaces.RealOutput value_out(unit=ThermofluidStream.Sensors.Internal.getTwoPhaseUnit(quantity)) = value if outputValue "Sensor output connector" - annotation (Placement( - transformation(extent={{70,50},{90,70}}), - iconTransformation(extent={{70,50},{90,70}}))); + annotation (Placement(transformation(extent={{100,50},{120,70}}))); Real value(unit=ThermofluidStream.Sensors.Internal.getTwoPhaseUnit(quantity)); From 96f3b454dbbd372ec242135ba791b00d8bacaa34 Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 09:38:00 +0200 Subject: [PATCH 08/16] RealOutput Connector Line --- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 4 ++-- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 6 +++--- ThermofluidStream/Sensors/SingleFlowSensor.mo | 2 +- ThermofluidStream/Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Sensors/SingleSensorX.mo | 2 +- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 2 +- ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo | 6 +++--- ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleSensorX.mo | 2 +- .../Undirected/Sensors/TwoPhaseSensorSelect.mo | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index 338dbe12..6a84aca6 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -123,10 +123,10 @@ equation textString="%pressureUnit", horizontalAlignment=TextAlignment.Left), Line(visible=outputTemperature, - points={{60,40},{78,40}}, + points={{60,40},{100,40}}, color={0,0,127}), Line(visible=outputPressure, - points={{60,-40},{78,-40}}, + points={{60,-40},{100,-40}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index 5ee447d2..3dafd90a 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -179,13 +179,13 @@ equation textColor={0,0,0}, textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line(visible=outputTemperature, - points={{60,60},{78,60}}, + points={{60,60},{100,60}}, color={0,0,127}), Line(visible=outputPressure, - points={{60,0},{78,0}}, + points={{60,0},{100,0}}, color={0,0,127}), Line(visible=outputMassFlowRate, - points={{60,-60},{78,-60}}, + points={{60,-60},{100,-60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index 159836d2..8919489b 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -114,7 +114,7 @@ equation textColor={0,0,0}, textString=quantityString), Line(visible=outputValue, - points={{60,60},{78,60}}, + points={{60,60},{100,60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index f6b0ac46..e9db8e92 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -104,7 +104,7 @@ equation textColor={0,0,0}, textString=quantityString), Line(visible=outputValue, - points={{60,0},{78,0}}, + points={{60,0},{100,0}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 988618e9..149b6c3c 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -86,7 +86,7 @@ equation textColor={0,0,0}, textString="X[%row] in kg/kg"), Line(visible=outputValue, - points={{60,0},{78,0}}, + points={{60,0},{100,0}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index 761961e6..1f97268b 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -93,7 +93,7 @@ equation textColor={0,0,0}, textString=quantityString), Line(visible=outputValue, - points={{60,0},{78,0}}, + points={{60,0},{100,0}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 67a9b783..94db5b7f 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -208,13 +208,13 @@ equation fillPattern=FillPattern.Solid, lineThickness=0.5), Line(visible=outputTemperature, - points={{60,60},{78,60}}, + points={{60,60},{100,60}}, color={0,0,127}), Line(visible=outputPressure, - points={{60,0},{78,0}}, + points={{60,0},{100,0}}, color={0,0,127}), Line(visible=outputMassFlowRate, - points={{60,-60},{78,-60}}, + points={{60,-60},{100,-60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index e34b6c6a..75398870 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -93,7 +93,7 @@ equation fillPattern=FillPattern.Solid, lineThickness=0.5), Line(visible=outputValue, - points={{60,60},{78,60}}, + points={{60,60},{100,60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index 0bb7cee4..a81bbb8e 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -107,7 +107,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Line(visible=outputValue, - points={{60,60},{78,60}}, + points={{60,60},{100,60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index a64af64c..ac48377e 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -95,7 +95,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Line(visible=outputValue, - points={{60,60},{78,60}}, + points={{60,60},{100,60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index 7b62f260..f89ef4a4 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -97,7 +97,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Line(visible=outputValue, - points={{60,60},{78,60}}, + points={{60,60},{100,60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" From 5b7d8851e480ba4f8b773260af8fe7105331974c Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 09:49:57 +0200 Subject: [PATCH 09/16] x_max = +80, instead of x_max = +60 --- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 10 +++++----- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 10 +++++----- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 14 +++++++------- ThermofluidStream/Sensors/SingleFlowSensor.mo | 6 +++--- ThermofluidStream/Sensors/SingleSensorSelect.mo | 6 +++--- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 6 +++--- .../Undirected/Sensors/MultiSensor_Tpm.mo | 14 +++++++------- .../Undirected/Sensors/SensorState.mo | 6 +++--- .../Undirected/Sensors/SingleFlowSensor.mo | 6 +++--- .../Undirected/Sensors/SingleSensorSelect.mo | 6 +++--- .../Undirected/Sensors/SingleSensorX.mo | 6 +++--- .../Undirected/Sensors/TwoPhaseSensorSelect.mo | 6 +++--- 12 files changed, 48 insertions(+), 48 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index 19f6d0e4..4dfacdcc 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -114,16 +114,16 @@ equation fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-80,60},{60,-60}}, + extent={{-80,60},{80,-60}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,56},{60,6}}, + extent={{-80,56},{80,6}}, textColor={0,0,0}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-80,-6},{60,-56}}, + extent={{-80,-6},{80,-56}}, textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, @@ -163,10 +163,10 @@ equation lineColor={28,108,200}, lineThickness=0.5), Line(visible=outputTemperature, - points={{60,40},{78,40}}, + points={{80,40},{100,40}}, color={0,0,127}), Line(visible=outputPressure, - points={{60,-40},{78,-40}}, + points={{80,-40},{100,-40}}, color={0,0,127}), Line( points={{-108,90},{-92,90}}, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index 6a84aca6..1c62d369 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -90,16 +90,16 @@ equation fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-80,60},{60,-60}}, + extent={{-80,60},{80,-60}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,56},{60,6}}, + extent={{-80,56},{80,6}}, textColor={0,0,0}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-80,-6},{60,-56}}, + extent={{-80,-6},{80,-56}}, textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, @@ -123,10 +123,10 @@ equation textString="%pressureUnit", horizontalAlignment=TextAlignment.Left), Line(visible=outputTemperature, - points={{60,40},{100,40}}, + points={{80,40},{100,40}}, color={0,0,127}), Line(visible=outputPressure, - points={{60,-40},{100,-40}}, + points={{80,-40},{100,-40}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index 3dafd90a..c04aff4a 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -155,7 +155,7 @@ equation color={28,108,200}, thickness=0.5), Rectangle( - extent={{-80,80},{60,-80}}, + extent={{-80,80},{80,-80}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), @@ -167,25 +167,25 @@ equation fillPattern=FillPattern.Solid, lineThickness=0.5), Text( - extent={{-80,76},{60,28}}, + extent={{-80,76},{80,28}}, textColor={0,0,0}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-80,24},{60,-24}}, + extent={{-80,24},{80,-24}}, textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text( - extent={{-80,-28},{60,-76}}, + extent={{-80,-28},{80,-76}}, textColor={0,0,0}, textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line(visible=outputTemperature, - points={{60,60},{100,60}}, + points={{80,60},{100,60}}, color={0,0,127}), Line(visible=outputPressure, - points={{60,0},{100,0}}, + points={{80,0},{100,0}}, color={0,0,127}), Line(visible=outputMassFlowRate, - points={{60,-60},{100,-60}}, + points={{80,-60},{100,-60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index 8919489b..3db7fa0b 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -101,12 +101,12 @@ equation fillPattern=FillPattern.Solid, lineThickness=0.5), Rectangle( - extent={{-80,90},{60,30}}, + extent={{-80,90},{80,30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,86},{60,34}}, + extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( @@ -114,7 +114,7 @@ equation textColor={0,0,0}, textString=quantityString), Line(visible=outputValue, - points={{60,60},{100,60}}, + points={{80,60},{100,60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index e9db8e92..8674e3af 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -91,12 +91,12 @@ equation fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-80,30},{60,-30}}, + extent={{-80,30},{80,-30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,26},{60,-26}}, + extent={{-80,26},{80,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( @@ -104,7 +104,7 @@ equation textColor={0,0,0}, textString=quantityString), Line(visible=outputValue, - points={{60,0},{100,0}}, + points={{80,0},{100,0}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index 1f97268b..6e1922cd 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -80,12 +80,12 @@ equation fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-80,30},{60,-30}}, + extent={{-80,30},{80,-30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,26},{60,-26}}, + extent={{-80,26},{80,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( @@ -93,7 +93,7 @@ equation textColor={0,0,0}, textString=quantityString), Line(visible=outputValue, - points={{60,0},{100,0}}, + points={{80,0},{100,0}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 94db5b7f..24a3500a 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -180,21 +180,21 @@ equation fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-80,80},{60,-80}}, + extent={{-80,80},{80,-80}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Line(points={{0,-80},{0,-100}},color={0,0,0}), Text( - extent={{-80,76},{60,28}}, + extent={{-80,76},{80,28}}, textColor={0,0,0}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-80,24},{60,-24}}, + extent={{-80,24},{80,-24}}, textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text( - extent={{-80,-28},{60,-76}}, + extent={{-80,-28},{80,-76}}, textColor={0,0,0}, textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line( @@ -208,13 +208,13 @@ equation fillPattern=FillPattern.Solid, lineThickness=0.5), Line(visible=outputTemperature, - points={{60,60},{100,60}}, + points={{80,60},{100,60}}, color={0,0,127}), Line(visible=outputPressure, - points={{60,0},{100,0}}, + points={{80,0},{100,0}}, color={0,0,127}), Line(visible=outputMassFlowRate, - points={{60,-60},{100,-60}}, + points={{80,-60},{100,-60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/SensorState.mo b/ThermofluidStream/Undirected/Sensors/SensorState.mo index 6418edaa..38c0ab37 100644 --- a/ThermofluidStream/Undirected/Sensors/SensorState.mo +++ b/ThermofluidStream/Undirected/Sensors/SensorState.mo @@ -29,12 +29,12 @@ equation pattern=LinePattern.None), Line(points={{0,34},{0,0}}, color={0,0,0}), Rectangle( - extent={{-80,90},{60,30}}, + extent={{-80,90},{80,30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,86},{60,34}}, + extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=" state "), Ellipse( @@ -44,7 +44,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Line( - points={{60,60},{100,60}}, + points={{80,60},{100,60}}, color={162,29,33})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index 75398870..517337dd 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -73,12 +73,12 @@ equation fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-80,90},{60,30}}, + extent={{-80,90},{80,30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,86},{60,34}}, + extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( @@ -93,7 +93,7 @@ equation fillPattern=FillPattern.Solid, lineThickness=0.5), Line(visible=outputValue, - points={{60,60},{100,60}}, + points={{80,60},{100,60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index a81bbb8e..f4dbecd0 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -88,12 +88,12 @@ equation pattern=LinePattern.None), Line(points={{0,34},{0,0}}, color={0,0,0}), Rectangle( - extent={{-80,90},{60,30}}, + extent={{-80,90},{80,30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,86},{60,34}}, + extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( @@ -107,7 +107,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Line(visible=outputValue, - points={{60,60},{100,60}}, + points={{80,60},{100,60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index ac48377e..abb8d827 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -76,12 +76,12 @@ equation pattern=LinePattern.None), Line(points={{0,34},{0,0}}, color={0,0,0}), Rectangle( - extent={{-80,86},{60,34}}, + extent={{-80,86},{80,34}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,90},{60,30}}, + extent={{-80,90},{80,30}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), Text( @@ -95,7 +95,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Line(visible=outputValue, - points={{60,60},{100,60}}, + points={{80,60},{100,60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index f89ef4a4..9e5c8bbb 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -78,12 +78,12 @@ equation pattern=LinePattern.None), Line(points={{0,34},{0,0}}, color={0,0,0}), Rectangle( - extent={{-80,90},{60,30}}, + extent={{-80,90},{80,30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,86},{60,34}}, + extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( @@ -97,7 +97,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Line(visible=outputValue, - points={{60,60},{100,60}}, + points={{80,60},{100,60}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" From b12f686c795932cfcf21b92e90d6ae823975e732 Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 09:54:23 +0200 Subject: [PATCH 10/16] Shadow --- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 2 +- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 2 +- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 2 +- ThermofluidStream/Sensors/SensorState.mo | 2 +- ThermofluidStream/Sensors/SingleFlowSensor.mo | 2 +- ThermofluidStream/Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Sensors/SingleSensorX.mo | 2 +- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 2 +- ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo | 2 +- ThermofluidStream/Undirected/Sensors/SensorState.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Undirected/Sensors/SingleSensorX.mo | 2 +- ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index 4dfacdcc..a115980f 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -108,7 +108,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,54},{66,-66}}, + extent={{-74,54},{86,-66}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index 1c62d369..5f94fc49 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -84,7 +84,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,54},{66,-66}}, + extent={{-74,54},{86,-66}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index c04aff4a..a2c1a761 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -145,7 +145,7 @@ equation textString=massFlowString, horizontalAlignment=TextAlignment.Left), Rectangle( - extent={{-74,74},{66,-86}}, + extent={{-74,74},{86,-86}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Sensors/SensorState.mo b/ThermofluidStream/Sensors/SensorState.mo index 516f959e..5cfb9865 100644 --- a/ThermofluidStream/Sensors/SensorState.mo +++ b/ThermofluidStream/Sensors/SensorState.mo @@ -24,7 +24,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,24},{66,-36}}, + extent={{-74,24},{86,-36}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index 3db7fa0b..3643134a 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -84,7 +84,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,84},{66,24}}, + extent={{-74,84},{86,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index 8674e3af..60d6219f 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -85,7 +85,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,24},{66,-36}}, + extent={{-74,24},{86,-36}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 149b6c3c..79fe2f83 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -67,7 +67,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,24},{66,-36}}, + extent={{-74,24},{86,-36}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index 6e1922cd..c052a651 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -74,7 +74,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,24},{66,-36}}, + extent={{-74,24},{86,-36}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 24a3500a..b5288fcf 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -174,7 +174,7 @@ equation textString=massFlowString, horizontalAlignment=TextAlignment.Left), Rectangle( - extent={{-74,74},{66,-86}}, + extent={{-74,74},{86,-86}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Undirected/Sensors/SensorState.mo b/ThermofluidStream/Undirected/Sensors/SensorState.mo index 38c0ab37..8d5ceb06 100644 --- a/ThermofluidStream/Undirected/Sensors/SensorState.mo +++ b/ThermofluidStream/Undirected/Sensors/SensorState.mo @@ -22,7 +22,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,84},{66,24}}, + extent={{-74,84},{86,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index 517337dd..2c27d2ea 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -67,7 +67,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,84},{66,24}}, + extent={{-74,84},{86,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index f4dbecd0..56669b91 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -81,7 +81,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,84},{66,24}}, + extent={{-74,84},{86,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index abb8d827..8106ff8e 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -69,7 +69,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,84},{66,24}}, + extent={{-74,84},{86,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index 9e5c8bbb..9d8f7922 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -71,7 +71,7 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-74,84},{66,24}}, + extent={{-74,84},{86,24}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, From 566d00ff2189d315236880707efe6be636dd7337 Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 10:13:28 +0200 Subject: [PATCH 11/16] Adapt sensor Tp, Tpm --- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 8 ++++---- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 8 ++++---- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 12 ++++++------ .../Undirected/Sensors/MultiSensor_Tpm.mo | 12 ++++++------ 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index a115980f..5d9179cc 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -127,22 +127,22 @@ equation textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, - extent={{70,45},{130,15}}, + extent={{90,46},{150,16}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), Text(visible=not outputPressure, - extent={{70,-15},{130,-45}}, + extent={{90,-16},{150,-46}}, textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="%pressureUnit"), Text(visible= outputTemperature, - extent={{75,78},{135,48}}, + extent={{95,78},{155,48}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), Text(visible=outputPressure, - extent={{75,-2},{135,-32}}, + extent={{95,-2},{155,-32}}, textColor={0,0,0}, textString="%pressureUnit", horizontalAlignment=TextAlignment.Left), diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index 5f94fc49..5ee83d34 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -103,22 +103,22 @@ equation textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text(visible=not outputTemperature, - extent={{70,45},{130,15}}, + extent={{90,46},{150,16}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), Text(visible=not outputPressure, - extent={{70,-15},{130,-45}}, + extent={{90,-16},{150,-46}}, textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="%pressureUnit"), Text(visible= outputTemperature, - extent={{75,78},{135,48}}, + extent={{95,78},{155,48}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), Text(visible=outputPressure, - extent={{75,-2},{135,-32}}, + extent={{95,-2},{155,-32}}, textColor={0,0,0}, textString="%pressureUnit", horizontalAlignment=TextAlignment.Left), diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index a2c1a761..b9730e88 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -115,32 +115,32 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Text(visible=not outputTemperature, - extent={{150,70},{68,40}}, + extent={{150,67},{90,37}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), Text(visible=not outputPressure, - extent={{150,20},{68,-10}}, + extent={{150,15},{90,-15}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), Text(visible=not outputMassFlowRate, - extent={{150,-30},{68,-60}}, + extent={{150,-37},{90,-67}}, textColor={0,0,0}, textString=massFlowString, horizontalAlignment=TextAlignment.Left), Text(visible=outputTemperature, - extent={{150,98},{75,68}}, + extent={{155,98},{95,68}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), Text(visible=outputPressure, - extent={{150,38},{75,8}}, + extent={{155,38},{95,8}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), Text(visible=outputMassFlowRate, - extent={{150,-20},{75,-50}}, + extent={{155,-20},{95,-50}}, textColor={0,0,0}, textString=massFlowString, horizontalAlignment=TextAlignment.Left), diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index b5288fcf..436e115b 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -144,32 +144,32 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Text(visible=not outputTemperature, - extent={{150,70},{68,40}}, + extent={{150,67},{90,37}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), Text(visible=not outputPressure, - extent={{150,20},{68,-10}}, + extent={{150,15},{90,-15}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), Text(visible=not outputMassFlowRate, - extent={{150,-30},{68,-60}}, + extent={{150,-37},{90,-67}}, textColor={0,0,0}, textString=massFlowString, horizontalAlignment=TextAlignment.Left), Text(visible=outputTemperature, - extent={{150,98},{75,68}}, + extent={{155,98},{95,68}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), Text(visible=outputPressure, - extent={{150,38},{75,8}}, + extent={{155,38},{95,8}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), Text(visible=outputMassFlowRate, - extent={{150,-22},{75,-52}}, + extent={{155,-22},{95,-52}}, textColor={0,0,0}, textString=massFlowString, horizontalAlignment=TextAlignment.Left), From 997f7c0fb8b34da57b0365884b39546abf480b2a Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 10:29:33 +0200 Subject: [PATCH 12/16] Adapt sensor Tp, Tpm --- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 18 +++++++++--------- .../Undirected/Sensors/MultiSensor_Tpm.mo | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index b9730e88..48c2668b 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -115,17 +115,17 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Text(visible=not outputTemperature, - extent={{150,67},{90,37}}, + extent={{150,77},{90,47}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), Text(visible=not outputPressure, - extent={{150,15},{90,-15}}, + extent={{150,25},{90,-5}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), Text(visible=not outputMassFlowRate, - extent={{150,-37},{90,-67}}, + extent={{150,-27},{90,-57}}, textColor={0,0,0}, textString=massFlowString, horizontalAlignment=TextAlignment.Left), @@ -145,7 +145,7 @@ equation textString=massFlowString, horizontalAlignment=TextAlignment.Left), Rectangle( - extent={{-74,74},{86,-86}}, + extent={{-74,84},{86,-76}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, @@ -155,11 +155,11 @@ equation color={28,108,200}, thickness=0.5), Rectangle( - extent={{-80,80},{80,-80}}, + extent={{-80,90},{80,-70}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Line(points={{0,-80},{0,-100}}, color={0,0,0}), + Line(points={{0,-70},{0,-100}}, color={0,0,0}), Ellipse( extent={{-6,-94},{6,-106}}, lineColor={28,108,200}, @@ -167,15 +167,15 @@ equation fillPattern=FillPattern.Solid, lineThickness=0.5), Text( - extent={{-80,76},{80,28}}, + extent={{-80,86},{80,38}}, textColor={0,0,0}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-80,24},{80,-24}}, + extent={{-80,34},{80,-14}}, textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text( - extent={{-80,-28},{80,-76}}, + extent={{-80,-18},{80,-66}}, textColor={0,0,0}, textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line(visible=outputTemperature, diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 436e115b..8457d8a0 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -144,17 +144,17 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Text(visible=not outputTemperature, - extent={{150,67},{90,37}}, + extent={{150,77},{90,47}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), Text(visible=not outputPressure, - extent={{150,15},{90,-15}}, + extent={{150,25},{90,-5}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), Text(visible=not outputMassFlowRate, - extent={{150,-37},{90,-67}}, + extent={{150,-27},{90,-57}}, textColor={0,0,0}, textString=massFlowString, horizontalAlignment=TextAlignment.Left), @@ -174,27 +174,27 @@ equation textString=massFlowString, horizontalAlignment=TextAlignment.Left), Rectangle( - extent={{-74,74},{86,-86}}, + extent={{-74,84},{86,-76}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-80,80},{80,-80}}, + extent={{-80,90},{80,-70}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Line(points={{0,-80},{0,-100}},color={0,0,0}), + Line(points={{0,-70},{0,-100}},color={0,0,0}), Text( - extent={{-80,76},{80,28}}, + extent={{-80,86},{80,38}}, textColor={0,0,0}, textString=DynamicSelect(" T ", " "+String(T,significantDigits=digits)+" ")), Text( - extent={{-80,24},{80,-24}}, + extent={{-80,34},{80,-14}}, textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), Text( - extent={{-80,-28},{80,-76}}, + extent={{-80,-18},{80,-66}}, textColor={0,0,0}, textString=DynamicSelect(" m ", " "+String(m_flow,significantDigits=digits)+" ")), Line( From d07ae567e15ee606b893feda5b2bb038c6afa2a1 Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 10:41:15 +0200 Subject: [PATCH 13/16] inlet/outlet annotation --- ThermofluidStream/Sensors/DifferenceSensorSelect.mo | 10 +++------- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 4 ++-- .../Sensors/DifferenceTwoPhaseSensorSensorSelect.mo | 11 +++-------- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 2 +- ThermofluidStream/Sensors/SensorState.mo | 2 +- ThermofluidStream/Sensors/SingleFlowSensor.mo | 6 ++---- ThermofluidStream/Sensors/SingleSensorSelect.mo | 2 +- ThermofluidStream/Sensors/SingleSensorX.mo | 2 +- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 2 +- .../Undirected/Sensors/Internal/PartialSensor.mo | 4 ++-- .../Undirected/Sensors/MultiSensor_Tpm.mo | 4 ++-- 11 files changed, 19 insertions(+), 30 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo index ad77dea0..bf2495a3 100644 --- a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo @@ -51,15 +51,11 @@ model DifferenceSensorSelect "Sensor for selectable quantatiy difference" annotation(Dialog(group="Output", enable=outputValue and filter_output and init==InitMode.state)); Interfaces.Inlet inletA(redeclare package Medium=MediumA) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}), - iconTransformation(extent={{-120,-20},{-80,20}}))); + annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); Interfaces.Inlet inletB(redeclare package Medium=MediumB) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={136,-10}), - iconTransformation(extent={{120,-20},{80,20}}))); + annotation (Placement(transformation(extent={{120,-20},{80,20}}))); Modelica.Blocks.Interfaces.RealOutput value_out(unit=Internal.getUnit(quantity)) = value if outputValue "Sensor output connector" - annotation (Placement(transformation(extent={{4,-78},{24,-58}}), iconTransformation(extent={{-10,-10},{10,10}}, - rotation=270, - origin={0,-90}))); + annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={0,-90}))); output Real value(unit=Internal.getUnit(quantity)) "Computed difference in the selected quantity"; diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index 5d9179cc..c8c98e76 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -42,9 +42,9 @@ model DifferenceSensor_Tp "Sensor for Temperature and pressure difference" annotation(Dialog(group="Output", enable=outputPressure and filter_output and init==InitMode.state)); Interfaces.Inlet inletA(redeclare package Medium=MediumA) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,80}), iconTransformation(extent={{-120,40},{-80,80}}))); + annotation (Placement(transformation(extent={{-120,40},{-80,80}}))); Interfaces.Inlet inletB(redeclare package Medium=MediumB) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,-80}), iconTransformation(extent={{-120,-80},{-80,-40}}))); + annotation (Placement(transformation(extent={{-120,-80},{-80,-40}}))); Modelica.Blocks.Interfaces.RealOutput T_out(final quantity="ThermodynamicTemperature", final unit=temperatureUnit) = T if outputTemperature "Temperature difference output connector" annotation (Placement(transformation(extent={{100,30},{120,50}}))); Modelica.Blocks.Interfaces.RealOutput p_out(final quantity="Pressure", final unit=pressureUnit) = p if outputPressure "Pressure difference output connector" diff --git a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo index c98272ee..5aca5741 100644 --- a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo @@ -43,16 +43,11 @@ model DifferenceTwoPhaseSensorSensorSelect "Sensor for selectable quantatiy diff annotation(Dialog(group="Output", enable=outputValue and filter_output and init==InitMode.state)); Interfaces.Inlet inletA(redeclare package Medium=MediumA) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,80}), - iconTransformation(extent={{-120,-20},{-80,20}}))); + annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); Interfaces.Inlet inletB(redeclare package Medium=MediumB) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,-80}), - iconTransformation(extent={{120,-20},{80,20}}))); + annotation (Placement(transformation(extent={{120,-20},{80,20}}))); Modelica.Blocks.Interfaces.RealOutput value_out(unit=Internal.getTwoPhaseUnit(quantity)) = value if outputValue "Sensor output connector" - annotation (Placement(transformation(extent={{28,-90},{48,-70}}), iconTransformation( - extent={{-10,-10},{10,10}}, - rotation=270, - origin={0,-90}))); + annotation (Placement(transformation(extent={{-10,-10},{10,10}},rotation=270,origin={0,-90}))); output Real value(unit=Internal.getTwoPhaseUnit(quantity)) "Computed difference in the selected quantity"; diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index 5ee83d34..bca4cef9 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -35,7 +35,7 @@ model MultiSensor_Tp "Temperature and pressure sensor" annotation(Dialog(group="Output", enable=outputPressure and filter_output and init==InitMode.state)); Interfaces.Inlet inlet(redeclare package Medium=Medium) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}))); + annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); Modelica.Blocks.Interfaces.RealOutput T_out(final quantity="ThermodynamicTemperature", final unit=temperatureUnit) = T if outputTemperature "Temperature output connector" annotation (Placement(transformation(extent={{100,30},{120,50}}))); Modelica.Blocks.Interfaces.RealOutput p_out(final quantity="Pressure", final unit=pressureUnit) = p if outputPressure "Pressure output connector" diff --git a/ThermofluidStream/Sensors/SensorState.mo b/ThermofluidStream/Sensors/SensorState.mo index 5cfb9865..c9fe3613 100644 --- a/ThermofluidStream/Sensors/SensorState.mo +++ b/ThermofluidStream/Sensors/SensorState.mo @@ -9,7 +9,7 @@ model SensorState "Sensor for thermodynamic state"

Medium Model for the sensor. Make sure it is the same as for all lines the sensors input is connected.

")); Interfaces.Inlet inlet(redeclare package Medium=Medium) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}))); + annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); Interfaces.StateOutput state_out(redeclare package Medium = Medium) "State output connector" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index 3643134a..6b9c0f53 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -39,11 +39,9 @@ model SingleFlowSensor "Flow rate sensor" annotation(Dialog(group="Output", enable=outputValue and filter_output and init==InitMode.state)); Interfaces.Inlet inlet(redeclare package Medium=Medium) - annotation (Placement(transformation(extent={{-120,-20},{-80,20}}), - iconTransformation(extent={{-120,-20},{-80,20}}))); + annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); Interfaces.Outlet outlet(redeclare package Medium=Medium) - annotation (Placement(transformation(extent={{80,-20},{120,20}}), - iconTransformation(extent={{80,-20},{120,20}}))); + annotation (Placement(transformation(extent={{80,-20},{120,20}}))); Modelica.Blocks.Interfaces.RealOutput value_out(unit=Internal.getFlowUnit(quantity)) = value if outputValue "Sensor output connector" annotation (Placement(transformation(extent={{100,50},{120,70}}))); diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index 60d6219f..5af82641 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -48,7 +48,7 @@ model SingleSensorSelect "Selectable sensor" annotation(Dialog(group="Output", enable= outputValue and filter_output and init==InitMode.state)); Interfaces.Inlet inlet(redeclare package Medium=Medium) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}))); + annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); Modelica.Blocks.Interfaces.RealOutput value_out(unit=Internal.getUnit(quantity)) = value if outputValue "Sensor output connector" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 79fe2f83..7a4f02b5 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -25,7 +25,7 @@ model SingleSensorX "Sensor for mass fraction" parameter Integer row(min=1, max=Medium.nX) = 1 "Row of meassured mass fraction"; Interfaces.Inlet inlet(redeclare package Medium=Medium) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}))); + annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); Modelica.Blocks.Interfaces.RealOutput value_out[Medium.nX](each unit="kg/kg") = value if outputValue "Mass fraction output connector" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index c052a651..d993a870 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -37,7 +37,7 @@ model TwoPhaseSensorSelect "Selectable Sensor for two phase medium" annotation(Dialog(group="Output", enable=outputValue and filter_output and init==InitMode.state)); Interfaces.Inlet inlet(redeclare package Medium=Medium) - annotation (Placement(transformation(extent={{-20, -20},{20, 20}}, origin={-100,0}))); + annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); Modelica.Blocks.Interfaces.RealOutput value_out(unit=Internal.getTwoPhaseUnit(quantity)) = value if outputValue "Sensor output connector" annotation (Placement(transformation(extent={{100,-10},{120,10}}))); diff --git a/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo b/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo index 1d79afe0..10561053 100644 --- a/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo @@ -14,9 +14,9 @@ partial model PartialSensor "Partial undirected sensor" annotation(Dialog(tab="Advanced", group="Regularization")); Interfaces.Rear rear(redeclare package Medium = Medium) - annotation (Placement(transformation(extent={{-20,-20},{20,20}}, origin={-100,-80}), iconTransformation(extent={{-120,-20},{-80,20}}))); + annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); Interfaces.Fore fore(redeclare package Medium = Medium) - annotation (Placement(transformation(extent={{-20,-20},{20,20}}, origin={100,-80}), iconTransformation(extent={{80,-20},{120,20}}))); + annotation (Placement(transformation(extent={{80,-20},{120,20}}))); /* function regStepSt = Undirected.Internal.regStepState ( redeclare package Medium = Medium) "RegStep function for a state" diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 8457d8a0..860ddf07 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -15,9 +15,9 @@ model MultiSensor_Tpm "Undirected sensor for Temperature, pressure and mass flow annotation(Dialog(tab="Advanced", group="Regularization")); Interfaces.Rear rear(redeclare package Medium = Medium) - annotation (Placement(transformation(extent={{-20,-20},{20,20}}, origin={-100,-100}),iconTransformation(extent={{-120,-120},{-80,-80}}))); + annotation (Placement(transformation(extent={{-120,-120},{-80,-80}}))); Interfaces.Fore fore(redeclare package Medium = Medium) - annotation (Placement(transformation(extent={{-20,-20},{20,20}}, origin={100,-100}),iconTransformation(extent={{80,-120},{120,-80}}))); + annotation (Placement(transformation(extent={{80,-120},{120,-80}}))); /* function regStepSt = Undirected.Internal.regStepState ( redeclare package Medium = Medium) "RegStep function for a state" From af30bc744f70974c73654c989bed09c5957185f8 Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 10:56:28 +0200 Subject: [PATCH 14/16] Use of displayParameters --- .../Sensors/DifferenceSensorSelect.mo | 4 ++-- ThermofluidStream/Sensors/DifferenceSensor_Tp.mo | 10 +++++----- .../DifferenceTwoPhaseSensorSensorSelect.mo | 4 ++-- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 10 +++++----- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 14 +++++++------- ThermofluidStream/Sensors/SingleFlowSensor.mo | 4 ++-- ThermofluidStream/Sensors/SingleSensorSelect.mo | 4 ++-- ThermofluidStream/Sensors/SingleSensorX.mo | 4 ++-- ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo | 4 ++-- .../Undirected/Sensors/Internal/PartialSensor.mo | 2 +- .../Undirected/Sensors/MultiSensor_Tpm.mo | 14 +++++++------- .../Undirected/Sensors/SingleFlowSensor.mo | 2 +- .../Undirected/Sensors/SingleSensorSelect.mo | 2 +- .../Undirected/Sensors/SingleSensorX.mo | 2 +- .../Undirected/Sensors/TwoPhaseSensorSelect.mo | 2 +- 15 files changed, 41 insertions(+), 41 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo index bf2495a3..647fbebb 100644 --- a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model DifferenceSensorSelect "Sensor for selectable quantatiy difference" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); import ThermofluidStream.Sensors.Internal.Types.Quantities; import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -121,7 +121,7 @@ equation extent={{-60,26},{60,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text( + Text(visible = displayParameters, extent={{-150,-40},{150,-70}}, textColor={0,0,0}, textString=quantityString), diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index c8c98e76..cad547fe 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model DifferenceSensor_Tp "Sensor for Temperature and pressure difference" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -126,22 +126,22 @@ equation extent={{-80,-6},{80,-56}}, textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), - Text(visible=not outputTemperature, + Text(visible= displayParameters and not outputTemperature, extent={{90,46},{150,16}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible=not outputPressure, + Text(visible= displayParameters and not outputPressure, extent={{90,-16},{150,-46}}, textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="%pressureUnit"), - Text(visible= outputTemperature, + Text(visible= displayParameters and outputTemperature, extent={{95,78},{155,48}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible=outputPressure, + Text(visible= displayParameters and outputPressure, extent={{95,-2},{155,-32}}, textColor={0,0,0}, textString="%pressureUnit", diff --git a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo index 5aca5741..6126a2cf 100644 --- a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model DifferenceTwoPhaseSensorSensorSelect "Sensor for selectable quantatiy difference of two phase media" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); import Quantities = ThermofluidStream.Sensors.Internal.Types.TwoPhaseQuantities; import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -113,7 +113,7 @@ equation extent={{-60,26},{60,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text( + Text(visible = displayParameters, extent={{-150,-70},{150,-40}}, textColor={0,0,0}, textString=quantityString), diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index bca4cef9..5f6c1b7c 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model MultiSensor_Tp "Temperature and pressure sensor" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -102,22 +102,22 @@ equation extent={{-80,-6},{80,-56}}, textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), - Text(visible=not outputTemperature, + Text(visible=displayParameters and not outputTemperature, extent={{90,46},{150,16}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible=not outputPressure, + Text(visible=displayParameters and not outputPressure, extent={{90,-16},{150,-46}}, textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="%pressureUnit"), - Text(visible= outputTemperature, + Text(visible= displayParameters and outputTemperature, extent={{95,78},{155,48}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible=outputPressure, + Text(visible= displayParameters and outputPressure, extent={{95,-2},{155,-32}}, textColor={0,0,0}, textString="%pressureUnit", diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index 48c2668b..8d08bc5b 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model MultiSensor_Tpm "Sensor for temperature, pressure and mass flow rate" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -114,32 +114,32 @@ equation extent={{-150,-160},{150,-120}}, textString="%name", textColor=dropOfCommons.instanceNameColor), - Text(visible=not outputTemperature, + Text(visible= displayParameters and not outputTemperature, extent={{150,77},{90,47}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible=not outputPressure, + Text(visible= displayParameters and not outputPressure, extent={{150,25},{90,-5}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), - Text(visible=not outputMassFlowRate, + Text(visible= displayParameters and not outputMassFlowRate, extent={{150,-27},{90,-57}}, textColor={0,0,0}, textString=massFlowString, horizontalAlignment=TextAlignment.Left), - Text(visible=outputTemperature, + Text(visible= displayParameters and outputTemperature, extent={{155,98},{95,68}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible=outputPressure, + Text(visible= displayParameters and outputPressure, extent={{155,38},{95,8}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), - Text(visible=outputMassFlowRate, + Text(visible= displayParameters and outputMassFlowRate, extent={{155,-20},{95,-50}}, textColor={0,0,0}, textString=massFlowString, diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index 6b9c0f53..cea02573 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -1,6 +1,6 @@ within ThermofluidStream.Sensors; model SingleFlowSensor "Flow rate sensor" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); import Quantities=ThermofluidStream.Sensors.Internal.Types.MassFlowQuantities; import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -107,7 +107,7 @@ equation extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text( + Text(visible = displayParameters, extent={{-150,130},{150,100}}, textColor={0,0,0}, textString=quantityString), diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index 5af82641..9e89ff7c 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model SingleSensorSelect "Selectable sensor" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); import ThermofluidStream.Sensors.Internal.Types.Quantities; import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -99,7 +99,7 @@ equation extent={{-80,26},{80,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text( + Text(visible = displayParameters, extent={{-150,-70},{150,-40}}, textColor={0,0,0}, textString=quantityString), diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 7a4f02b5..4ccea25e 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model SingleSensorX "Sensor for mass fraction" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -81,7 +81,7 @@ equation extent={{-80,26},{60,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), - Text( + Text(visible = displayParameters, extent={{-150,-70},{150,-40}}, textColor={0,0,0}, textString="X[%row] in kg/kg"), diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index d993a870..84796b7d 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model TwoPhaseSensorSelect "Selectable Sensor for two phase medium" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); import Quantities = ThermofluidStream.Sensors.Internal.Types.TwoPhaseQuantities; import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -88,7 +88,7 @@ equation extent={{-80,26},{80,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text( + Text(visible = displayParameters, extent={{-150,-70},{150,-40}}, textColor={0,0,0}, textString=quantityString), diff --git a/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo b/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo index 10561053..cac5143f 100644 --- a/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Undirected.Sensors.Internal; partial model PartialSensor "Partial undirected sensor" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); replaceable package Medium = Media.myMedia.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true, Documentation( diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 860ddf07..524ebddc 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Undirected.Sensors; model MultiSensor_Tpm "Undirected sensor for Temperature, pressure and mass flow rate" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); replaceable package Medium = Media.myMedia.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true, Documentation( @@ -143,32 +143,32 @@ equation extent={{-150,-160},{150,-120}}, textString="%name", textColor=dropOfCommons.instanceNameColor), - Text(visible=not outputTemperature, + Text(visible= displayParameters and not outputTemperature, extent={{150,77},{90,47}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible=not outputPressure, + Text(visible= displayParameters and not outputPressure, extent={{150,25},{90,-5}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), - Text(visible=not outputMassFlowRate, + Text(visible= displayParameters and not outputMassFlowRate, extent={{150,-27},{90,-57}}, textColor={0,0,0}, textString=massFlowString, horizontalAlignment=TextAlignment.Left), - Text(visible=outputTemperature, + Text(visible= displayParameters and outputTemperature, extent={{155,98},{95,68}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible=outputPressure, + Text(visible= displayParameters and outputPressure, extent={{155,38},{95,8}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), - Text(visible=outputMassFlowRate, + Text(visible= displayParameters and outputMassFlowRate, extent={{155,-22},{95,-52}}, textColor={0,0,0}, textString=massFlowString, diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index 2c27d2ea..0133d3ea 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -81,7 +81,7 @@ equation extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text( + Text(visible = displayParameters, extent={{-150,130},{150,100}}, textColor={0,0,0}, textString=quantityString), diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index 56669b91..a7c8b0e6 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -96,7 +96,7 @@ equation extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text( + Text(visible = displayParameters, extent={{-150,130},{150,100}}, textColor={0,0,0}, textString=quantityString), diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index 8106ff8e..d58435f7 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -84,7 +84,7 @@ equation extent={{-80,90},{80,30}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), - Text( + Text(visible = displayParameters, extent={{-150,130},{150,100}}, textColor={0,0,0}, textString="X[%row] in kg/kg"), diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index 9d8f7922..f0bd4159 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -86,7 +86,7 @@ equation extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text( + Text(visible = displayParameters, extent={{-150,130},{150,100}}, textColor={0,0,0}, textString=quantityString), From c7b8f266688df376b030a956dd035036bfe62820 Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 16:34:44 +0200 Subject: [PATCH 15/16] adaptDisplay --- .../Sensors/DifferenceSensorSelect.mo | 4 ++-- .../Sensors/DifferenceSensor_Tp.mo | 10 ++++---- .../DifferenceTwoPhaseSensorSensorSelect.mo | 4 ++-- ThermofluidStream/Sensors/MultiSensor_Tp.mo | 10 ++++---- ThermofluidStream/Sensors/MultiSensor_Tpm.mo | 14 +++++------ ThermofluidStream/Sensors/SensorState.mo | 6 ++--- ThermofluidStream/Sensors/SingleFlowSensor.mo | 17 ++++++++++--- .../Sensors/SingleSensorSelect.mo | 17 ++++++++++--- ThermofluidStream/Sensors/SingleSensorX.mo | 24 ++++++++++++++----- .../Sensors/TwoPhaseSensorSelect.mo | 17 ++++++++++--- .../Sensors/Internal/PartialSensor.mo | 2 +- .../Undirected/Sensors/MultiSensor_Tpm.mo | 14 +++++------ .../Undirected/Sensors/SensorState.mo | 2 +- .../Undirected/Sensors/SingleFlowSensor.mo | 15 ++++++++++-- .../Undirected/Sensors/SingleSensorSelect.mo | 15 ++++++++++-- .../Undirected/Sensors/SingleSensorX.mo | 18 +++++++++++--- .../Sensors/TwoPhaseSensorSelect.mo | 16 +++++++++++-- 17 files changed, 148 insertions(+), 57 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo index 647fbebb..bf2495a3 100644 --- a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model DifferenceSensorSelect "Sensor for selectable quantatiy difference" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); import ThermofluidStream.Sensors.Internal.Types.Quantities; import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -121,7 +121,7 @@ equation extent={{-60,26},{60,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text(visible = displayParameters, + Text( extent={{-150,-40},{150,-70}}, textColor={0,0,0}, textString=quantityString), diff --git a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo index cad547fe..da8911cb 100644 --- a/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo +++ b/ThermofluidStream/Sensors/DifferenceSensor_Tp.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model DifferenceSensor_Tp "Sensor for Temperature and pressure difference" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -126,22 +126,22 @@ equation extent={{-80,-6},{80,-56}}, textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), - Text(visible= displayParameters and not outputTemperature, + Text(visible= not outputTemperature, extent={{90,46},{150,16}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and not outputPressure, + Text(visible= not outputPressure, extent={{90,-16},{150,-46}}, textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="%pressureUnit"), - Text(visible= displayParameters and outputTemperature, + Text(visible= outputTemperature, extent={{95,78},{155,48}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and outputPressure, + Text(visible= outputPressure, extent={{95,-2},{155,-32}}, textColor={0,0,0}, textString="%pressureUnit", diff --git a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo index 6126a2cf..5aca5741 100644 --- a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model DifferenceTwoPhaseSensorSensorSelect "Sensor for selectable quantatiy difference of two phase media" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); import Quantities = ThermofluidStream.Sensors.Internal.Types.TwoPhaseQuantities; import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -113,7 +113,7 @@ equation extent={{-60,26},{60,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text(visible = displayParameters, + Text( extent={{-150,-70},{150,-40}}, textColor={0,0,0}, textString=quantityString), diff --git a/ThermofluidStream/Sensors/MultiSensor_Tp.mo b/ThermofluidStream/Sensors/MultiSensor_Tp.mo index 5f6c1b7c..77eece2d 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tp.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tp.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model MultiSensor_Tp "Temperature and pressure sensor" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -102,22 +102,22 @@ equation extent={{-80,-6},{80,-56}}, textColor={0,0,0}, textString=DynamicSelect(" p ", " "+String(p,significantDigits=digits)+" ")), - Text(visible=displayParameters and not outputTemperature, + Text(visible= not outputTemperature, extent={{90,46},{150,16}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible=displayParameters and not outputPressure, + Text(visible= not outputPressure, extent={{90,-16},{150,-46}}, textColor={0,0,0}, horizontalAlignment=TextAlignment.Left, textString="%pressureUnit"), - Text(visible= displayParameters and outputTemperature, + Text(visible= outputTemperature, extent={{95,78},{155,48}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and outputPressure, + Text(visible= outputPressure, extent={{95,-2},{155,-32}}, textColor={0,0,0}, textString="%pressureUnit", diff --git a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo index 8d08bc5b..897b5138 100644 --- a/ThermofluidStream/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Sensors/MultiSensor_Tpm.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model MultiSensor_Tpm "Sensor for temperature, pressure and mass flow rate" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -114,32 +114,32 @@ equation extent={{-150,-160},{150,-120}}, textString="%name", textColor=dropOfCommons.instanceNameColor), - Text(visible= displayParameters and not outputTemperature, + Text(visible= not outputTemperature, extent={{150,77},{90,47}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and not outputPressure, + Text(visible= not outputPressure, extent={{150,25},{90,-5}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and not outputMassFlowRate, + Text(visible= not outputMassFlowRate, extent={{150,-27},{90,-57}}, textColor={0,0,0}, textString=massFlowString, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and outputTemperature, + Text(visible= outputTemperature, extent={{155,98},{95,68}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and outputPressure, + Text(visible= outputPressure, extent={{155,38},{95,8}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and outputMassFlowRate, + Text(visible= outputMassFlowRate, extent={{155,-20},{95,-50}}, textColor={0,0,0}, textString=massFlowString, diff --git a/ThermofluidStream/Sensors/SensorState.mo b/ThermofluidStream/Sensors/SensorState.mo index c9fe3613..a1086e83 100644 --- a/ThermofluidStream/Sensors/SensorState.mo +++ b/ThermofluidStream/Sensors/SensorState.mo @@ -30,16 +30,16 @@ equation fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-80,30},{60,-30}}, + extent={{-80,30},{80,-30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,26},{60,-26}}, + extent={{-80,15},{80,-15}}, textColor={0,0,0}, textString=" state "), Line( - points={{60,0},{100,0}}, + points={{80,0},{100,0}}, color={162,29,33})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Sensors/SingleFlowSensor.mo index cea02573..13189c6b 100644 --- a/ThermofluidStream/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Sensors/SingleFlowSensor.mo @@ -1,6 +1,6 @@ within ThermofluidStream.Sensors; model SingleFlowSensor "Flow rate sensor" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); import Quantities=ThermofluidStream.Sensors.Internal.Types.MassFlowQuantities; import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -24,6 +24,8 @@ model SingleFlowSensor "Flow rate sensor" elseif quantity == ThermofluidStream.Sensors.Internal.Types.MassFlowQuantities.S_flow_JpKs then "S_flow in W/K" elseif quantity == ThermofluidStream.Sensors.Internal.Types.MassFlowQuantities.Cp_flow_JpKs then "Cp_flow in W/K" else "error"; + parameter Boolean adaptDisplay = false "=false, for standard display, =true if display is adapted" + annotation(Dialog(tab="Layout",group="Display parameters"),Evaluate=true, HideResult=true, choices(checkBox=true)); parameter SI.Density rho_min = dropOfCommons.rho_min "Minimum density" annotation(Dialog(tab="Advanced", group="Regularization")); @@ -103,14 +105,23 @@ equation lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Text( + Text(visible = not outputValue or (outputValue and not adaptDisplay), extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text(visible = displayParameters, + Text(visible = not adaptDisplay, extent={{-150,130},{150,100}}, textColor={0,0,0}, textString=quantityString), + Text(visible = adaptDisplay and not outputValue, + horizontalAlignment=TextAlignment.Left, + extent={{90,75},{250,45}}, + textColor={0,0,0}, + textString=quantityString), + Text(visible = adaptDisplay and outputValue, + extent={{-80,75},{80,45}}, + textColor={0,0,0}, + textString=" "+quantityString+" "), Line(visible=outputValue, points={{80,60},{100,60}}, color={0,0,127})}), diff --git a/ThermofluidStream/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Sensors/SingleSensorSelect.mo index 9e89ff7c..497b4adb 100644 --- a/ThermofluidStream/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Sensors/SingleSensorSelect.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model SingleSensorSelect "Selectable sensor" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); import ThermofluidStream.Sensors.Internal.Types.Quantities; import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -35,6 +35,8 @@ model SingleSensorSelect "Selectable sensor" elseif quantity == ThermofluidStream.Sensors.Internal.Types.Quantities.p_total_Pa then "(p+r) in Pa" elseif quantity == ThermofluidStream.Sensors.Internal.Types.Quantities.p_total_bar then "(p+r) in bar" else "error"; + parameter Boolean adaptDisplay = false "=false, for standard display, =true if display is adapted" + annotation(Dialog(tab="Layout",group="Display parameters"),Evaluate=true, HideResult=true, choices(checkBox=true)); parameter Boolean outputValue = false "= true, if sensor output is enabled" annotation(Dialog(group="Output"),Evaluate=true, HideResult=true, choices(checkBox=true)); @@ -95,14 +97,23 @@ equation lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Text( + Text(visible = not outputValue or (outputValue and not adaptDisplay), extent={{-80,26},{80,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text(visible = displayParameters, + Text(visible = not adaptDisplay, extent={{-150,-70},{150,-40}}, textColor={0,0,0}, textString=quantityString), + Text(visible = adaptDisplay and not outputValue, + horizontalAlignment=TextAlignment.Left, + extent={{90,15},{250,-15}}, + textColor={0,0,0}, + textString=quantityString), + Text(visible = adaptDisplay and outputValue, + extent={{-80,15},{80,-15}}, + textColor={0,0,0}, + textString=" "+quantityString+" "), Line(visible=outputValue, points={{80,0},{100,0}}, color={0,0,127})}), diff --git a/ThermofluidStream/Sensors/SingleSensorX.mo b/ThermofluidStream/Sensors/SingleSensorX.mo index 4ccea25e..069f16ac 100644 --- a/ThermofluidStream/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Sensors/SingleSensorX.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model SingleSensorX "Sensor for mass fraction" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -24,6 +24,9 @@ model SingleSensorX "Sensor for mass fraction" parameter Integer row(min=1, max=Medium.nX) = 1 "Row of meassured mass fraction"; + parameter Boolean adaptDisplay = false "=false, for standard display, =true if display is adapted" + annotation(Dialog(tab="Layout",group="Display parameters"),Evaluate=true, HideResult=true, choices(checkBox=true)); + Interfaces.Inlet inlet(redeclare package Medium=Medium) annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); Modelica.Blocks.Interfaces.RealOutput value_out[Medium.nX](each unit="kg/kg") = value if outputValue "Mass fraction output connector" @@ -73,20 +76,29 @@ equation fillPattern=FillPattern.Solid, pattern=LinePattern.None), Rectangle( - extent={{-80,30},{60,-30}}, + extent={{-80,30},{80,-30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Text( - extent={{-80,26},{60,-26}}, + Text(visible = not outputValue or (outputValue and not adaptDisplay), + extent={{-80,26},{80,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), - Text(visible = displayParameters, + Text(visible = not adaptDisplay, extent={{-150,-70},{150,-40}}, textColor={0,0,0}, textString="X[%row] in kg/kg"), + Text(visible = adaptDisplay and not outputValue, + horizontalAlignment=TextAlignment.Left, + extent={{90,15},{250,-15}}, + textColor={0,0,0}, + textString="X[%row] in kg/kg"), + Text(visible = adaptDisplay and outputValue, + extent={{-80,15},{80,-15}}, + textColor={0,0,0}, + textString=" X[%row] in kg/kg "), Line(visible=outputValue, - points={{60,0},{100,0}}, + points={{80,0},{100,0}}, color={0,0,127})}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo index 84796b7d..73c2145e 100644 --- a/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Sensors/TwoPhaseSensorSelect.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Sensors; model TwoPhaseSensorSelect "Selectable Sensor for two phase medium" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); import Quantities = ThermofluidStream.Sensors.Internal.Types.TwoPhaseQuantities; import InitMode = ThermofluidStream.Sensors.Internal.Types.InitializationModelSensor; @@ -24,6 +24,8 @@ model TwoPhaseSensorSelect "Selectable Sensor for two phase medium" elseif quantity == ThermofluidStream.Sensors.Internal.Types.TwoPhaseQuantities.p_oversat_Pa then "p - p_sat in Pa" elseif quantity == ThermofluidStream.Sensors.Internal.Types.TwoPhaseQuantities.p_oversat_bar then "p - p_sat in bar" else "error"; + parameter Boolean adaptDisplay = false "=false, for standard display, =true if display is adapted" + annotation(Dialog(tab="Layout",group="Display parameters"),Evaluate=true, HideResult=true, choices(checkBox=true)); parameter Boolean outputValue = false "= true, if sensor output is enabled" annotation(Dialog(group="Output"),Evaluate=true, HideResult=true, choices(checkBox=true)); @@ -84,14 +86,23 @@ equation lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Text( + Text(visible = not outputValue or (outputValue and not adaptDisplay), extent={{-80,26},{80,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text(visible = displayParameters, + Text(visible = not adaptDisplay, extent={{-150,-70},{150,-40}}, textColor={0,0,0}, textString=quantityString), + Text(visible = adaptDisplay and not outputValue, + horizontalAlignment=TextAlignment.Left, + extent={{90,15},{250,-15}}, + textColor={0,0,0}, + textString=quantityString), + Text(visible = adaptDisplay and outputValue, + extent={{-80,15},{80,-15}}, + textColor={0,0,0}, + textString=" "+quantityString+" "), Line(visible=outputValue, points={{80,0},{100,0}}, color={0,0,127})}), diff --git a/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo b/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo index cac5143f..10561053 100644 --- a/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/Internal/PartialSensor.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Undirected.Sensors.Internal; partial model PartialSensor "Partial undirected sensor" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); replaceable package Medium = Media.myMedia.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true, Documentation( diff --git a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo index 524ebddc..f5f5d2c8 100644 --- a/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo +++ b/ThermofluidStream/Undirected/Sensors/MultiSensor_Tpm.mo @@ -1,7 +1,7 @@ within ThermofluidStream.Undirected.Sensors; model MultiSensor_Tpm "Undirected sensor for Temperature, pressure and mass flow rate" - extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false, displayParameters=true); + extends ThermofluidStream.Utilities.DropOfCommonsPlus(displayInstanceName = false); replaceable package Medium = Media.myMedia.Interfaces.PartialMedium "Medium model" annotation (choicesAllMatching=true, Documentation( @@ -143,32 +143,32 @@ equation extent={{-150,-160},{150,-120}}, textString="%name", textColor=dropOfCommons.instanceNameColor), - Text(visible= displayParameters and not outputTemperature, + Text(visible= not outputTemperature, extent={{150,77},{90,47}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and not outputPressure, + Text(visible= not outputPressure, extent={{150,25},{90,-5}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and not outputMassFlowRate, + Text(visible= not outputMassFlowRate, extent={{150,-27},{90,-57}}, textColor={0,0,0}, textString=massFlowString, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and outputTemperature, + Text(visible= outputTemperature, extent={{155,98},{95,68}}, textColor={0,0,0}, textString=temperatureString, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and outputPressure, + Text(visible= outputPressure, extent={{155,38},{95,8}}, textColor={0,0,0}, textString=pressureUnit, horizontalAlignment=TextAlignment.Left), - Text(visible= displayParameters and outputMassFlowRate, + Text(visible= outputMassFlowRate, extent={{155,-22},{95,-52}}, textColor={0,0,0}, textString=massFlowString, diff --git a/ThermofluidStream/Undirected/Sensors/SensorState.mo b/ThermofluidStream/Undirected/Sensors/SensorState.mo index 8d5ceb06..96c027a0 100644 --- a/ThermofluidStream/Undirected/Sensors/SensorState.mo +++ b/ThermofluidStream/Undirected/Sensors/SensorState.mo @@ -34,7 +34,7 @@ equation fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-80,86},{80,34}}, + extent={{-80,75},{80,45}}, textColor={0,0,0}, textString=" state "), Ellipse( diff --git a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo index 0133d3ea..7a567fff 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleFlowSensor.mo @@ -17,6 +17,8 @@ model SingleFlowSensor "Flow sensor" elseif quantity == ThermofluidStream.Sensors.Internal.Types.MassFlowQuantities.S_flow_JpKs then "S_flow in J/(K.s)" elseif quantity == ThermofluidStream.Sensors.Internal.Types.MassFlowQuantities.Cp_flow_JpKs then "Cp_flow in J/(K.s)" else "error"; + parameter Boolean adaptDisplay = false "=false, for standard display, =true if display is adapted" + annotation(Dialog(tab="Layout",group="Display parameters"),Evaluate=true, HideResult=true, choices(checkBox=true)); parameter SI.Density rho_min = dropOfCommons.rho_min "Minimum Density" annotation(Dialog(tab="Advanced", group="Regularization")); @@ -77,14 +79,23 @@ equation lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Text( + Text(visible = not outputValue or (outputValue and not adaptDisplay), extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text(visible = displayParameters, + Text(visible = not adaptDisplay, extent={{-150,130},{150,100}}, textColor={0,0,0}, textString=quantityString), + Text(visible = adaptDisplay and not outputValue, + horizontalAlignment=TextAlignment.Left, + extent={{90,75},{250,45}}, + textColor={0,0,0}, + textString=quantityString), + Text(visible = adaptDisplay and outputValue, + extent={{-80,75},{80,45}}, + textColor={0,0,0}, + textString=" "+quantityString+" "), Line(points={{0,30},{0,0}}, color={0,0,0}), Ellipse( extent={{-6,6},{6,-6}}, diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo index a7c8b0e6..7d3df65b 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorSelect.mo @@ -26,6 +26,8 @@ model SingleSensorSelect "Selectable sensor" elseif quantity == ThermofluidStream.Sensors.Internal.Types.Quantities.p_total_Pa then "(p+r) in Pa" elseif quantity == ThermofluidStream.Sensors.Internal.Types.Quantities.p_total_bar then "(p+r) in bar" else "error"; + parameter Boolean adaptDisplay = false "=false, for standard display, =true if display is adapted" + annotation(Dialog(tab="Layout",group="Display parameters"),Evaluate=true, HideResult=true, choices(checkBox=true)); parameter SI.Density rho_min = dropOfCommons.rho_min "Minimum density" annotation(Dialog(tab="Advanced", group="Regularization")); @@ -92,14 +94,23 @@ equation lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Text( + Text(visible = not outputValue or (outputValue and not adaptDisplay), extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text(visible = displayParameters, + Text(visible = not adaptDisplay, extent={{-150,130},{150,100}}, textColor={0,0,0}, textString=quantityString), + Text(visible = adaptDisplay and not outputValue, + horizontalAlignment=TextAlignment.Left, + extent={{90,75},{250,45}}, + textColor={0,0,0}, + textString=quantityString), + Text(visible = adaptDisplay and outputValue, + extent={{-80,75},{80,45}}, + textColor={0,0,0}, + textString=" "+quantityString+" "), Ellipse( extent={{-5,5},{5,-5}}, lineColor={28,108,200}, diff --git a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo index d58435f7..be1aaa96 100644 --- a/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo +++ b/ThermofluidStream/Undirected/Sensors/SingleSensorX.mo @@ -25,6 +25,9 @@ model SingleSensorX "Mass fractions sensor" parameter Integer row(min=1, max=Medium.nX) = 1 "Row of mass fraction vector to display"; + parameter Boolean adaptDisplay = false "=false, for standard display, =true if display is adapted" + annotation(Dialog(tab="Layout",group="Display parameters"),Evaluate=true, HideResult=true, choices(checkBox=true)); + Modelica.Blocks.Interfaces.RealOutput value_out[Medium.nX](each unit="kg/kg") = value if outputValue "Measured value [variable]" annotation (Placement(transformation(extent={{100,50},{120,70}}))); @@ -80,14 +83,23 @@ equation lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Text( - extent={{-80,90},{80,30}}, + Text(visible = not outputValue or (outputValue and not adaptDisplay), + extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(display_value,significantDigits=digits)+" ")), - Text(visible = displayParameters, + Text(visible = not adaptDisplay, extent={{-150,130},{150,100}}, textColor={0,0,0}, textString="X[%row] in kg/kg"), + Text(visible = adaptDisplay and not outputValue, + horizontalAlignment=TextAlignment.Left, + extent={{90,75},{250,45}}, + textColor={0,0,0}, + textString="X[%row] in kg/kg"), + Text(visible = adaptDisplay and outputValue, + extent={{-80,75},{80,45}}, + textColor={0,0,0}, + textString=" X[%row] in kg/kg "), Ellipse( extent={{-5,5},{5,-5}}, lineColor={28,108,200}, diff --git a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo index f0bd4159..e78a2032 100644 --- a/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo +++ b/ThermofluidStream/Undirected/Sensors/TwoPhaseSensorSelect.mo @@ -23,6 +23,9 @@ model TwoPhaseSensorSelect "Selectable sensor for two phase medium" elseif quantity == ThermofluidStream.Sensors.Internal.Types.TwoPhaseQuantities.p_oversat_Pa then "p - p_sat in Pa" elseif quantity == ThermofluidStream.Sensors.Internal.Types.TwoPhaseQuantities.p_oversat_bar then "p - p_sat in bar" else "error"; + parameter Boolean adaptDisplay = false "=false, for standard display, =true if display is adapted" + annotation(Dialog(tab="Layout",group="Display parameters"),Evaluate=true, HideResult=true, choices(checkBox=true)); + parameter Boolean outputValue = false "= true, if sensor output is enabled" annotation(Dialog(group="Output"),Evaluate=true, HideResult=true, choices(checkBox=true)); parameter Boolean filter_output = false "= true, if sensor output is filtered (to break algebraic loops)" @@ -82,14 +85,23 @@ equation lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), - Text( + Text(visible = not outputValue or (outputValue and not adaptDisplay), extent={{-80,86},{80,34}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), - Text(visible = displayParameters, + Text(visible = not adaptDisplay, extent={{-150,130},{150,100}}, textColor={0,0,0}, textString=quantityString), + Text(visible = adaptDisplay and not outputValue, + horizontalAlignment=TextAlignment.Left, + extent={{90,75},{250,45}}, + textColor={0,0,0}, + textString=quantityString), + Text(visible = adaptDisplay and outputValue, + extent={{-80,75},{80,45}}, + textColor={0,0,0}, + textString=" "+quantityString+" "), Ellipse( extent={{-5,5},{5,-5}}, lineColor={28,108,200}, From 68aa2e65c95fb90a1251b49db3b09b175c951bde Mon Sep 17 00:00:00 2001 From: Raphael Gebhart Date: Tue, 15 Oct 2024 16:43:45 +0200 Subject: [PATCH 16/16] DifferentialSensor update --- .../Sensors/DifferenceSensorSelect.mo | 20 ++++++++----------- .../DifferenceTwoPhaseSensorSensorSelect.mo | 20 ++++++++----------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo index bf2495a3..3b2e02a5 100644 --- a/ThermofluidStream/Sensors/DifferenceSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceSensorSelect.mo @@ -103,22 +103,18 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,24},{66,-36}}, + extent={{-74,24},{86,-36}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), - Line( - points={{-100,0},{100,0}}, - color={28,108,200}, - thickness=0.5), Rectangle( - extent={{-60,30},{60,-30}}, + extent={{-80,30},{80,-30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,26},{60,-26}}, + extent={{-80,26},{80,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( @@ -126,7 +122,7 @@ equation textColor={0,0,0}, textString=quantityString), Ellipse( - extent={{70,30},{90,10}}, + extent={{90,40},{110,20}}, lineColor={28,108,200}, lineThickness=0.5), Line(visible=outputValue, @@ -136,22 +132,22 @@ equation points={{0,-30},{0,-40}}, color={0,0,127}), Line( - points={{72,20},{88,20}}, + points={{92,30},{108,30}}, color={28,108,200}, thickness=0.5), Ellipse( - extent={{-90,30},{-70,10}}, + extent={{-110,40},{-90,20}}, lineColor={28,108,200}, lineThickness=0.5), Line( - points={{-88,20},{-72,20}}, + points={{-108,30},{-92,30}}, color={28,108,200}, thickness=0.5), Line( points={{-8,0},{8,0}}, color={28,108,200}, thickness=0.5, - origin={-80,20}, + origin={-100,30}, rotation=90)}), Diagram(coordinateSystem(preserveAspectRatio=true)), Documentation(info=" diff --git a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo index 5aca5741..8c39f4ff 100644 --- a/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo +++ b/ThermofluidStream/Sensors/DifferenceTwoPhaseSensorSensorSelect.mo @@ -95,22 +95,18 @@ equation textString="%name", textColor=dropOfCommons.instanceNameColor), Rectangle( - extent={{-54,24},{66,-36}}, + extent={{-74,24},{86,-36}}, lineColor={0,0,0}, fillColor={215,215,215}, fillPattern=FillPattern.Solid, pattern=LinePattern.None), - Line( - points={{-100,0},{100,0}}, - color={28,108,200}, - thickness=0.5), Rectangle( - extent={{-60,30},{60,-30}}, + extent={{-80,30},{80,-30}}, lineColor={0,0,0}, fillColor={255,255,255}, fillPattern=FillPattern.Solid), Text( - extent={{-60,26},{60,-26}}, + extent={{-80,26},{80,-26}}, textColor={0,0,0}, textString=DynamicSelect(" 0.0 ", " "+String(value,significantDigits=digits)+" ")), Text( @@ -124,25 +120,25 @@ equation points={{0,-70},{0,-80}}, color={0,0,127}), Ellipse( - extent={{-90,30},{-70,10}}, + extent={{-110,40},{-90,20}}, lineColor={28,108,200}, lineThickness=0.5), Line( - points={{-88,20},{-72,20}}, + points={{-108,30},{-92,30}}, color={28,108,200}, thickness=0.5), Line( points={{-8,0},{8,0}}, color={28,108,200}, thickness=0.5, - origin={-80,20}, + origin={-100,30}, rotation=90), Line( - points={{72,20},{88,20}}, + points={{92,30},{108,30}}, color={28,108,200}, thickness=0.5), Ellipse( - extent={{70,30},{90,10}}, + extent={{90,40},{110,20}}, lineColor={28,108,200}, lineThickness=0.5)}), Diagram(coordinateSystem(preserveAspectRatio=true)),