flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-18 03:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #618, functions allowing to validate and modify loaded JSON data

Browse Source 
* models can be reduced to one simulator
* a JSON model list can be loaded and the simulator derived from the distribution
This commit is contained in:
Klaus Basan
2016-03-28 00:56:22 +02:00
parent 5c1ce9763e
commit fe677a5594
6 changed files with 131 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackgui/views/viewbase.h
View File

@@ -221,7 +221,7 @@ namespace BlackGui
//! Number of elements changed
void rowCountChanged(int count, bool withFilter);
//! Model bas been changed
//! Model bas been changed (means data in view have been changed)
void modelChanged();
//! Single object was changed in model
@@ -236,6 +236,9 @@ namespace BlackGui
//! Object has been double clicked
void objectSelected(const BlackMisc::CVariant &object);
//! JSON data load from disk completed, the BlackMisc::CStatusMessage represents the success
void jsonLoadCompleted(const BlackMisc::CStatusMessage &msg);
public slots:
//! Resize to contents, strategy depends on container size
virtual void resizeToContents();
@@ -401,7 +404,7 @@ namespace BlackGui
//! Base class for views
template <class ModelClass, class ContainerType, class ObjectType> class CViewBase : public CViewBaseNonTemplate
{
// I cannot use Q_OBJECT here, because error: Template classes not supported by Q_OBJECT
// I cannot use Q_OBJECT here, because of error: Template classes not supported by Q_OBJECT
// Cannot declare slots as SLOT because I have no Q_OBJECT macro
public:
@@ -528,10 +531,14 @@ namespace BlackGui
virtual int performUpdateContainer(const BlackMisc::CVariant &variant, bool sort, bool resize) override;
//! Modify JSON data loaded in BlackGui::Views::CViewBaseNonTemplate::ps_loadJson
virtual BlackMisc::CStatusMessage modifyLoadedData(ContainerType &data) const;
virtual BlackMisc::CStatusMessage modifyLoadedJsonData(ContainerType &data) const;
//! Verify JSON data loaded in BlackGui::Views::CViewBaseNonTemplate::ps_loadJson
virtual BlackMisc::CStatusMessage validateLoadedData(const ContainerType &data) const;
virtual BlackMisc::CStatusMessage validateLoadedJsonData(const ContainerType &data) const;
//! In BlackGui::Views::CViewBaseNonTemplate::ps_loadJson the view has been updated because of loaded JSON data
//! \remark I cannot use a signal with a template parameter, so this functions serves as callback
virtual void jsonLoadedAndModelUpdated(const ContainerType &data);
// --------------------------------------------- SLOTS start here -----------------------------------------