Ref T709, added "follow aircraft distance" and timestamp, removed old settings

This commit is contained in:
Klaus Basan
2019-07-27 02:20:41 +02:00
committed by Mat Sutcliffe
parent 8845d1d35c
commit 5ebf119acb
8 changed files with 82 additions and 40 deletions

View File

@@ -1061,7 +1061,8 @@ namespace BlackSimPlugin
{
if (!this->isConnected()) { return false; }
if (!m_serviceProxy) { return false; }
const CXSwiftBusSettings s = m_xSwiftBusServerSettings.get();
CXSwiftBusSettings s = m_xSwiftBusServerSettings.get();
s.setCurrentUtcTime();
m_serviceProxy->setSettings(s.toXSwiftBusJsonStringQt());
CLogMessage(this).info(u"Send settings: %1") << s.toQString(true);
return true;

View File

@@ -17,7 +17,7 @@ namespace BlackSimPlugin
{
CSimulatorXPlaneConfig::CSimulatorXPlaneConfig(QObject *parent) : QObject(parent)
{
// void
}
BlackGui::CPluginConfigWindow *CSimulatorXPlaneConfig::createConfigWindow(QWidget *parent)
@@ -25,5 +25,5 @@ namespace BlackSimPlugin
CSimulatorXPlaneConfigWindow* w = new CSimulatorXPlaneConfigWindow(parent);
return w;
}
}
}
} // ns
} // ns

View File

@@ -65,6 +65,7 @@ namespace BlackSimPlugin
s.setDBusServerAddressQt(ui->comp_SettingsXSwiftBus->getDBusAddress());
s.setMaxDrawDistanceNM(ui->ds_MaxDrawDistanceNM->value());
s.setMaxPlanes(ui->sb_MaxAircraft->value());
s.setFollowAircraftDistanceM(ui->sb_FollowAircraftDistanceM->value());
s.setDrawingLabels(ui->cb_DrawLabels->isChecked());
return s;
}
@@ -73,6 +74,7 @@ namespace BlackSimPlugin
{
ui->comp_SettingsXSwiftBus->set(settings.getDBusServerAddressQt());
ui->sb_MaxAircraft->setValue(settings.getMaxPlanes());
ui->sb_FollowAircraftDistanceM->setValue(settings.getFollowAircraftDistanceM());
ui->cb_DrawLabels->setChecked(settings.isDrawingLabels());
ui->ds_MaxDrawDistanceNM->setValue(settings.getMaxDrawDistanceNM());
}

View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>250</width>
<height>272</height>
<height>298</height>
</rect>
</property>
<property name="minimumSize">
@@ -113,20 +113,37 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="lbl_Labels">
<property name="text">
<string>Labels</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QCheckBox" name="cb_DrawLabels">
<property name="text">
<string>draw labels</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_FollowAircraftDistance">
<property name="text">
<string>Follow aircraft distance</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSpinBox" name="sb_FollowAircraftDistanceM">
<property name="suffix">
<string>m</string>
</property>
<property name="maximum">
<number>300</number>
</property>
</widget>
</item>
</layout>
</widget>
</item>
@@ -143,6 +160,7 @@
<tabstops>
<tabstop>sb_MaxAircraft</tabstop>
<tabstop>ds_MaxDrawDistanceNM</tabstop>
<tabstop>sb_FollowAircraftDistanceM</tabstop>
<tabstop>cb_DrawLabels</tabstop>
</tabstops>
<resources/>