flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T268, improvements in log display

Browse Source
This commit is contained in:
Klaus Basan
2018-07-11 02:35:42 +02:00
parent d0adcc98cb
commit 46ac34507f
2 changed files with 78 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackgui/components/interpolationlogdisplay.cpp
View File

@@ -61,7 +61,8 @@ namespace BlackGui
connect(ui->pb_ResetStats, &QPushButton::released, this, &CInterpolationLogDisplay::resetStatistics); connect(ui->pb_ResetStats, &QPushButton::released, this, &CInterpolationLogDisplay::resetStatistics);
connect(ui->pb_ShowLogInSimulator, &QPushButton::released, this, &CInterpolationLogDisplay::showLogInSimulator); connect(ui->pb_ShowLogInSimulator, &QPushButton::released, this, &CInterpolationLogDisplay::showLogInSimulator);
connect(ui->pb_FollowInSimulator, &QPushButton::released, this, &CInterpolationLogDisplay::followInSimulator); connect(ui->pb_FollowInSimulator, &QPushButton::released, this, &CInterpolationLogDisplay::followInSimulator);
connect(ui->pb_RequestElevation, &QPushButton::released, this, &CInterpolationLogDisplay::requestElevationClicked); connect(ui->pb_RequestElevation1, &QPushButton::released, this, &CInterpolationLogDisplay::requestElevationClicked);
connect(ui->pb_RequestElevation2, &QPushButton::released, this, &CInterpolationLogDisplay::requestElevationClicked);
connect(ui->pb_GetLastInterpolation, &QPushButton::released, this, &CInterpolationLogDisplay::displayLastInterpolation); connect(ui->pb_GetLastInterpolation, &QPushButton::released, this, &CInterpolationLogDisplay::displayLastInterpolation);
connect(ui->pb_InjectElevation, &QPushButton::released, this, &CInterpolationLogDisplay::onInjectElevation); connect(ui->pb_InjectElevation, &QPushButton::released, this, &CInterpolationLogDisplay::onInjectElevation);
connect(ui->tvp_AircraftSituations, &CAircraftSituationView::requestElevation, this, &CInterpolationLogDisplay::requestElevation); connect(ui->tvp_AircraftSituations, &CAircraftSituationView::requestElevation, this, &CInterpolationLogDisplay::requestElevation);

130
src/blackgui/components/interpolationlogdisplay.ui
View File

