Index: sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml =================================================================== diff -u -rc3a1e077ddeba65709084f9af5dd756741db8b4f -r5215e145a0f26a20c99e3f10af6ac8a9c3b67383 --- sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml (.../ConfirmTreatmentSubTable.qml) (revision c3a1e077ddeba65709084f9af5dd756741db8b4f) +++ sources/gui/qml/components/pretreatment/ConfirmTreatmentSubTable.qml (.../ConfirmTreatmentSubTable.qml) (revision 5215e145a0f26a20c99e3f10af6ac8a9c3b67383) @@ -14,62 +14,49 @@ // Qt import QtQuick 2.12 -import QtQuick.Layouts 1.12 // Project // Qml imports import "qrc:/globals" import "qrc:/components" -Rectangle { - id: _root - property var prescriptionKeys: [] - property var prescriptionValues: [] - property var operatingKeys: [] - property var operatingValues: [] +Rectangle { id: _root + property var prescriptionKeys : [] + property var prescriptionValues : [] + property var operatingKeys : [] + property var operatingValues : [] objectName: "ConfirmTreatmentSubTable" - color: "transparent" + color: Colors.transparent - GridLayout { - id: _prescription_grid - anchors.top: parent.top - anchors.topMargin: Variables.sliderTextMargin + Column { id: _prescriptionColumn + anchors { + top: parent.top + topMargin: Variables.sliderTextMargin + } width: _root.width / 2 - rows: _root.prescriptionKeys.length - columns: 1 - - Repeater { - id: _prescription_repeater + Repeater { id: _prescription_repeater model: prescriptionKeys ConfirmTreatmentTableEntry { - key: prescriptionKeys[index] - value: prescriptionValues[index] + key : prescriptionKeys[index] + value : prescriptionValues[index] } } } - GridLayout { - id: _operating_grid - anchors.top: parent.top - anchors.topMargin: Variables.sliderTextMargin - anchors.left: _prescription_grid.right - rows: _root.prescriptionKeys.length + Column { id: _operatingColumn + anchors { + top : parent.top + topMargin : Variables.sliderTextMargin + left : _prescriptionColumn.right + } width: _root.width / 2 - columns: 1 - - Repeater { - id: _operating_repeater + Repeater { id: _operating_repeater model: operatingKeys ConfirmTreatmentTableEntry { - key: operatingKeys[index] + key : operatingKeys[index] value: operatingValues[index] } - - } } - - - }