flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 10:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T298, exclude models from matching configurable

Browse Source
This commit is contained in:
Klaus Basan
2018-08-23 17:50:12 +02:00
parent 109c1554f9
commit a640343433
6 changed files with 148 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackgui/components/settingscomponent.ui
View File

@@ -14,7 +14,7 @@
<string>Settings</string>
</property>
<property name="currentIndex">
<number>6</number>
<number>0</number>
</property>
<widget class="QWidget" name="tb_SettingsOverview">
<attribute name="title">
@@ -615,19 +615,6 @@
</property>
</widget>
</item>
<item>
<spacer name="vs_Matching">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsAdvanced">

55
src/blackgui/components/settingsmatchingcomponent.ui
View File

@@ -6,14 +6,14 @@
<rect>
<x>0</x>
<y>0</y>
<width>232</width>
<width>230</width>
<height>197</height>
</rect>
</property>
<property name="windowTitle">
<string>Matching settings</string>
</property>
<layout class="QVBoxLayout" name="vl_MatchingComponent">
<layout class="QVBoxLayout" name="vl_MatchingComponent" stretch="1,0">
<property name="leftMargin">
<number>3</number>
</property>
@@ -27,24 +27,49 @@
<number>3</number>
</property>
<item>
<widget class="BlackGui::Editors::CMatchingForm" name="editor_MatchingForm">
<property name="minimumSize">
<size>
<width>0</width>
<height>150</height>
</size>
<widget class="QScrollArea" name="sa_MatchingForm">
<property name="widgetResizable">
<bool>true</bool>
</property>
<widget class="QWidget" name="qw_MatchingForm">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>211</width>
<height>375</height>
</rect>
</property>
<layout class="QVBoxLayout" name="vl_ScrollAreaContent">
<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::Editors::CMatchingForm" name="editor_MatchingForm">
<property name="minimumSize">
<size>
<width>0</width>
<height>375</height>
</size>
</property>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
<item>
<widget class="QFrame" name="fr_Butoons">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="hl_">
<layout class="QHBoxLayout" name="hl_Buttons">
<item>
<spacer name="hs_Buttons">
<property name="orientation">

5
src/blackgui/editors/matchingform.cpp
View File

@@ -76,6 +76,8 @@ namespace BlackGui
ui->cb_ByVtol->setChecked(mode.testFlag(CAircraftMatcherSetup::ByVtol));
ui->cb_ScoreIgnoreZeros->setChecked(mode.testFlag(CAircraftMatcherSetup::ScoreIgnoreZeros));
ui->cb_ScorePreferColorLiveries->setChecked(mode.testFlag(CAircraftMatcherSetup::ScorePreferColorLiveries));
ui->cb_ExclNoExcludedModels->setChecked(mode.testFlag(CAircraftMatcherSetup::ExcludeNoExcluded));
ui->cb_ExclNoDbData->setChecked(mode.testFlag(CAircraftMatcherSetup::ExcludeNoDbData));
this->setMatchingAlgorithm(setup);
this->setPickStrategy(setup);
@@ -108,7 +110,8 @@ namespace BlackGui
ui->cb_ByFamily->isChecked(), ui->cb_ByLivery->isChecked(),
ui->cb_ByCombinedCode->isChecked(),
ui->cb_ByMilitary->isChecked(), ui->cb_ByVtol->isChecked(),
ui->cb_ScoreIgnoreZeros->isChecked(), ui->cb_ScorePreferColorLiveries->isChecked()
ui->cb_ScoreIgnoreZeros->isChecked(), ui->cb_ScorePreferColorLiveries->isChecked(),
ui->cb_ExclNoDbData->isChecked(), ui->cb_ExclNoExcludedModels->isChecked()
);
}

