Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/FactSystem/Fact.cc
Original file line number Diff line number Diff line change
Expand Up @@ -386,14 +386,14 @@ QString Fact::invalidValueString(int decimalPlaces) const {
case FactMetaData::valueTypeFloat:
case FactMetaData::valueTypeDouble:
if (decimalPlaces <= 0) {
return QStringLiteral("--");
return QStringLiteral("");
}
return QStringLiteral("--.") +
QString(decimalPlaces, QLatin1Char('-'));
return QStringLiteral(".") +
QString(decimalPlaces, QChar(u'–'));
case FactMetaData::valueTypeElapsedTimeInSeconds:
return QStringLiteral("--:--:--");
return QStringLiteral("––:––:––");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to be clear, using this as an example. Since I think I said it wrong. I like the original version better where the indicator is made up of dashes or negative signs which show up as individual digits and don't blend together as a single bloc.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think they just blend together because of the font, they look separate both in QtCreator and in QGC. They're just like hyphens, but wider (average digit width). Check the screenshot in #13698 to see how they look. To me it's much better than master, makes the fields jump less in size when they finally become valid. Also removes the inconsistency of using 2 dashes since these don't really look like a minus sign.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think they just blend together because of the font,

Yeah, seem right. I just built it and it looks like this:
Screenshot 2025-12-08 at 8 16 05 AM
which seems fine to me.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait how come the vertical speed and ground speed are 0? Should be invalid and using the placeholder string.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question. Didn't notice that!

default:
return QStringLiteral("--");
return QStringLiteral("");
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/FlightDisplay/ProximityRadarValues.qml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ QtObject {
property var rgRotationValueStrings: [ rotationNoneValueString, rotationYaw45ValueString, rotationYaw90ValueString, rotationYaw135ValueString, rotationYaw180ValueString, rotationYaw225ValueString, rotationYaw270ValueString, rotationYaw315ValueString ]

property var _distanceSensors: vehicle ? vehicle.distanceSensors : null
property string _noValueStr: qsTr("--.--")
property string _noValueStr: qsTr("–.––")

onRotationNoneValueChanged: rotationValueChanged()
onRotationYaw45ValueChanged: rotationValueChanged()
Expand Down
2 changes: 1 addition & 1 deletion src/QmlControls/GPSIndicatorPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ ToolIndicatorPage {

property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property string na: qsTr("N/A", "No data to display")
property string valueNA: qsTr("--.--", "No data to display")
property string valueNA: qsTr("–.––", "No data to display")
property var rtkSettings: QGroundControl.settingsManager.rtkSettings
property var useFixedPosition: rtkSettings.useFixedBasePosition.rawValue
property var manufacturer: rtkSettings.baseReceiverManufacturers.rawValue
Expand Down
2 changes: 1 addition & 1 deletion src/QmlControls/InstrumentValueValue.qml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ ColumnLayout {
if (instrumentValueData.fact) {
return instrumentValueData.fact.enumOrValueString + (instrumentValueData.showUnits ? " " + instrumentValueData.fact.units : "")
} else {
return qsTr("--")
return qsTr("")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/UI/toolbar/EscIndicatorPage.qml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ToolIndicatorPage {

property var activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
property string na: qsTr("N/A", "No data to display")
property string valueNA: qsTr("--", "No data to display")
property string valueNA: qsTr("", "No data to display")

property var _escs: activeVehicle ? activeVehicle.escs : null
property int _onlineBitmask: _escs ? _escs.get(0).info.rawValue : 0
Expand Down
2 changes: 1 addition & 1 deletion src/Vehicle/FactGroups/BatteryFactGroupListModel.cc
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ void BatteryFactGroup::_handleBatteryStatus(Vehicle *vehicle, const mavlink_mess
void BatteryFactGroup::_timeRemainingChanged(const QVariant &value)
{
if (qIsNaN(value.toDouble())) {
_timeRemainingStrFact.setRawValue("--:--:--");
_timeRemainingStrFact.setRawValue("––:––:––");
} else {
const int totalSeconds = value.toInt();
const int hours = totalSeconds / 3600;
Expand Down
2 changes: 1 addition & 1 deletion src/Vehicle/FactGroups/VehicleFactGroup.cc
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ VehicleFactGroup::VehicleFactGroup(QObject *parent)
_addFact(&_throttlePctFact);
_addFact(&_imuTempFact);

_hobbsFact.setRawValue(QStringLiteral("----:--:--"));
_hobbsFact.setRawValue(QStringLiteral("––––:––:––"));
}

void VehicleFactGroup::handleMessage(Vehicle *vehicle, const mavlink_message_t &message)
Expand Down
Loading