Ref T275, adjusted log display to use ISimulator::getStatisticsSimulatorSpecific

This commit is contained in:
Klaus Basan
2018-06-08 22:03:46 +02:00
parent 4975ecd712
commit 39943c1365
3 changed files with 448 additions and 318 deletions

View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
<height>600</height>
<height>800</height>
</rect>
</property>
<property name="windowTitle">
@@ -27,151 +27,169 @@
<number>3</number>
</property>
<item>
<widget class="QGroupBox" name="gb_LogCallsign">
<widget class="QGroupBox" name="gb_StatusAndCallsign">
<property name="title">
<string>Log. callsign</string>
<string>Status and callsign</string>
</property>
<layout class="QHBoxLayout" name="hl_LogCallsign" stretch="2,1,4,0,0,1">
<layout class="QVBoxLayout" name="vl_StatusAndCallsign">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>3</number>
<number>2</number>
</property>
<property name="topMargin">
<number>3</number>
<number>2</number>
</property>
<property name="rightMargin">
<number>3</number>
<number>2</number>
</property>
<property name="bottomMargin">
<number>3</number>
<number>2</number>
</property>
<item>
<widget class="BlackGui::Components::CCallsignCompleter" name="comp_CallsignCompleter">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<widget class="QFrame" name="fr_Status">
<layout class="QHBoxLayout" name="hl_Status">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QLabel" name="lbl_RunningLed">
<property name="text">
<string>Running</string>
</property>
</widget>
</item>
<item>
<widget class="BlackGui::CLedWidget" name="led_Running" native="true"/>
</item>
<item>
<spacer name="hs_LedBar">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>352</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="lbl_SituationsLed">
<property name="text">
<string>Situations</string>
</property>
</widget>
</item>
<item>
<widget class="BlackGui::CLedWidget" name="led_Situation" native="true"/>
</item>
<item>
<widget class="QLabel" name="lbl_PartsLed">
<property name="text">
<string>Parts</string>
</property>
</widget>
</item>
<item>
<widget class="BlackGui::CLedWidget" name="led_Parts" native="true"/>
</item>
<item>
<widget class="QLabel" name="lbl_ElevationLed">
<property name="text">
<string>Elevation</string>
</property>
</widget>
</item>
<item>
<widget class="BlackGui::CLedWidget" name="led_Elevation" native="true"/>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QLineEdit" name="le_UpdateTime">
<property name="readOnly">
<bool>true</bool>
</property>
<widget class="QFrame" name="fr_LogStatus">
<layout class="QHBoxLayout" name="hl_LogCallsign" stretch="2,1,4,0,0,1">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="BlackGui::Components::CCallsignCompleter" name="comp_CallsignCompleter">
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
</widget>
</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>
<widget class="QPushButton" name="pb_ResetStats">
<property name="text">
<string>reset stats.</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_ShowInSimulator">
<property name="text">
<string>show in sim.</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_StartStop">
<property name="text">
<string>start</string>
</property>
</widget>
</item>
</layout>
</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_ResetStats">
<property name="text">
<string>reset stats.</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_ShowInSimulator">
<property name="text">
<string>show in sim.</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pb_StartStop">
<property name="text">
<string>start</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gb_Status">
<property name="title">
<string>Status</string>
</property>
<layout class="QHBoxLayout" name="hl_Status">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<number>3</number>
</property>
<item>
<widget class="QLabel" name="lbl_RunningLed">
<property name="text">
<string>Running</string>
</property>
</widget>
</item>
<item>
<widget class="BlackGui::CLedWidget" name="led_Running" native="true"/>
</item>
<item>
<spacer name="hs_LedBar">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>352</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="lbl_SituationsLed">
<property name="text">
<string>Situations</string>
</property>
</widget>
</item>
<item>
<widget class="BlackGui::CLedWidget" name="led_Situation" native="true"/>
</item>
<item>
<widget class="QLabel" name="lbl_PartsLed">
<property name="text">
<string>Parts</string>
</property>
</widget>
</item>
<item>
<widget class="BlackGui::CLedWidget" name="led_Parts" native="true"/>
</item>
<item>
<widget class="QLabel" name="lbl_ElevationLed">
<property name="text">
<string>Elevation</string>
</property>
</widget>
</item>
<item>
<widget class="BlackGui::CLedWidget" name="led_Elevation" native="true"/>
</item>
</layout>
</widget>
</item>
@@ -184,35 +202,13 @@
<attribute name="title">
<string>Data flow</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="4" column="0">
<widget class="QGroupBox" name="gb_InboundSituations">
<property name="title">
<string>Inbound situations</string>
</property>
<layout class="QVBoxLayout" name="vl_InboundSituations">
<item>
<widget class="BlackGui::Views::CAircraftSituationView" name="tvp_AircraftSituations">
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="0" colspan="2">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="gb_DataMisc">
<property name="title">
<string>Misc.</string>
</property>
<layout class="QGridLayout" name="gl_Misc" columnstretch="0,1,0,1,0,1,0,1,0,3,0">
<layout class="QGridLayout" name="gl_Misc">
<property name="leftMargin">
<number>3</number>
</property>
@@ -225,27 +221,28 @@
<property name="bottomMargin">
<number>3</number>
</property>
<item row="0" column="7">
<widget class="QLineEdit" name="le_UpdateReqTime">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>req.time ms</string>
<item row="3" column="0">
<widget class="QLabel" name="lbl_SimSpecific">
<property name="text">
<string>Simulator:</string>
</property>
</widget>
</item>
<item row="0" column="9">
<widget class="QLineEdit" name="le_UpdateTimes">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>time min, max, ..</string>
<item row="0" column="10">
<widget class="QLabel" name="lbl_Void">
<property name="text">
<string>Not used:</string>
</property>
</widget>
</item>
<item row="0" column="8">
<item row="1" column="2">
<widget class="QLabel" name="lbl_UpdateNumber">
<property name="text">
<string>Upd.#:</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLabel" name="lbl_UpdateAircraftReqTime">
<property name="toolTip">
<string>update aircraft req.time</string>
@@ -255,7 +252,180 @@
</property>
</widget>
</item>
<item row="3" column="1" colspan="11">
<widget class="QLineEdit" name="le_SimulatorSpecific">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="9" colspan="3">
<widget class="QLineEdit" name="le_Limited">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>limited?</string>
</property>
</widget>
</item>
<item row="2" column="5" colspan="7">
<widget class="QLineEdit" name="le_Elevation">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>elevation</string>
</property>
</widget>
</item>
<item row="0" column="11">
<widget class="QLineEdit" name="le_Void">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>void</string>
</property>
</widget>
</item>
<item row="2" column="3">
<widget class="QLineEdit" name="le_ElevationRec">
<property name="toolTip">
<string>elevation received</string>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>rec.</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="le_CG">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>CG</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_CG">
<property name="text">
<string>CG:</string>
</property>
</widget>
</item>
<item row="0" column="12">
<widget class="QLabel" name="lbl_AverageUpdateTime">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="lbl_Parts">
<property name="text">
<string>Parts:</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lbl_ElevationRequested">
<property name="text">
<string>Req.:</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="lbl_ElevationReceived">
<property name="text">
<string>Rec.:</string>
</property>
</widget>
</item>
<item row="0" column="7">
<widget class="QLineEdit" name="le_SceneryOffset">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>offset from changes</string>
</property>
</widget>
</item>
<item row="0" column="9">
<widget class="QLineEdit" name="le_SceneryOffsetCG">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>offset-CG</string>
</property>
</widget>
</item>
<item row="0" column="8">
<widget class="QLabel" name="lbl_SceneryOffsetCG">
<property name="text">
<string>Off-CG:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="le_UpdateReqTime">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>req.time ms</string>
</property>
</widget>
</item>
<item row="1" column="5" colspan="3">
<widget class="QLineEdit" name="le_UpdateTimes">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>time min, max, ..</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="le_UpdateCount">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>count</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QLabel" name="lbl_Offset">
<property name="text">
<string>Offset:</string>
</property>
</widget>
</item>
<item row="1" column="8">
<widget class="QLabel" name="lbl_Limitited">
<property name="text">
<string>Limited</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_ReqTime">
<property name="text">
<string>Req. time:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLineEdit" name="le_ElevationReq">
<property name="toolTip">
<string>elevation requested</string>
@@ -268,6 +438,13 @@
</property>
</widget>
</item>
<item row="2" column="4">
<widget class="QLabel" name="lbl_Elevation">
<property name="text">
<string>Elevation:</string>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="QLineEdit" name="le_GndFlag">
<property name="readOnly">
@@ -285,20 +462,6 @@
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_CG">
<property name="text">
<string>CG:</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="lbl_Parts">
<property name="text">
<string>Parts:</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QLineEdit" name="le_Parts">
<property name="readOnly">
@@ -309,128 +472,69 @@
</property>
</widget>
</item>
<item row="0" column="10">
<widget class="QLabel" name="lbl_AverageUpdateTime">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="le_CG">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>CG</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="lbl_ElevationRequested">
<property name="text">
<string>Req.:</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="le_ElevationRec">
<property name="toolTip">
<string>elevation received</string>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>rec.</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QLineEdit" name="le_SceneryOffset">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>offset</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QLabel" name="lbl_Offset">
<property name="text">
<string>Offset:</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="lbl_ElevationReceived">
<property name="text">
<string>Rec.:</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QLabel" name="lbl_ReqTime">
<property name="text">
<string>Req.time:</string>
</property>
</widget>
</item>
<item row="1" column="9">
<widget class="QLineEdit" name="le_Elevation">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>elevation</string>
</property>
</widget>
</item>
<item row="1" column="8">
<widget class="QLabel" name="lbl_Elevation">
<property name="text">
<string>Elevation:</string>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QLabel" name="lbl_UpdateNumber">
<property name="text">
<string>Upd.#:</string>
</property>
</widget>
</item>
<item row="1" column="7">
<widget class="QLineEdit" name="le_UpdateCount">
<property name="readOnly">
<bool>true</bool>
</property>
<property name="placeholderText">
<string>count</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="5" column="0">
<widget class="QGroupBox" name="gb_InboundParts">
<property name="title">
<string>Inbound parts</string>
</property>
<layout class="QVBoxLayout" name="vl_InboundParts">
<item>
<widget class="QWidget" name="wi_InboundSplitterWidget" native="true">
<layout class="QVBoxLayout" name="wl_SplitterWidget">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="BlackGui::Views::CAircraftPartsView" name="tvp_AircraftParts">
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
<widget class="QSplitter" name="sp_Inbound">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
<widget class="QGroupBox" name="gb_InboundSituations">
<property name="title">
<string>Inbound situations</string>
</property>
<layout class="QVBoxLayout" name="vl_InboundSituations">
<item>
<widget class="BlackGui::Views::CAircraftSituationView" name="tvp_AircraftSituations">
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
</widget>
<widget class="QGroupBox" name="gb_InboundParts">
<property name="title">
<string>Inbound parts</string>
</property>
<layout class="QVBoxLayout" name="vl_InboundParts">
<item>
<widget class="BlackGui::Views::CAircraftPartsView" name="tvp_AircraftParts">
<property name="selectionMode">
<enum>QAbstractItemView::SingleSelection</enum>
</property>
<property name="selectionBehavior">
<enum>QAbstractItemView::SelectRows</enum>
</property>
<attribute name="verticalHeaderVisible">
<bool>false</bool>
</attribute>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
@@ -442,7 +546,7 @@
<attribute name="title">
<string>Interpolation</string>
</attribute>
<layout class="QVBoxLayout" name="vl_Interpolation" stretch="0,2,1,1">
<layout class="QVBoxLayout" name="vl_Interpolation" stretch="0,0,2,1">
<property name="leftMargin">
<number>4</number>
</property>
@@ -589,20 +693,24 @@
<tabstop>le_CG</tabstop>
<tabstop>le_Parts</tabstop>
<tabstop>le_GndFlag</tabstop>
<tabstop>le_SceneryOffset</tabstop>
<tabstop>le_SceneryOffsetCG</tabstop>
<tabstop>le_Void</tabstop>
<tabstop>le_UpdateReqTime</tabstop>
<tabstop>le_UpdateCount</tabstop>
<tabstop>le_UpdateTimes</tabstop>
<tabstop>le_Limited</tabstop>
<tabstop>le_ElevationReq</tabstop>
<tabstop>le_ElevationRec</tabstop>
<tabstop>le_SceneryOffset</tabstop>
<tabstop>le_UpdateCount</tabstop>
<tabstop>le_Elevation</tabstop>
<tabstop>le_SimulatorSpecific</tabstop>
<tabstop>tvp_AircraftSituations</tabstop>
<tabstop>tvp_AircraftParts</tabstop>
<tabstop>te_LastInterpolatedSituation</tabstop>
<tabstop>te_SituationChange</tabstop>
<tabstop>te_TextLog</tabstop>
<tabstop>te_LastInterpolatedParts</tabstop>
<tabstop>te_SituationChange</tabstop>
<tabstop>pb_GetLastInterpolation</tabstop>
<tabstop>tvp_AircraftParts</tabstop>
</tabstops>
<resources/>
<connections/>