Browse Source

New FactBitmask control

QGC4.4
Don Gagne 9 years ago
parent
commit
8a4426ac72
  1. 1
      qgroundcontrol.qrc
  2. 30
      src/FactSystem/FactControls/FactBitmask.qml
  3. 2
      src/FactSystem/FactControls/FactComboBox.qml
  4. 11
      src/FactSystem/FactControls/qmldir

1
qgroundcontrol.qrc

@ -76,6 +76,7 @@ @@ -76,6 +76,7 @@
<file alias="QGroundControl/Controls/VehicleSummaryRow.qml">src/QmlControls/VehicleSummaryRow.qml</file>
<file alias="QGroundControl/Controls/ViewWidget.qml">src/ViewWidgets/ViewWidget.qml</file>
<file alias="QGroundControl/Controls/FactSliderPanel.qml">src/QmlControls/FactSliderPanel.qml</file>
<file alias="QGroundControl/FactControls/FactBitmask.qml">src/FactSystem/FactControls/FactBitmask.qml</file>
<file alias="QGroundControl/FactControls/FactCheckBox.qml">src/FactSystem/FactControls/FactCheckBox.qml</file>
<file alias="QGroundControl/FactControls/FactComboBox.qml">src/FactSystem/FactControls/FactComboBox.qml</file>
<file alias="QGroundControl/FactControls/FactLabel.qml">src/FactSystem/FactControls/FactLabel.qml</file>

30
src/FactSystem/FactControls/FactBitmask.qml

@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
import QtQuick 2.5
import QtQuick.Controls 1.2
import QGroundControl.FactSystem 1.0
import QGroundControl.Palette 1.0
import QGroundControl.Controls 1.0
import QGroundControl.ScreenTools 1.0
Row {
spacing: ScreenTools.defaultFontPixelWidth
property Fact fact: Fact { }
Repeater {
model: fact.bitmaskStrings
QGCCheckBox {
text: modelData
checked: fact.value & fact.bitmaskValues[index]
onClicked: {
if (checked) {
fact.value |= fact.bitmaskValues[index]
} else {
fact.value &= ~fact.bitmaskValues[index]
}
}
}
}
}

2
src/FactSystem/FactControls/FactComboBox.qml

@ -18,7 +18,7 @@ QGCComboBox { @@ -18,7 +18,7 @@ QGCComboBox {
if (indexModel) {
fact.value = index
} else {
fact.enumIndex = index
fact.value = fact.enumValues[index]
}
}
}

11
src/FactSystem/FactControls/qmldir

@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
Module QGroundControl.FactControls
FactPanel 1.0 FactPanel.qml
FactLabel 1.0 FactLabel.qml
FactTextField 1.0 FactTextField.qml
FactCheckBox 1.0 FactCheckBox.qml
FactComboBox 1.0 FactComboBox.qml
FactBitmask 1.0 FactBitmask.qml
FactCheckBox 1.0 FactCheckBox.qml
FactComboBox 1.0 FactComboBox.qml
FactLabel 1.0 FactLabel.qml
FactPanel 1.0 FactPanel.qml
FactTextField 1.0 FactTextField.qml

Loading…
Cancel
Save