Skip to content

PointSize -> PixelSize #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 1, 2022
Merged

PointSize -> PixelSize #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ac97023
pointSize -> pixelSize.
john-michaelburke Mar 31, 2022
ad2fc3e
Bump up fonts.
john-michaelburke Mar 31, 2022
d240fc8
Readjust fonts, revert revert of long settings change.
john-michaelburke Mar 31, 2022
5e03ed0
Add row height adjustment for descriptions that are too long to preve…
john-michaelburke Mar 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions resources/AdvancedTabComponents/AdvancedImuTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Item {
id: label

text: modelData
font.pointSize: Constants.smallPointSize
font.pixelSize: Constants.smallPixelSize
font.bold: true
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset
Expand Down Expand Up @@ -197,7 +197,7 @@ Item {
clip: true
anchors.fill: parent
anchors.margins: Constants.advancedImu.textDataBarMargin
font.pointSize: Constants.mediumPointSize
font.pixelSize: Constants.mediumPixelSize
text: "0.00 C"
}

Expand All @@ -219,7 +219,7 @@ Item {
clip: true
anchors.fill: parent
anchors.margins: Constants.advancedImu.textDataBarMargin
font.pointSize: Constants.mediumPointSize
font.pixelSize: Constants.mediumPixelSize
text: "0x00"
}

Expand All @@ -241,7 +241,7 @@ Item {
clip: true
anchors.fill: parent
anchors.margins: Constants.advancedImu.textDataBarMargin
font.pointSize: Constants.mediumPointSize
font.pixelSize: Constants.mediumPixelSize
text: "0.00 g"
}

Expand All @@ -263,7 +263,7 @@ Item {
clip: true
anchors.fill: parent
anchors.margins: Constants.advancedImu.textDataBarMargin
font.pointSize: Constants.mediumPointSize
font.pixelSize: Constants.mediumPixelSize
text: "0.00 g"
}

Expand All @@ -285,7 +285,7 @@ Item {
clip: true
anchors.fill: parent
anchors.margins: Constants.advancedImu.textDataBarMargin
font.pointSize: Constants.mediumPointSize
font.pixelSize: Constants.mediumPixelSize
text: "0.00 g"
}

Expand Down
2 changes: 1 addition & 1 deletion resources/AdvancedTabComponents/AdvancedMagnetometerTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Item {
id: label

text: modelData
font.pointSize: Constants.smallPointSize
font.pixelSize: Constants.smallPixelSize
font.bold: true
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset
Expand Down
14 changes: 7 additions & 7 deletions resources/AdvancedTabComponents/FusionStatusFlags.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Item {

Label {
text: Constants.advancedImu.insStatusLabels[0]
font.pointSize: Constants.fusionStatusFlags.labelFontSize
font.pixelSize: Constants.fusionStatusFlags.labelFontSize
}

UnknownStatus {
Expand All @@ -58,7 +58,7 @@ Item {

Label {
text: Constants.advancedImu.insStatusLabels[1]
font.pointSize: Constants.fusionStatusFlags.labelFontSize
font.pixelSize: Constants.fusionStatusFlags.labelFontSize
}

UnknownStatus {
Expand All @@ -83,7 +83,7 @@ Item {

Label {
text: Constants.advancedImu.insStatusLabels[2]
font.pointSize: Constants.fusionStatusFlags.labelFontSize
font.pixelSize: Constants.fusionStatusFlags.labelFontSize
}

UnknownStatus {
Expand All @@ -108,7 +108,7 @@ Item {

Label {
text: Constants.advancedImu.insStatusLabels[3]
font.pointSize: Constants.fusionStatusFlags.labelFontSize
font.pixelSize: Constants.fusionStatusFlags.labelFontSize
}

UnknownStatus {
Expand All @@ -133,7 +133,7 @@ Item {

Label {
text: Constants.advancedImu.insStatusLabels[4]
font.pointSize: Constants.fusionStatusFlags.labelFontSize
font.pixelSize: Constants.fusionStatusFlags.labelFontSize
}

UnknownStatus {
Expand All @@ -158,7 +158,7 @@ Item {

Label {
text: Constants.advancedImu.insStatusLabels[5]
font.pointSize: Constants.fusionStatusFlags.labelFontSize
font.pixelSize: Constants.fusionStatusFlags.labelFontSize
}

UnknownStatus {
Expand Down Expand Up @@ -307,7 +307,7 @@ Item {

label: Label {
text: Constants.fusionStatusFlags.title
font.pointSize: Constants.fusionStatusFlags.titleFontSize
font.pixelSize: Constants.fusionStatusFlags.titleFontSize
}

}
Expand Down
4 changes: 2 additions & 2 deletions resources/AdvancedTabComponents/MessageBroadcaster.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ Item {
text: ""
cursorVisible: true
selectByMouse: true
font.pointSize: Constants.largePointSize
font.pixelSize: Constants.largePixelSize
font.family: Constants.genericTable.fontFamily
anchors.left: parent.left
anchors.right: parent.right
Expand Down Expand Up @@ -207,7 +207,7 @@ Item {
text: ""
cursorVisible: true
selectByMouse: true
font.pointSize: Constants.largePointSize
font.pixelSize: Constants.largePixelSize
font.family: Constants.genericTable.fontFamily
anchors.left: parent.left
anchors.right: parent.right
Expand Down
2 changes: 1 addition & 1 deletion resources/AdvancedTabComponents/MetricsMonitor.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Item {
elide: Text.ElideRight
clip: true
font.family: Constants.genericTable.fontFamily
font.pointSize: Constants.largePointSize
font.pixelSize: Constants.largePixelSize
}

MouseArea {
Expand Down
2 changes: 1 addition & 1 deletion resources/AdvancedTabComponents/NetworkInfo.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ColumnLayout {
elide: Text.ElideRight
clip: true
font.family: Constants.genericTable.fontFamily
font.pointSize: Constants.largePointSize
font.pixelSize: Constants.largePixelSize
}

MouseArea {
Expand Down
2 changes: 1 addition & 1 deletion resources/AdvancedTabComponents/ThreadStateTable.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Item {
elide: Text.ElideRight
clip: true
font.family: Constants.genericTable.fontFamily
font.pointSize: Constants.largePointSize
font.pixelSize: Constants.largePixelSize
}

MouseArea {
Expand Down
2 changes: 1 addition & 1 deletion resources/BaseComponents/SmallCheckBox.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ T.CheckBox {

font {
family: Constants.fontFamily
pointSize: Constants.smallPointSize
pixelSize: Constants.smallPixelSize
bold: true
}

Expand Down
2 changes: 1 addition & 1 deletion resources/BaseComponents/SwiftTextInput.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Rectangle {
property var fontFamily: Constants.genericTable.fontFamily
property font labelFont: Qt.font({
"family": Constants.genericTable.fontFamily,
"pointSize": Constants.largePointSize
"pixelSize": Constants.largePixelSize
})

signal textEdited()
Expand Down
2 changes: 1 addition & 1 deletion resources/BaseComponents/SwiftTextbox.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Rectangle {
property var fontFamily: Constants.genericTable.fontFamily
property font labelFont: Qt.font({
"family": Constants.genericTable.fontFamily,
"pointSize": Constants.largePointSize
"pixelSize": Constants.largePixelSize
})

Label {
Expand Down
4 changes: 2 additions & 2 deletions resources/BaselineTabComponents/BaselinePlot.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ Item {
id: marker

text: "+ "
font.pointSize: (Constants.mediumPointSize + Constants.commonLegend.markerPointSizeOffset)
font.pixelSize: (Constants.mediumPixelSize + Constants.commonLegend.markerPixelSizeOffset)
font.bold: true
color: Constants.baselinePlot.colors[index]
anchors.verticalCenter: parent.verticalCenter
Expand All @@ -284,7 +284,7 @@ Item {
id: label

text: modelData
font.pointSize: Constants.mediumPointSize
font.pixelSize: Constants.mediumPixelSize
font.bold: true
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: Constants.commonLegend.verticalCenterOffset
Expand Down
2 changes: 1 addition & 1 deletion resources/BaselineTabComponents/BaselineTable.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Item {
elide: Text.ElideRight
clip: true
font.family: Constants.genericTable.fontFamily
font.pointSize: Constants.largePointSize
font.pixelSize: Constants.largePixelSize
}

MouseArea {
Expand Down
2 changes: 1 addition & 1 deletion resources/ChartLegend.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Rectangle {
id: legendTextMetrics

font.family: Constants.fontFamily
font.pointSize: Constants.xSmallPointSize
font.pixelSize: Constants.xSmallPixelSize
text: cellTextSample
}

Expand Down
39 changes: 19 additions & 20 deletions resources/Constants/Constants.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,12 @@ QtObject {
readonly property string fontFamily: "Roboto Condensed"
property FontLoader robotoCondensedLightFont
readonly property string lightFontFamily: robotoCondensedLightFont.name
readonly property real fontScaleFactor: (Qt.platform.os == "osx" && Globals.useHighDpi) ? 1.5 : 1
readonly property real xSmallPointSize: fontScaleFactor * 6
readonly property real smallPointSize: fontScaleFactor * 7
readonly property real mediumPointSize: fontScaleFactor * 8
readonly property real largePointSize: fontScaleFactor * 9
readonly property real xlPointSize: fontScaleFactor * 12
readonly property real xxlPointSize: fontScaleFactor * 14
readonly property real xSmallPixelSize: 8
readonly property real smallPixelSize: 10
readonly property real mediumPixelSize: 11
readonly property real largePixelSize: 12
readonly property real xlPixelSize: 18
readonly property real xxlPixelSize: 19
readonly property bool debugMode: false
readonly property color swiftWhite: "#FFFFFF"
readonly property color swiftGrey: "#323F48"
Expand All @@ -77,7 +76,7 @@ QtObject {
readonly property color tabLabelColor: swiftOrange
readonly property font tabLabelFont: Qt.font({
"family": "Roboto Condensed",
"pointSize": 20,
"pixelSize": 25,
"bold": true,
"letterSpacing": 1,
"capitalization": Font.AllUppercase
Expand All @@ -86,7 +85,7 @@ QtObject {
readonly property color appNameColor: swiftLightGrey
readonly property font appNameFont: Qt.font({
"family": robotoCondensedLightFont.name,
"pointSize": 20,
"pixelSize": 25,
"letterSpacing": 2,
"capitalization": Font.AllUppercase
})
Expand Down Expand Up @@ -118,8 +117,8 @@ QtObject {
readonly property string supportWebsite: "https://www.swiftnav.com/support"
readonly property string website: "https://www.swiftnav.com"
readonly property string copyrightText: "Copyright © 2011-2022 Swift Navigation Inc."
readonly property int titlePointSize: 14
readonly property int secondaryPointSize: 10
readonly property int titlePixelSize: 14
readonly property int secondaryPixelSize: 10
}

}
Expand Down Expand Up @@ -284,7 +283,7 @@ QtObject {
readonly property color borderColor: "black"
readonly property int borderWidth: 0
readonly property color textColor: "black"
readonly property int textPointSize: largePointSize + 1
readonly property int textPixelSize: largePixelSize + 1
readonly property int keyValueSpacing: 5
readonly property int valueMinimumWidth: 25
readonly property string portLabel: "Port:"
Expand Down Expand Up @@ -351,7 +350,7 @@ QtObject {
readonly property int recordingSizeLabelWidth: 40
readonly property font comboBoxFont: Qt.font({
"family": fontFamily,
"pointSize": mediumPointSize
"pixelSize": mediumPixelSize
})
}

Expand Down Expand Up @@ -539,8 +538,8 @@ QtObject {
readonly property int markerWidth: 20
readonly property int topMargin: 85
readonly property int rightMargin: 60
readonly property real markerPointSizeOffset: 4
readonly property int labelPointSize: 10
readonly property real markerPixelSizeOffset: 4
readonly property int labelPixelSize: 10
readonly property int padding: 10
readonly property int spacing: 5
readonly property int verticalCenterOffset: -1
Expand All @@ -566,23 +565,23 @@ QtObject {
readonly property color labelsColor: "#000000"
readonly property font titleFont: Qt.font({
"family": fontFamily,
"pointSize": xlPointSize,
"pixelSize": xlPixelSize,
"bold": true
})
readonly property color titleColor: swiftGrey
readonly property font axisTitleFont: Qt.font({
"family": fontFamily,
"pointSize": mediumPointSize,
"pixelSize": mediumPixelSize,
"bold": true,
"letterSpacing": 2,
"capitalization": Font.AllUppercase
})
readonly property font axisLabelsFont: Qt.font({
"family": fontFamily,
"pointSize": smallPointSize,
"pixelSize": smallPixelSize,
"bold": true
})
readonly property int tickPointSize: 10
readonly property int tickPixelSize: 10
readonly property int buttonHeight: 40
readonly property int unitDropdownWidth: 90
readonly property real zoomInMult: 1.1
Expand Down Expand Up @@ -620,7 +619,7 @@ QtObject {
readonly property int xAxisTickInterval: 10
readonly property font yAxisTitleFont: Qt.font({
"family": fontFamily,
"pointSize": mediumPointSize,
"pixelSize": mediumPixelSize,
"bold": true,
"letterSpacing": 2,
"capitalization": Font.MixedCase
Expand Down
1 change: 0 additions & 1 deletion resources/Constants/Globals.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ QtObject {
property int currentRefreshRate: 5 // 5 Hz
property bool useOpenGL: false
property bool useAntiAliasing: true
property bool useHighDpi: true
property bool showPrompts: true
property int initialMainTabIndex: 0 // Tracking
property int initialSubTabIndex: 0 // Signals
Expand Down
4 changes: 2 additions & 2 deletions resources/LogPanel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Item {
contentItem: Label {
text: modelData
color: logLevelIndex == index ? Constants.swiftOrange : Constants.genericTable.textColor
font.pointSize: Constants.mediumPointSize
font.pixelSize: Constants.mediumPixelSize
}

}
Expand All @@ -157,7 +157,7 @@ Item {
elide: Text.ElideRight
clip: true
font.family: Constants.genericTable.fontFamily
font.pointSize: Constants.largePointSize
font.pixelSize: Constants.largePixelSize

Button {
id: button
Expand Down
Loading