Index: SDDs/Main_Treatment/TreatmentParameters-BloodFlow.dot =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa --- SDDs/Main_Treatment/TreatmentParameters-BloodFlow.dot (.../TreatmentParameters-BloodFlow.dot) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ SDDs/Main_Treatment/TreatmentParameters-BloodFlow.dot (.../TreatmentParameters-BloodFlow.dot) (revision 541df48d71d23c4305221eb3af2c00dd5c791daa) @@ -5,8 +5,8 @@ // Prefix: q - Qt component, d - Diality componenet, i - image // Define the main componenets dBloodFlowLabelValue [shape=box, label="LabelValue.qml\nItem", fontsize="30pt"]; - dBloodFlowUpIcon [shape=box, label="TreatmentSectionIcon.qml\nTouchRect", fontsize="30pt"]; - dBloodFlowDownIcon [shape=box, label="TreatmentSectionIcon.qml\nTouchRect", fontsize="30pt"]; + dBloodFlowUpIcon [shape=box, label="TreatmentSectionIcon.qml\nTouchRect", fontsize="30pt"]; + dBloodFlowDownIcon [shape=box, label="TreatmentSectionIcon.qml\nTouchRect", fontsize="30pt"]; // screenshots iBloodFlow [shape=none, label="", image="images/BloodFlow.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; @@ -24,7 +24,7 @@ qBloodFlowRow [shape=ellipse, label="Row", fontsize="30pt"]; qBloodFlowExtraText [shape=ellipse, label="Text\nid: _extraText\n'visible: false", fontsize="30pt"]; qBloodFlowColumn [shape=ellipse, label="Column", fontsize="30pt"]; - qBloodFlowTopText [shape=ellipse, label="Text\nid: _topText", fontsize="30pt"]; + qBloodFlowTopText [shape=ellipse, label="Text\nvTreatmentSetPoint.bloodFlow", fontsize="30pt"]; qBloodFlowCenterText [shape=ellipse, label="Text\nid: _centerText\n'visible: false'", fontsize="30pt"]; qBloodFlowBottomText [shape=ellipse, label="Text\nid: _bottomText", fontsize="30pt"]; qBloodFlowUnitText [shape=ellipse, label="Text\nid: _unitText\n'visible: false'", fontsize="30pt"]; Index: SDDs/Main_Treatment/TreatmentParameters-DialysateCond.dot =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa --- SDDs/Main_Treatment/TreatmentParameters-DialysateCond.dot (.../TreatmentParameters-DialysateCond.dot) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ SDDs/Main_Treatment/TreatmentParameters-DialysateCond.dot (.../TreatmentParameters-DialysateCond.dot) (revision 541df48d71d23c4305221eb3af2c00dd5c791daa) @@ -19,7 +19,7 @@ qDialysateCondRow [shape=ellipse, label="Row", fontsize="30pt"]; qDialysateCondExtraText [shape=ellipse, label="Text\nid: _extraText\n'visible: false", fontsize="30pt"]; qDialysateCondColumn [shape=ellipse, label="Column\n'visible: false'", fontsize="30pt"]; - qDialysateCondTopText [shape=ellipse, label="Text\nid: _topText", fontsize="30pt"]; + qDialysateCondTopText [shape=ellipse, label="Text\nvDDConductivity.acidBicarbCondutivity2", fontsize="30pt"]; qDialysateCondCenterText [shape=ellipse, label="Text\nid: _centerText\n'visible: false'", fontsize="30pt"]; qDialysateCondBottomText [shape=ellipse, label="Text\nid: _bottomText", fontsize="30pt"]; qDialysateCondUnitText [shape=ellipse, label="Text\nid: _unitText\n'visible: false'", fontsize="30pt"]; Index: SDDs/Main_Treatment/TreatmentParameters-DialysateFlow.dot =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa --- SDDs/Main_Treatment/TreatmentParameters-DialysateFlow.dot (.../TreatmentParameters-DialysateFlow.dot) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ SDDs/Main_Treatment/TreatmentParameters-DialysateFlow.dot (.../TreatmentParameters-DialysateFlow.dot) (revision 541df48d71d23c4305221eb3af2c00dd5c791daa) @@ -25,7 +25,7 @@ qDialysateFlowRow [shape=ellipse, label="Row", fontsize="30pt"]; qDialysateFlowExtraText [shape=ellipse, label="Text\nid: _extraText", fontsize="30pt"]; qDialysateFlowColumn [shape=ellipse, label="Column", fontsize="30pt"]; - qDialysateFlowTopText [shape=ellipse, label="Text\nid: _topText", fontsize="30pt"]; + qDialysateFlowTopText [shape=ellipse, label="Text\nvTreatmentSetPoint.dialysateFlow", fontsize="30pt"]; qDialysateFlowCenterText [shape=ellipse, label="Text\nid: _centerText\n'visible: false'", fontsize="30pt"]; qDialysateFlowBottomText [shape=ellipse, label="Text\nid: _bottomText", fontsize="30pt"]; qDialysateFlowUnitText [shape=ellipse, label="Text\nid: _unitText\n'visible: false'", fontsize="30pt"]; Index: SDDs/Main_Treatment/TreatmentParameters-DialysateTemp.dot =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa --- SDDs/Main_Treatment/TreatmentParameters-DialysateTemp.dot (.../TreatmentParameters-DialysateTemp.dot) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ SDDs/Main_Treatment/TreatmentParameters-DialysateTemp.dot (.../TreatmentParameters-DialysateTemp.dot) (revision 541df48d71d23c4305221eb3af2c00dd5c791daa) @@ -24,7 +24,7 @@ qDialysateTempRow [shape=ellipse, label="Row", fontsize="30pt"]; qDialysateTempExtraText [shape=ellipse, label="Text\nid: _extraText\n'visible: false", fontsize="30pt"]; qDialysateTempColumn [shape=ellipse, label="Column", fontsize="30pt"]; - qDialysateTempTopText [shape=ellipse, label="Text\nid: _topText", fontsize="30pt"]; + qDialysateTempTopText [shape=ellipse, label="Text\nvTreatmentSetPoint.dialysateTemp", fontsize="30pt"]; qDialysateTempCenterText [shape=ellipse, label="Text\nid: _centerText\n'visible: false'", fontsize="30pt"]; qDialysateTempBottomText [shape=ellipse, label="Text\nid: _bottomText", fontsize="30pt"]; qDialysateTempUnitText [shape=ellipse, label="Text\nid: _unitText\n'visible: false'", fontsize="30pt"]; Index: SDDs/Main_Treatment/TreatmentPressures.dot =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa --- SDDs/Main_Treatment/TreatmentPressures.dot (.../TreatmentPressures.dot) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ SDDs/Main_Treatment/TreatmentPressures.dot (.../TreatmentPressures.dot) (revision 541df48d71d23c4305221eb3af2c00dd5c791daa) @@ -74,48 +74,48 @@ iTmpUpperMarkerStick [shape=none, label="", image="images/TmpUpperMarkerStick.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; // qml types - qPressuresSection [shape=ellipse, label="Rectangle", fontsize="30pt"]; - qPressuresSectionTitle [shape=ellipse, label="Text\n'Pressures(mmHg)'", fontsize="30pt"]; - qPressuresLockImage [shape=ellipse, label="Image\nid: _lockButton\n'visible: false'", fontsize="30pt"]; - qPressuresEditImage [shape=ellipse, label="Image", fontsize="30pt"]; - qPressuresContentColumn [shape=ellipse, label="Column", fontsize="30pt"]; - qExpandingButtonImage [shape=ellipse, label="Image", fontsize="30pt"]; - qArterialPressureComponentRow [shape=ellipse, label="Row", fontsize="30pt"]; - qVenousPressureComponentRow [shape=ellipse, label="Row", fontsize="30pt"]; - qTmpPressureComponentRow [shape=ellipse, label="Row", fontsize="30pt"]; - qArterialTitleText [shape=ellipse, label="Text\nid: _title", fontsize="30pt"]; - qArterialValueText [shape=ellipse, label="Text\nid: _value", fontsize="30pt"]; - qVenousTitleText [shape=ellipse, label="Text\nid: _title", fontsize="30pt"]; - qVenousValueText [shape=ellipse, label="Text\nid: _value", fontsize="30pt"]; - qTmpTitleText [shape=ellipse, label="Text\nid: _titlet", fontsize="30pt"]; - qTmpValueText [shape=ellipse, label="Text\nid: _value", fontsize="30pt"]; - qArterialMarkerValueHandle [shape=ellipse, label="Rectangle\nid: _handle", fontsize="30pt"]; - qArterialMarkerValueStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; - qArterialMarkerValueText [shape=ellipse, label="Text", fontsize="30pt"]; - qArterialMarkerLowerHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; - qArterialMarkerLowerStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; - qArterialMarkerLowerText [shape=ellipse, label="Text", fontsize="30pt"]; - qArterialMarkerUpperHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; - qArterialMarkerUpperStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; - qArterialMarkerUpperText [shape=ellipse, label="Text", fontsize="30pt"]; - qVenousMarkerValueHandle [shape=ellipse, label="Rectangle\nid: _handle", fontsize="30pt"]; - qVenousMarkerValueStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; - qVenousMarkerValueText [shape=ellipse, label="Text", fontsize="30pt"]; - qVenousMarkerLowerHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; - qVenousMarkerLowerStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; - qVenousMarkerLowerText [shape=ellipse, label="Text", fontsize="30pt"]; - qVenousMarkerUpperHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; - qVenousMarkerUpperStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; - qVenousMarkerUpperText [shape=ellipse, label="Text", fontsize="30pt"]; - qTmpMarkerValueHandle [shape=ellipse, label="Rectangle\nid: _handle", fontsize="30pt"]; - qTmpMarkerValueStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; - qTmpMarkerValueText [shape=ellipse, label="Text", fontsize="30pt"]; - qTmpMarkerLowerHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; - qTmpMarkerLowerStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; - qTmpMarkerLowerText [shape=ellipse, label="Text", fontsize="30pt"]; - qTmpMarkerUpperHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; - qTmpMarkerUpperStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; - qTmpMarkerUpperText [shape=ellipse, label="Text", fontsize="30pt"]; + qPressuresSection [shape=ellipse, label="Rectangle", fontsize="30pt"]; + qPressuresSectionTitle [shape=ellipse, label="Text\n'Pressures(mmHg)'", fontsize="30pt"]; + qPressuresLockImage [shape=ellipse, label="Image\nid: _lockButton\n'visible: false'", fontsize="30pt"]; + qPressuresEditImage [shape=ellipse, label="Image", fontsize="30pt"]; + qPressuresContentColumn [shape=ellipse, label="Column", fontsize="30pt"]; + qExpandingButtonImage [shape=ellipse, label="Image", fontsize="30pt"]; + qArterialPressureComponentRow [shape=ellipse, label="Row", fontsize="30pt"]; + qVenousPressureComponentRow [shape=ellipse, label="Row", fontsize="30pt"]; + qTmpPressureComponentRow [shape=ellipse, label="Row", fontsize="30pt"]; + qArterialTitleText [shape=ellipse, label="Text\nid: _title", fontsize="30pt"]; + qArterialValueText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.arterialPressure", fontsize="25pt"]; + qVenousTitleText [shape=ellipse, label="Text\nid: _title", fontsize="30pt"]; + qVenousValueText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.venousPressure", fontsize="25pt"]; + qTmpTitleText [shape=ellipse, label="Text\nid: _title", fontsize="30pt"]; + qTmpValueText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.tmpPressure", fontsize="25pt"]; + qArterialMarkerValueHandle [shape=ellipse, label="Rectangle\nid: _handle", fontsize="30pt"]; + qArterialMarkerValueStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; + qArterialMarkerValueText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.arterialPressure", fontsize="25pt"]; + qArterialMarkerLowerHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; + qArterialMarkerLowerStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; + qArterialMarkerLowerText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.arterialMin", fontsize="25pt"]; + qArterialMarkerUpperHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; + qArterialMarkerUpperStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; + qArterialMarkerUpperText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.arterialMax", fontsize="25pt"]; + qVenousMarkerValueHandle [shape=ellipse, label="Rectangle\nid: _handle", fontsize="30pt"]; + qVenousMarkerValueStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; + qVenousMarkerValueText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.venousPressure", fontsize="30pt"]; + qVenousMarkerLowerHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; + qVenousMarkerLowerStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; + qVenousMarkerLowerText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.venousMin", fontsize="25pt"]; + qVenousMarkerUpperHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; + qVenousMarkerUpperStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; + qVenousMarkerUpperText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.venousMax", fontsize="25pt"]; + qTmpMarkerValueHandle [shape=ellipse, label="Rectangle\nid: _handle", fontsize="30pt"]; + qTmpMarkerValueStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; + qTmpMarkerValueText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.tmpPressure", fontsize="25pt"]; + qTmpMarkerLowerHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; + qTmpMarkerLowerStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; + qTmpMarkerLowerText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.tmpMin", fontsize="25pt"]; + qTmpMarkerUpperHandle [shape=ellipse, label="Rectangle\nid: _handle\n'visible: false'", fontsize="30pt"]; + qTmpMarkerUpperStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; + qTmpMarkerUpperText [shape=ellipse, label="Text\nvTreatmentPressureOcclusion.tmpMax", fontsize="25pt"]; // Diagram Layout subgraph cluster_one { Index: SDDs/Main_Treatment/TreatmentSaline.dot =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa --- SDDs/Main_Treatment/TreatmentSaline.dot (.../TreatmentSaline.dot) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ SDDs/Main_Treatment/TreatmentSaline.dot (.../TreatmentSaline.dot) (revision 541df48d71d23c4305221eb3af2c00dd5c791daa) @@ -33,7 +33,7 @@ qSalineContentColumn [shape=ellipse, label="Column", fontsize="30pt"]; qSalineDesciptionText [shape=ellipse, label="Text", fontsize="30pt"]; qSalineProgressArea [shape=ellipse, label="Item\nid: _progressBarArea", fontsize="30pt"]; - qSalineValueText [shape=ellipse, label="Text\nValue", fontsize="30pt"]; + qSalineValueText [shape=ellipse, label="Text\nvTreatmentSaline.delivered", fontsize="30pt"]; qSalineUnitText [shape=ellipse, label="Text\nUnit", fontsize="30pt"]; qSalineRangeHandle [shape=ellipse, label="Rectangle\nHandle", fontsize="30pt"]; qSalineRangeStick [shape=ellipse, label="Rectangle\nStick", fontsize="30pt"]; Index: SDDs/Main_Treatment/TreatmentTime.dot =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa --- SDDs/Main_Treatment/TreatmentTime.dot (.../TreatmentTime.dot) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ SDDs/Main_Treatment/TreatmentTime.dot (.../TreatmentTime.dot) (revision 541df48d71d23c4305221eb3af2c00dd5c791daa) @@ -7,10 +7,10 @@ dTimeEditIcon [shape=box, label="TreatmentSectionIcon.qml\nTouchRect", fontsize="30pt"]; dProgressCircle [shape=box, label="ProgressCircle.qml\nItem", fontsize="30pt"]; dCircle [shape=box, label="Circle.qml\nItem", fontsize="30pt"]; - dTimeText [shape=box, label="TimeText.qml\nRectangle", fontsize="30pt"]; + dTimeText [shape=box, label="TimeText.qml\nRectangle\nvTreatmentTime.time_Remaining", fontsize="30pt"]; // screenshots - iTreatmentTime [shape=none, label="Rectangle", image="images/TreatmentTime.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true]; + iTreatmentTime [shape=none, label="Rectangle", image="images/TreatmentTime.png", fontcolor="#00FF21", fontsize="30pt", labelloc=t, imagescale=true]; iTimeText [shape=none, label="", image="images/TimeText.png"]; iTimeTitleRect [shape=none, label="", image="images/TimeTitleRect.png"]; iTimeRemaining [shape=none, label="", image="images/TimeRemaining.png"]; Index: SDDs/Main_Treatment/TreatmentUltrafiltration.dot =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa --- SDDs/Main_Treatment/TreatmentUltrafiltration.dot (.../TreatmentUltrafiltration.dot) (revision 77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8) +++ SDDs/Main_Treatment/TreatmentUltrafiltration.dot (.../TreatmentUltrafiltration.dot) (revision 541df48d71d23c4305221eb3af2c00dd5c791daa) @@ -10,10 +10,8 @@ dUfVolumeLabelValue [shape=box, label="LabelValue.qml\nid: _ufVolume", fontsize="30pt"]; dUfRateLabelValue [shape=box, label="LabelValue.qml\nid: _ufRate", fontsize="30pt"]; dIsolatedUfButton [shape=box, label="TouchRect.qml\nRectangle", fontsize="30pt"]; - dUfProgressBarEx [shape=box, label="ProgressBarEx.qml\nid: _progressRectEx\nProgressBar.qml", fontsize="30pt"]; - dUfProgressBarProgressRect [shape=box, label="ProgressRect.qml\nRangeRect.qml", fontsize="30pt"]; + dUfProgressBar [shape=box, label="ProgressBar.qml\nRangeRect.qml", fontsize="30pt"]; dUfProgressBarRect [shape=box, label="ProgressRect.qml\nid: _progressRect", fontsize="30pt"]; - dUfProgressBarRangeMarker [shape=box, label="RangeMarker.qml\nRangeRect.qml", fontsize="30pt"]; // screenshots iTreatmentUF [shape=none, label="TreatmentSection.qml", image="images/TreatmentUltrafiltration.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; @@ -34,42 +32,34 @@ iIsolatedUfButton [shape=none, label="", image="images/IsolatedUfButton.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; iVolumeRemoved [shape=none, label="", image="images/VolumeRemoved.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; iUfProgressBar [shape=none, label="", image="images/UfProgressBar.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; - iUfProgressBarRightBgrnd [shape=none, label="", image="images/UfProgressBarRightBgrnd.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; iUfProgressBarProgressRect [shape=none, label="", image="images/UfProgressBarProgressRect.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; - iUfProgressRectMain [shape=none, label="Rectangle", image="images/UfProgressRectMain.png", fontcolor="#00FF21", fontsize="25pt", labelloc=l, imagescale=true]; iUfProgressMin [shape=none, label="", image="images/UfProgressMin.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; iUfProgressMax [shape=none, label="", image="images/UfProgressMax.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; - iUfProgressMarker [shape=none, label="Rectangle", image="images/UfProgressMarker.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; - iUfProgressMarkerHandle [shape=none, label="", image="images/UfProgressMarkerHandle.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; - iUfProgressMarkerStick [shape=none, label="", image="images/UfProgressMarkerStick.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; - iUfProgressMarkerText [shape=none, label="", image="images/UfProgressMarkerText.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; + iUfValueText [shape=none, label="", image="images/UfValueText.png", fontcolor="#00FF21", fontsize="25pt", labelloc=t, imagescale=true]; - // qml types - qUltrafiltrationSection [shape=ellipse, label="Rectangle", fontsize="30pt"]; - qUltrafiltrationSectionTitle [shape=ellipse, label="Text\n'Ultrafiltration(UF)'", fontsize="30pt"]; - qUltrafiltrationLockImage [shape=ellipse, label="Image\n'visible: false'", fontsize="30pt"]; - qUltrafiltrationEditImage [shape=ellipse, label="Image", fontsize="30pt"]; - qUltrafiltrationContentRow [shape=ellipse, label="Row", fontsize="30pt"]; - qUltrafiltrationLeftColumn [shape=ellipse, label="Column\nid: _leftColumn", fontsize="30pt"]; - qUltrafiltrationRightColumn [shape=ellipse, label="Column\nid: _rightColumn", fontsize="30pt"]; - qUfVolumeTopText [shape=ellipse, label="Text\nid: _topText", fontsize="30pt"]; - qUfVolumeCenterText [shape=ellipse, label="Text\nid: _centerText", fontsize="30pt"]; - qUfVolumeBottomText [shape=ellipse, label="Text\nid: _bottomText", fontsize="30pt"]; - qUfVolumeUnitText [shape=ellipse, label="Text\nid: _unitText", fontsize="30pt"]; - qUfRateTopText [shape=ellipse, label="Text\nid: _topText", fontsize="30pt"]; - qUfRateCenterText [shape=ellipse, label="Text\nid: _centerText\n'visible: false'", fontsize="30pt"]; - qUfRateBottomText [shape=ellipse, label="Text\nid: _bottomText", fontsize="30pt"]; - qUfRateUnitText [shape=ellipse, label="Text\nid: _unitText", fontsize="30pt"]; - qIsolatedUfButtonText [shape=ellipse, label="Text", fontsize="30pt"]; - qVolumeRemovedText [shape=ellipse, label="Text", fontsize="30pt"]; - qProgressRightBackground [shape=ellipse, label="Rectangle", fontsize="30pt"]; - qProgressBarProgressMin [shape=ellipse, label="Text\nid: _textMinimum\n'visible: false'", fontsize="30pt"]; - qProgressBarProgressMax [shape=ellipse, label="Text\nid: _textMaximum\n'visible: false'", fontsize="30pt"]; - qProgressBarMin [shape=ellipse, label="Text\nid: _textMinimum", fontsize="30pt"]; - qProgressBarMax [shape=ellipse, label="Text\nid: _textMaximum", fontsize="30pt"]; - qProgressMarkerHandle [shape=ellipse, label="Rectangle\nid: _handle", fontsize="30pt"]; - qProgressMarkerStick [shape=ellipse, label="Rectangle\nid: _stick", fontsize="30pt"]; - qProgressMarkerText [shape=ellipse, label="Text", fontsize="30pt"]; + // qml types + qUltrafiltrationSection [shape=ellipse, label="Rectangle", fontsize="30pt"]; + qUltrafiltrationSectionTitle [shape=ellipse, label="Text\n'Ultrafiltration(UF)'", fontsize="30pt"]; + qUltrafiltrationLockImage [shape=ellipse, label="Image\n'visible: false'", fontsize="30pt"]; + qUltrafiltrationEditImage [shape=ellipse, label="Image", fontsize="30pt"]; + qUltrafiltrationContentRow [shape=ellipse, label="Row", fontsize="30pt"]; + qUltrafiltrationLeftColumn [shape=ellipse, label="Column\nid: _leftColumn", fontsize="30pt"]; + qUltrafiltrationRightColumn [shape=ellipse, label="Column\nid: _rightColumn", fontsize="30pt"]; + qUfVolumeTopText [shape=ellipse, label="Text\nid: _topText", fontsize="30pt"]; + qUfVolumeCenterText [shape=ellipse, label="Text\nid: _centerText", fontsize="30pt"]; + qUfVolumeBottomText [shape=ellipse, label="Text\vTreatmentUltrafiltration.setVolume", fontsize="30pt"]; + qUfVolumeUnitText [shape=ellipse, label="Text\nid: _unitText", fontsize="30pt"]; + qUfRateTopText [shape=ellipse, label="Text\nid: _topText", fontsize="30pt"]; + qUfRateCenterText [shape=ellipse, label="Text\nid: _centerText\n'visible: false'", fontsize="30pt"]; + qUfRateBottomText [shape=ellipse, label="Text\nvTreatmentUltrafiltration.targetRate", fontsize="30pt"]; + qUfRateUnitText [shape=ellipse, label="Text\nid: _unitText", fontsize="30pt"]; + qIsolatedUfButtonText [shape=ellipse, label="Text", fontsize="30pt"]; + qVolumeRemovedText [shape=ellipse, label="Text", fontsize="30pt"]; + qvalueText [shape=ellipse, label="Text\nvTreatmentUltrafiltration.volumeRemoved", fontsize="30pt"]; + qProgressBarProgressMin [shape=ellipse, label="Text\nid: _textMinimum\n'visible: false'", fontsize="30pt"]; + qProgressBarProgressMax [shape=ellipse, label="Text\nid: _textMaximum\n'visible: false'", fontsize="30pt"]; + qProgressBarMin [shape=ellipse, label="Text\nvTreatmentUltrafiltration.minimum", fontsize="30pt"]; + qProgressBarMax [shape=ellipse, label="Text\nvTreatmentUltrafiltration.maximum", fontsize="30pt"]; // Diagram Layout subgraph cluster_one { @@ -80,7 +70,6 @@ iTreatmentUF -> qUltrafiltrationSection[color="red"]; qUltrafiltrationSection -> dIsolatedUfButton -> qIsolatedUfButtonText ->iIsolatedUfButton; - qUltrafiltrationSection -> dSectionHeaderUltrafiltration -> iUltrafiltrationHeader; iUltrafiltrationHeader -> qUltrafiltrationSectionTitle; iUltrafiltrationHeader -> dUltrafiltrationHeaderLockButton -> qUltrafiltrationLockImage; @@ -102,20 +91,14 @@ iUfRateLabel -> qUfRateUnitText -> iUfRateUnitText; qUltrafiltrationContentRow -> qUltrafiltrationRightColumn -> iUfRightColumn; - iUfRightColumn -> qVolumeRemovedText -> iVolumeRemoved; + iUfRightColumn -> qVolumeRemovedText -> iVolumeRemoved; + iUfRightColumn -> qvalueText -> iUfValueText; - iUfRightColumn -> dUfProgressBarEx -> iUfProgressBar; - iUfProgressBar -> qProgressRightBackground -> iUfProgressBarRightBgrnd; + iUfRightColumn -> dUfProgressBar -> iUfProgressBar; - iUfProgressBar -> dUfProgressBarRangeMarker -> iUfProgressMarker; - iUfProgressMarker -> qProgressMarkerHandle -> iUfProgressMarkerHandle; - iUfProgressMarker -> qProgressMarkerStick -> iUfProgressMarkerStick; - iUfProgressMarker -> qProgressMarkerText -> iUfProgressMarkerText ; + iUfProgressBar -> qProgressBarMin -> iUfProgressMin; + iUfProgressBar -> qProgressBarMax -> iUfProgressMax; - iUfProgressBar -> dUfProgressBarProgressRect -> iUfProgressRectMain; - iUfProgressRectMain -> qProgressBarMin -> iUfProgressMin; - iUfProgressRectMain -> qProgressBarMax -> iUfProgressMax; - iUfProgressBar -> dUfProgressBarRect -> iUfProgressBarProgressRect; iUfProgressBarProgressRect -> qProgressBarProgressMin; iUfProgressBarProgressRect -> qProgressBarProgressMax; Index: SDDs/Main_Treatment/images/TreatmentUltrafiltration.png =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa Binary files differ Index: SDDs/Main_Treatment/images/UfProgressBar.png =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa Binary files differ Index: SDDs/Main_Treatment/images/UfProgressBarRightBgrnd.png =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa Binary files differ Index: SDDs/Main_Treatment/images/UfProgressMarker.png =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa Binary files differ Index: SDDs/Main_Treatment/images/UfProgressMarkerHandle.png =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa Binary files differ Index: SDDs/Main_Treatment/images/UfProgressMarkerStick.png =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa Binary files differ Index: SDDs/Main_Treatment/images/UfProgressMarkerText.png =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa Binary files differ Index: SDDs/Main_Treatment/images/UfProgressRectMain.png =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa Binary files differ Index: SDDs/Main_Treatment/images/UfRightColumn.png =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa Binary files differ Index: SDDs/Main_Treatment/images/UfValueText.png =================================================================== diff -u Binary files differ Index: SDDs/Main_Treatment/images/UltrafiltrationContent.png =================================================================== diff -u -r77ba0083b790f7c1c851c60ecaeaa4f2e7eff7a8 -r541df48d71d23c4305221eb3af2c00dd5c791daa Binary files differ