zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Added convenience function to ScreenTools to compute appropriate font point size.

QGC4.4
dogmaphobic 10 years ago
parent
a5bd07945b
commit
9b6e5499fd
11 changed files with 43 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/AutoPilotPlugins/PX4/FlightModesComponent.qml
  2. 16
      src/AutoPilotPlugins/PX4/PowerComponent.qml
  3. 18
      src/AutoPilotPlugins/PX4/SafetyComponent.qml
  4. 2
      src/AutoPilotPlugins/PX4/SensorsComponent.qml
  5. 2
      src/FactSystem/FactSystemTest.qml
  6. 5
      src/QmlControls/ScreenTools.cc
  7. 6
      src/QmlControls/ScreenTools.h
  8. 4
      src/QmlControls/VehicleRotationCal.qml
  9. 2
      src/VehicleSetup/FirmwareUpgrade.qml
  10. 2
      src/VehicleSetup/VehicleSummary.qml
  11. 14
      src/ui/toolbar/MainToolBar.qml

4
src/AutoPilotPlugins/PX4/FlightModesComponent.qml
Unescape View File

@ -382,7 +382,7 @@ Item { @@ -382,7 +382,7 @@ Item {
QGCLabel {
text: "FLIGHT MODES CONFIG"
font.pointSize: 20 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(20);
}
Item { height: 20; width: 10 } // spacer
@ -873,7 +873,7 @@ Item { @@ -873,7 +873,7 @@ Item {
QGCLabel {
text: "FLIGHT MODES CONFIG"
font.pointSize: 20 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(20);
}
QGCLabel {

16
src/AutoPilotPlugins/PX4/PowerComponent.qml
Unescape View File

@ -98,13 +98,13 @@ Rectangle { @@ -98,13 +98,13 @@ Rectangle {
QGCLabel {
text: "POWER CONFIG"
font.pointSize: 20 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(20);
}
QGCLabel {
text: "Battery"
color: palette.text
font.pointSize: 20 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(20);
}
Rectangle {
@ -208,12 +208,12 @@ Rectangle { @@ -208,12 +208,12 @@ Rectangle {
text: "Battery Max:"
color: palette.text
width: 80
font.pointSize: 12 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(12);
}
QGCLabel {
text: (battNumCells.value * battHighVolt.value).toFixed(1) + ' V'
color: palette.text
font.pointSize: 12 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(12);
}
}
Row {
@ -222,12 +222,12 @@ Rectangle { @@ -222,12 +222,12 @@ Rectangle {
text: "Battery Min:"
color: palette.text
width: 80
font.pointSize: 12 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(12);
}
QGCLabel {
text: (battNumCells.value * battLowVolt.value).toFixed(1) + ' V'
color: palette.text
font.pointSize: 12 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(12);
}
}
}
@ -245,7 +245,7 @@ Rectangle { @@ -245,7 +245,7 @@ Rectangle {
QGCLabel {
text: "Propeller Function"
color: palette.text
font.pointSize: 20 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(20);
}
Rectangle {
width: parent.width
@ -259,7 +259,7 @@ Rectangle { @@ -259,7 +259,7 @@ Rectangle {
QGCLabel {
text: "Magnetometer Distortion"
color: palette.text
font.pointSize: 20 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(20);
}
Rectangle {
width: parent.width

18
src/AutoPilotPlugins/PX4/SafetyComponent.qml
Unescape View File

@ -54,7 +54,7 @@ Rectangle { @@ -54,7 +54,7 @@ Rectangle {
QGCLabel {
text: "SAFETY CONFIG"
font.pointSize: 20 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(20);
}
Item { height: 20; width: 10 } // spacer
@ -62,7 +62,7 @@ Rectangle { @@ -62,7 +62,7 @@ Rectangle {
//-----------------------------------------------------------------
//-- Return Home Triggers
QGCLabel { text: "Triggers For Return Home"; color: palette.text; font.pointSize: 20 * screenTools.dpiFactor; }
QGCLabel { text: "Triggers For Return Home"; color: palette.text; font.pointSize: screenTools.dpiAdjustedPointSize(20); }
Item { height: 10; width: 10 } // spacer
@ -121,7 +121,7 @@ Rectangle { @@ -121,7 +121,7 @@ Rectangle {
//-----------------------------------------------------------------
//-- Return Home Settings
QGCLabel { text: "Return Home Settings"; font.pointSize: 20 * screenTools.dpiFactor; }
QGCLabel { text: "Return Home Settings"; font.pointSize: screenTools.dpiAdjustedPointSize(20); }
Item { height: 10; width: 10 } // spacer
@ -273,12 +273,12 @@ Rectangle { @@ -273,12 +273,12 @@ Rectangle {
QGCLabel {
text: "Home loiter altitude";
color: palette.text;
enabled: homeLoiterCheckbox.checked == true
enabled: homeLoiterCheckbox.checked === true
}
FactTextField {
id: descendField;
fact: Fact { name: "RTL_DESCEND_ALT" }
enabled: homeLoiterCheckbox.checked == true
enabled: homeLoiterCheckbox.checked === true
showUnits: true
}
}
@ -291,17 +291,17 @@ Rectangle { @@ -291,17 +291,17 @@ Rectangle {
QGCLabel {
property Fact fact: Fact { name: "NAV_RCL_OBC" }
width: parent.width
font.pointSize: 14 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(14);
text: "Warning: You have an advanced safety configuration set using the NAV_RCL_OBC parameter. The above settings may not apply.";
visible: fact.value != 0
visible: fact.value !== 0
wrapMode: Text.Wrap
}
QGCLabel {
property Fact fact: Fact { name: "NAV_DLL_OBC" }
width: parent.width
font.pointSize: 14 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(14);
text: "Warning: You have an advanced safety configuration set using the NAV_DLL_OBC parameter. The above settings may not apply.";
visible: fact.value != 0
visible: fact.value !== 0
wrapMode: Text.Wrap
}
}

2
src/AutoPilotPlugins/PX4/SensorsComponent.qml
Unescape View File

@ -87,7 +87,7 @@ Rectangle { @@ -87,7 +87,7 @@ Rectangle {
QGCLabel {
text: "SENSORS CONFIG"
font.pointSize: 20 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(20);
}
Item { height: 20; width: 10 } // spacer

2
src/FactSystem/FactSystemTest.qml
Unescape View File

@ -33,7 +33,7 @@ Item { @@ -33,7 +33,7 @@ Item {
Fact { id: fact; name: "RC_MAP_THROTTLE" }
text: fact.value
font.family: "Helvetica"
font.pointSize: 24 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(24);
color: "red"
focus: true
onAccepted: { fact.value = text; }

5
src/QmlControls/ScreenTools.cc
Unescape View File

@ -42,6 +42,11 @@ ScreenTools::ScreenTools() @@ -42,6 +42,11 @@ ScreenTools::ScreenTools()
connect(MainWindow::instance(), &MainWindow::repaintCanvas, this, &ScreenTools::_updateCanvas);
}
qreal ScreenTools::dpiAdjustedPointSize(qreal pointSize)
{
return pointSize * _dpiFactor;
}
void ScreenTools::_updateCanvas()
{
emit repaintRequestedChanged();

6
src/QmlControls/ScreenTools.h
Unescape View File

@ -110,6 +110,12 @@ public: @@ -110,6 +110,12 @@ public:
*/
Q_PROPERTY(bool repaintRequested READ repaintRequested NOTIFY repaintRequestedChanged)
//! Utility for adjusting font point size.
/*!
@sa dpiFactor
*/
Q_INVOKABLE qreal dpiAdjustedPointSize(qreal pointSize);
double screenDPI () { return _dotsPerInch; }
double dpiFactor () { return _dpiFactor; }
int mouseX () { return QCursor::pos().x(); }

4
src/QmlControls/VehicleRotationCal.qml
Unescape View File

@ -68,7 +68,7 @@ Rectangle { @@ -68,7 +68,7 @@ Rectangle {
height: parent.height
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignBottom
font.pointSize: 25 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(25);
font.bold: true
color: "black"
@ -79,7 +79,7 @@ Rectangle { @@ -79,7 +79,7 @@ Rectangle {
height: parent.height
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignBottom
font.pointSize: 25 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(25);
color: calInProgress ? "yellow" : "white"
text: parent.calText

2
src/VehicleSetup/FirmwareUpgrade.qml
Unescape View File

@ -51,7 +51,7 @@ Rectangle { @@ -51,7 +51,7 @@ Rectangle {
QGCLabel {
text: "FIRMWARE UPDATE"
font.pointSize: 20 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(20);
}
Item {

2
src/VehicleSetup/VehicleSummary.qml
Unescape View File

@ -47,7 +47,7 @@ Rectangle { @@ -47,7 +47,7 @@ Rectangle {
QGCLabel {
text: "VEHICLE SUMMARY"
font.pointSize: 20 * screenTools.dpiFactor;
font.pointSize: screenTools.dpiAdjustedPointSize(20);
}
Item {

14
src/ui/toolbar/MainToolBar.qml
Unescape View File

@ -241,7 +241,7 @@ Rectangle { @@ -241,7 +241,7 @@ Rectangle {
Text {
id: messageText
text: (mainToolBar.messageCount > 0) ? mainToolBar.messageCount : ''
font.pointSize: 14 * screenTools.dpiFactor
font.pointSize: screenTools.dpiAdjustedPointSize(14);
font.weight: Font.DemiBold
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
@ -329,7 +329,7 @@ Rectangle { @@ -329,7 +329,7 @@ Rectangle {
Text {
id: satelitteText
text: (mainToolBar.satelliteCount > 0) ? mainToolBar.satelliteCount : ''
font.pointSize: 14 * screenTools.dpiFactor
font.pointSize: screenTools.dpiAdjustedPointSize(14);
font.weight: Font.DemiBold
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
@ -364,7 +364,7 @@ Rectangle { @@ -364,7 +364,7 @@ Rectangle {
Text {
id: batteryText
text: mainToolBar.batteryVoltage.toFixed(1) + ' V';
font.pointSize: 14 * screenTools.dpiFactor
font.pointSize: screenTools.dpiAdjustedPointSize(14);
font.weight: Font.DemiBold
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
@ -392,7 +392,7 @@ Rectangle { @@ -392,7 +392,7 @@ Rectangle {
Text {
id: armedStatusText
text: (mainToolBar.systemArmed) ? qsTr("ARMED") : qsTr("DISARMED")
font.pointSize: 12 * screenTools.dpiFactor
font.pointSize: screenTools.dpiAdjustedPointSize(12);
font.weight: Font.DemiBold
anchors.centerIn: parent
color: (mainToolBar.systemArmed) ? colorOrangeText : colorGreenText
@ -411,7 +411,7 @@ Rectangle { @@ -411,7 +411,7 @@ Rectangle {
Text {
id: stateStatusText
text: mainToolBar.currentState
font.pointSize: 12 * screenTools.dpiFactor
font.pointSize: screenTools.dpiAdjustedPointSize(12);
font.weight: Font.DemiBold
anchors.centerIn: parent
color: (mainToolBar.currentState === "STANDBY") ? colorGreenText : colorRedText
@ -432,7 +432,7 @@ Rectangle { @@ -432,7 +432,7 @@ Rectangle {
Text {
id: modeStatusText
text: mainToolBar.currentMode
font.pointSize: 12 * screenTools.dpiFactor
font.pointSize: screenTools.dpiAdjustedPointSize(12);
font.weight: Font.DemiBold
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
@ -453,7 +453,7 @@ Rectangle { @@ -453,7 +453,7 @@ Rectangle {
Text {
id: connectionStatusText
text: qsTr("CONNECTION LOST")
font.pointSize: 14 * screenTools.dpiFactor
font.pointSize: screenTools.dpiAdjustedPointSize(14);
font.weight: Font.DemiBold
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter

Write Preview
Loading…
Cancel
Save