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;