Ref T259, Ref T243 split mapping info area, new interpolation info area

* new interpolation info area
* added interpolation and parts history to that area
* adjusted keypad and main swift GUI
This commit is contained in:
Klaus Basan
2018-03-19 21:08:21 +01:00
parent 624eb7ca93
commit 8df74ce0e6
15 changed files with 296 additions and 294 deletions

View File

@@ -14,7 +14,6 @@
#include "blackgui/blackguiexport.h"
#include "blackgui/infoarea.h"
#include <QObject>
#include <QScopedPointer>
#include <QSize>
@@ -23,7 +22,6 @@ class QPixmap;
class QWidget;
namespace Ui { class CMainInfoAreaComponent; }
namespace BlackGui
{
namespace Components
@@ -35,6 +33,7 @@ namespace BlackGui
class CFlightPlanComponent;
class CLogComponent;
class CMappingComponent;
class CInterpolationComponent;
class CSettingsComponent;
class CSimulatorComponent;
class CTextMessageComponent;
@@ -57,18 +56,19 @@ namespace BlackGui
enum InfoArea
{
// index must match tab index!
InfoAreaCockpit = 0,
InfoAreaAircraft = 1,
InfoAreaAtc = 2,
InfoAreaUsers = 3,
InfoAreaTextMessages = 4,
InfoAreaSimulator = 5,
InfoAreaFlightPlan = 6,
InfoAreaWeather = 7,
InfoAreaMappings = 8,
InfoAreaLog = 9,
InfoAreaSettings = 10,
InfoAreaNone = -1
InfoAreaCockpit = 0,
InfoAreaAircraft = 1,
InfoAreaAtc = 2,
InfoAreaUsers = 3,
InfoAreaTextMessages = 4,
InfoAreaSimulator = 5,
InfoAreaFlightPlan = 6,
InfoAreaWeather = 7,
InfoAreaMapping = 8, //!< aka rendering, models
InfoAreaInterpolation = 9,
InfoAreaSettings = 10,
InfoAreaLog = 11,
InfoAreaNone = -1
};
//! Cockpit
@@ -81,7 +81,10 @@ namespace BlackGui
CAircraftComponent *getAircraftComponent();
//! Mappings
CMappingComponent *getMappingComponet();
CMappingComponent *getMappingComponent();
//! Interpolation
CInterpolationComponent *getInterpolationComponent();
//! User component
CUserComponent *getUserComponent();