141
src/blackgui/editors/matchingform.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>247</width>
<height>348</height>
<width>293</width>
<height>375</height>
</rect>
</property>
<property name="windowTitle">
@@ -32,28 +32,28 @@
<string>Algorithm</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QRadioButton" name="rb_ScoreAndReduction">
<property name="text">
<string>reduction, then score based</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="rb_Reduction">
<property name="text">
<string>reduction</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="0" column="1">
<widget class="QRadioButton" name="rb_ScoreOnly">
<property name="text">
<string>score only</string>
</property>
</widget>
</item>
<item row="0" column="1" rowspan="3" alignment="Qt::AlignLeft|Qt::AlignBottom">
<item row="0" column="0">
<widget class="QRadioButton" name="rb_Reduction">
<property name="text">
<string>reduction</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QRadioButton" name="rb_ScoreAndReduction">
<property name="text">
<string>red. + score based</string>
</property>
</widget>
</item>
<item row="3" column="2" alignment="Qt::AlignRight">
<widget class="QPushButton" name="pb_Reset">
<property name="text">
<string>reset</string>
@@ -86,7 +86,7 @@
<item>
<widget class="QRadioButton" name="rb_PickByOrder">
<property name="text">
<string>order (higher rank first)</string>
<string>higher rank first</string>
</property>
</widget>
</item>
@@ -95,73 +95,108 @@
</item>
<item>
<widget class="QGroupBox" name="gb_Reduction">
<property name="minimumSize">
<size>
<width>0</width>
<height>110</height>
</size>
</property>
<property name="title">
<string>Reduction</string>
</property>
<layout class="QGridLayout" name="gl_Mode">
<item row="4" column="0">
<widget class="QCheckBox" name="cb_ByFamily">
<property name="text">
<string>family</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QRadioButton" name="rb_ByIcaoDataAirline1st">
<property name="text">
<string>by ICAO: airline first</string>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QCheckBox" name="cb_ByCombinedCode">
<property name="text">
<string>combined code</string>
</property>
</widget>
</item>
<item row="3" column="0">
<item row="2" column="0">
<widget class="QCheckBox" name="cb_ByModelString">
<property name="text">
<string>model string</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="cb_ByLivery">
<item row="0" column="1">
<widget class="QRadioButton" name="rb_ByIcaoDataAirline1st">
<property name="text">
<string> livery</string>
<string>by ICAO: airline first</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<item row="1" column="0" colspan="2">
<widget class="Line" name="line_Reduction">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="1">
<widget class="QCheckBox" name="cb_ByLivery">
<property name="text">
<string> livery</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="rb_ByIcaoDataAircraft1st">
<property name="text">
<string>by ICAO: aircraft first</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="2" column="2">
<widget class="QCheckBox" name="cb_ByFamily">
<property name="text">
<string>family</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="cb_ByCombinedCode">
<property name="text">
<string>combined code</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="cb_ByMilitary">
<property name="text">
<string>military</string>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="3" column="2">
<widget class="QCheckBox" name="cb_ByVtol">
<property name="toolTip">
<string>Vertical Takeoff or Landing</string>
</property>
<property name="text">
<string>VTOL (helicopters)</string>
<string>VTOL</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="gb_Exclusion">
<property name="title">
<string>Exclusiion</string>
</property>
<layout class="QHBoxLayout" name="hl_Exclude">
<item>
<widget class="QCheckBox" name="cb_ExclNoExcludedModels">
<property name="toolTip">
<string>models marked as excluded are ignored</string>
</property>
<property name="text">
<string>Excluded models</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="cb_ExclNoDbData">
<property name="toolTip">
<string>models without DB data are ignored</string>
</property>
<property name="text">
<string>Excl. no DB data</string>
</property>
</widget>
</item>
@@ -194,8 +229,8 @@
</layout>
</widget>
<tabstops>
<tabstop>rb_ScoreAndReduction</tabstop>
<tabstop>rb_Reduction</tabstop>
<tabstop>rb_ScoreOnly</tabstop>
<tabstop>rb_PickFirst</tabstop>
<tabstop>rb_PickRandom</tabstop>
<tabstop>rb_PickByOrder</tabstop>
@@ -203,10 +238,8 @@
<tabstop>rb_ByIcaoDataAirline1st</tabstop>
<tabstop>cb_ByModelString</tabstop>
<tabstop>cb_ByLivery</tabstop>
<tabstop>cb_ByFamily</tabstop>
<tabstop>cb_ByCombinedCode</tabstop>
<tabstop>cb_ByMilitary</tabstop>
<tabstop>cb_ByVtol</tabstop>
<tabstop>cb_ExclNoExcludedModels</tabstop>
<tabstop>cb_ExclNoDbData</tabstop>
<tabstop>cb_ScorePreferColorLiveries</tabstop>
<tabstop>cb_ScoreIgnoreZeros</tabstop>
</tabstops>