flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #716, UI component for simulator message (what messages to relay to simulator)

Browse Source 
* component itself
* integrate in tab panel
* minor UI adjustmenets
This commit is contained in:
Klaus Basan
2016-07-30 13:38:23 +02:00
parent 3554c0b718
commit 8013a6ac9c
8 changed files with 395 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackgui/components/settingscomponent.h
View File

@@ -22,7 +22,6 @@
class QWidget;
namespace Ui { class CSettingsComponent; }
namespace BlackGui
{
namespace Components

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

@@ -52,6 +52,22 @@
</property>
</widget>
</item>
<item>
<spacer name="vs_SettingsTrafficNetworkServers">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>25</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsTrafficNetwork">
@@ -180,6 +196,70 @@
</property>
</widget>
</item>
<item>
<spacer name="vs_SettingsSimulatorBasics">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>25</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsSimulatorMessages">
<attribute name="title">
<string>Simulator (messages)</string>
</attribute>
<layout class="QVBoxLayout" name="vl_SettingsSimulatorMessages">
<property name="spacing">
<number>2</number>
</property>
<property name="leftMargin">
<number>1</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>1</number>
</property>
<property name="bottomMargin">
<number>1</number>
</property>
<item>
<widget class="BlackGui::Components::CSettingsSimulatorMessagesComponent" name="comp_SettingsSimulatorMessages">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</item>
<item>
<spacer name="vs_SettingsSimulatorMessages">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>25</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<widget class="QWidget" name="tb_SettingsGui">
@@ -645,6 +725,12 @@
<header>blackgui/components/settingssimulatorbasicscomponent.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Components::CSettingsSimulatorMessagesComponent</class>
<extends>QFrame</extends>
<header>blackgui/components/settingssimulatormessagescomponent.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources/>
<connections/>

2
src/blackgui/components/settingsnetworkserverscomponent.cpp
View File

@@ -77,7 +77,7 @@ namespace BlackGui
void CSettingsNetworkServersComponent::ps_alterTrafficServer()
{
CServer server(this->ui->form_Server->getServer());
CStatusMessageList msgs = server.validate();
CStatusMessageList msgs = server.validate();
if (!msgs.isEmpty()) { msgs.addCategories(this); }
CServerList serverList(m_trafficNetworkServers.getThreadLocal());

16
src/blackgui/components/settingsnetworkserverscomponent.ui
View File

@@ -143,22 +143,6 @@
</layout>
</widget>
</item>
<item>
<spacer name="vs_Buttons">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>

54
src/blackgui/components/settingssimulatorbasicscomponent.ui
View File

@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
<width>511</width>
<height>469</height>
</rect>
</property>
<property name="windowTitle">
@@ -30,6 +30,13 @@
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="pb_SimulatorFileDialog">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="1" column="4" alignment="Qt::AlignTop">
<widget class="QPushButton" name="pb_ModelFileDialog">
<property name="text">
@@ -47,10 +54,10 @@
</property>
</widget>
</item>
<item row="0" column="4">
<widget class="QPushButton" name="pb_SimulatorFileDialog">
<item row="1" column="0" alignment="Qt::AlignTop">
<widget class="QLabel" name="lbl_ModelDirectory">
<property name="text">
<string>...</string>
<string>Model directories:</string>
</property>
</widget>
</item>
@@ -61,13 +68,6 @@
</property>
</widget>
</item>
<item row="1" column="0" alignment="Qt::AlignTop">
<widget class="QLabel" name="lbl_ModelDirectory">
<property name="text">
<string>Model directories:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_SimulatorDirectory">
<property name="text">
@@ -89,13 +89,6 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="le_SimulatorDirectory">
<property name="placeholderText">
<string>Simulator directory path</string>
</property>
</widget>
</item>
<item row="3" column="2" rowspan="4">
<widget class="QPlainTextEdit" name="pte_ExcludeDirectories">
<property name="documentTitle">
@@ -109,6 +102,13 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="le_SimulatorDirectory">
<property name="placeholderText">
<string>Simulator directory path</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPlainTextEdit" name="pte_ModelDirectories">
<property name="placeholderText">
@@ -129,22 +129,6 @@
</property>
</widget>
</item>
<item row="8" column="0">
<spacer name="vs_Footer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<customwidgets>

94
src/blackgui/components/settingssimulatormessagescomponent.cpp Normal file
View File

@@ -0,0 +1,94 @@
/* Copyright (C) 2016
* swift project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#include "settingssimulatormessagescomponent.h"
#include "ui_settingssimulatormessagescomponent.h"
#include "blackmisc/simulation/settings/settingssimulator.h"
using namespace BlackMisc;
using namespace BlackMisc::Simulation::Settings;
namespace BlackGui
{
namespace Components
{
CSettingsSimulatorMessagesComponent::CSettingsSimulatorMessagesComponent(QWidget *parent) :
QFrame(parent),
ui(new Ui::CSettingsSimulatorMessagesComponent)
{
ui->setupUi(this);
connect(ui->pb_Save, &QPushButton::clicked, this, &CSettingsSimulatorMessagesComponent::ps_save);
connect(ui->pb_Cancel, &QPushButton::clicked, this, &CSettingsSimulatorMessagesComponent::ps_load);
this->ps_load();
}
CSettingsSimulatorMessagesComponent::~CSettingsSimulatorMessagesComponent()
{ }
void CSettingsSimulatorMessagesComponent::ps_save()
{
CSettingsSimulatorMessages settings;
settings.setGloballyEnabled(ui->cb_Messages->isChecked());
if (ui->rb_NoTechnicalMessages->isChecked())
{
settings.disableTechnicalMessages();
}
else if (ui->rb_ErrorsOnly->isChecked())
{
settings.setTechnicalLogSeverity(CStatusMessage::SeverityError);
}
else if (ui->rb_ErrorsAndWarnings->isChecked())
{
settings.setTechnicalLogSeverity(CStatusMessage::SeverityWarning);
}
else if (ui->rb_ErrorWarningsInfo->isChecked())
{
settings.setTechnicalLogSeverity(CStatusMessage::SeverityInfo);
}
CSettingsSimulatorMessages::TextMessageType mt = CSettingsSimulatorMessages::NoTextMessages;
if (ui->cb_PrivateMessages->isChecked()) { mt |= CSettingsSimulatorMessages::TextMessagePrivate; }
if (ui->cb_SupervisorMessages->isChecked()) { mt |= CSettingsSimulatorMessages::TextMessageSupervisor; }
if (ui->cb_Com1->isChecked()) { mt |= CSettingsSimulatorMessages::TextMessagesCom1; }
if (ui->cb_Com2->isChecked()) { mt |= CSettingsSimulatorMessages::TextMessagesCom2; };
settings.setRelayedTextMessages(mt);
// save
this->m_settings.setAndSave(settings);
}
void CSettingsSimulatorMessagesComponent::ps_load()
{
const CSettingsSimulatorMessages settings(this->m_settings.get());
ui->cb_Messages->setChecked(settings.isGloballyEnabled());
if (settings.isRelayedInfoMessages())
{
ui->rb_ErrorWarningsInfo->setChecked(true);
}
else if (settings.isRelayedWarningMessages())
{
ui->rb_ErrorsAndWarnings->setChecked(true);
}
else if (settings.isRelayedErrorsMessages())
{
ui->rb_ErrorsOnly->setChecked(true);
}
else if (!settings.isRelayedTechnicalMessages())
{
ui->rb_NoTechnicalMessages->setChecked(true);
}
ui->cb_PrivateMessages->setChecked(settings.isRelayedPrivateTextMessages());
ui->cb_SupervisorMessages->setChecked(settings.isRelayedSupervisorTextMessages());
ui->cb_Com1->setChecked(settings.isRelayedCom1TextMessages());
ui->cb_Com2->setChecked(settings.isRelayedCom2TextMessages());
}
} // ns
} // ns

51
src/blackgui/components/settingssimulatormessagescomponent.h Normal file
View File

@@ -0,0 +1,51 @@
/* Copyright (C) 2016
* swift project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
//! \file
#ifndef BLACKGUI_COMPONENTS_SETTINGSSIMULATORMESSAGESCOMPONENT_H
#define BLACKGUI_COMPONENTS_SETTINGSSIMULATORMESSAGESCOMPONENT_H
#include "blackmisc/simulation/settings/settingssimulator.h"
#include <QFrame>
#include <QScopedPointer>
namespace Ui { class CSettingsSimulatorMessagesComponent; }
namespace BlackGui
{
namespace Components
{
/*!
* Configure what messages are sent to simulator
*/
class CSettingsSimulatorMessagesComponent : public QFrame
{
Q_OBJECT
public:
//! Constructor
explicit CSettingsSimulatorMessagesComponent(QWidget *parent = nullptr);
//! Destructor
~CSettingsSimulatorMessagesComponent();
private slots:
//! Save the data
void ps_save();
//! Load data
void ps_load();
private:
QScopedPointer<Ui::CSettingsSimulatorMessagesComponent> ui;
BlackMisc::CSetting<BlackMisc::Simulation::Settings::SettingsSimulatorMessages> m_settings { this }; //!< settings for messages
};
} // ns
} // ns
#endif // guard