@@ -74,32 +74,76 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="lbl_Updating"> <widget class="QLabel" name="lbl_Updating">
<property name="text"> <property name="toolTip">
<string>Updating</string> <string>Updating</string>
</property> </property>
<property name="text">
<string>Upd.</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="BlackGui::CLedWidget" name="led_Updating" native="true"/> <widget class="BlackGui::CLedWidget" name="led_Updating" native="true"/>
</item> </item>
<item> <item>
<spacer name="hs_LedBar"> <widget class="QFrame" name="fr_Updating">
<property name="orientation"> <layout class="QHBoxLayout" name="hl_UpdateTimes" stretch="1,4,0">
<enum>Qt::Horizontal</enum> <property name="leftMargin">
</property> <number>3</number>
<property name="sizeHint" stdset="0"> </property>
<size> <property name="topMargin">
<width>352</width> <number>0</number>
<height>20</height> </property>
</size> <property name="rightMargin">
</property> <number>3</number>
</spacer> </property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLineEdit" name="le_UpdateTime">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="hs_UpdateTime">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>1</number>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_StartStop">
<property name="text">
<string>start</string>
</property>
</widget>
</item>
</layout>
</widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="lbl_SituationsLed"> <widget class="QLabel" name="lbl_SituationsLed">
<property name="text"> <property name="toolTip">
<string>Situations</string> <string>Situations</string>
</property> </property>
<property name="text">
<string>Sit.:</string>
</property>
</widget> </widget>
</item> </item>
<item> <item>
@@ -117,8 +161,11 @@
</item> </item>
<item> <item>
<widget class="QLabel" name="lbl_ElevationLed"> <widget class="QLabel" name="lbl_ElevationLed">
<property name="toolTip">
<string>Elevations</string>
</property>
<property name="text"> <property name="text">
<string>Elevation</string> <string>Elev.:</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -130,7 +177,7 @@
</item> </item>
<item> <item>
<widget class="QFrame" name="fr_LogStatus"> <widget class="QFrame" name="fr_LogStatus">
<layout class="QHBoxLayout" name="hl_LogCallsign" stretch="2,1,4,0,0,0,0,1"> <layout class="QHBoxLayout" name="hl_LogCallsign" stretch="2,0,0,0,0,0">
<property name="leftMargin"> <property name="leftMargin">
<number>3</number> <number>3</number>
</property> </property>
@@ -150,32 +197,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLineEdit" name="le_UpdateTime">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="hs_UpdateTime">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>1</number>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="pb_ResetStats"> <widget class="QPushButton" name="pb_ResetStats">
<property name="text"> <property name="text">
@@ -198,16 +219,16 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pb_FollowInSimulator"> <widget class="QPushButton" name="pb_RequestElevation1">
<property name="text"> <property name="text">
<string>follow</string> <string>req.elv.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pb_StartStop"> <widget class="QPushButton" name="pb_FollowInSimulator">
<property name="text"> <property name="text">
<string>start</string> <string>follow</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -220,7 +241,7 @@
<item> <item>
<widget class="QTabWidget" name="tw_LogTabs"> <widget class="QTabWidget" name="tw_LogTabs">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="tb_DataFlow"> <widget class="QWidget" name="tb_DataFlow">
<attribute name="title"> <attribute name="title">
@@ -618,9 +639,9 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="pb_RequestElevation"> <widget class="QPushButton" name="pb_RequestElevation2">
<property name="text"> <property name="text">
<string> req.elevation </string> <string> req.elv.</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -768,14 +789,15 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>comp_CallsignCompleter</tabstop>
<tabstop>le_UpdateTime</tabstop> <tabstop>le_UpdateTime</tabstop>
<tabstop>hs_UpdateTime</tabstop> <tabstop>hs_UpdateTime</tabstop>
<tabstop>pb_StartStop</tabstop>
<tabstop>comp_CallsignCompleter</tabstop>
<tabstop>pb_ResetStats</tabstop> <tabstop>pb_ResetStats</tabstop>
<tabstop>pb_ResetLastSent</tabstop> <tabstop>pb_ResetLastSent</tabstop>
<tabstop>pb_ShowLogInSimulator</tabstop> <tabstop>pb_ShowLogInSimulator</tabstop>
<tabstop>pb_RequestElevation1</tabstop>
<tabstop>pb_FollowInSimulator</tabstop> <tabstop>pb_FollowInSimulator</tabstop>
<tabstop>pb_StartStop</tabstop>
<tabstop>tw_LogTabs</tabstop> <tabstop>tw_LogTabs</tabstop>
<tabstop>le_CG</tabstop> <tabstop>le_CG</tabstop>
<tabstop>le_Parts</tabstop> <tabstop>le_Parts</tabstop>
@@ -791,16 +813,16 @@
<tabstop>le_Elevation</tabstop> <tabstop>le_Elevation</tabstop>
<tabstop>le_SimulatorSpecific</tabstop> <tabstop>le_SimulatorSpecific</tabstop>
<tabstop>tvp_AircraftSituations</tabstop> <tabstop>tvp_AircraftSituations</tabstop>
<tabstop>tvp_AircraftParts</tabstop>
<tabstop>tvp_Changes</tabstop> <tabstop>tvp_Changes</tabstop>
<tabstop>le_InjectElevation</tabstop> <tabstop>le_InjectElevation</tabstop>
<tabstop>pb_InjectElevation</tabstop> <tabstop>pb_InjectElevation</tabstop>
<tabstop>pb_RequestElevation</tabstop> <tabstop>pb_RequestElevation2</tabstop>
<tabstop>pb_GetLastInterpolation</tabstop> <tabstop>pb_GetLastInterpolation</tabstop>
<tabstop>te_LastInterpolatedSituation</tabstop> <tabstop>te_LastInterpolatedSituation</tabstop>
<tabstop>te_TextLog</tabstop>
<tabstop>te_LastInterpolatedParts</tabstop>
<tabstop>tvp_AircraftParts</tabstop>
<tabstop>te_SituationChange</tabstop> <tabstop>te_SituationChange</tabstop>
<tabstop>te_LastInterpolatedParts</tabstop>
<tabstop>te_TextLog</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>