144
src/blackgui/components/settingssimulatormessagescomponent.ui Normal file
View File

@@ -0,0 +1,144 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CSettingsSimulatorMessagesComponent</class>
<widget class="QFrame" name="CSettingsSimulatorMessagesComponent">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>268</width>
<height>254</height>
</rect>
</property>
<property name="windowTitle">
<string>Frame</string>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="gb_TechnicalMessages">
<property name="title">
<string>Technical messages</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="1">
<widget class="QRadioButton" name="rb_ErrorsOnly">
<property name="text">
<string>errors</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QRadioButton" name="rb_NoTechnicalMessages">
<property name="text">
<string>none</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QRadioButton" name="rb_ErrorWarningsInfo">
<property name="text">
<string>all</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QRadioButton" name="rb_ErrorsAndWarnings">
<property name="text">
<string>wanrings</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="lbl_Messages">
<property name="text">
<string>Msgs. to simulator:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="cb_Messages">
<property name="text">
<string>enable/disable msgs.</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="gb_MessageTypes">
<property name="title">
<string>Message type</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QCheckBox" name="cb_PrivateMessages">
<property name="text">
<string>private messages</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="cb_SupervisorMessages">
<property name="text">
<string>Supervisor msgs.</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="cb_Com1">
<property name="text">
<string>COM1</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="cb_Com2">
<property name="text">
<string>COM2</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QPushButton" name="pb_Cancel">
<property name="text">
<string>cancel</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="pb_Save">
<property name="text">
<string>save</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>