flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 19:35:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #649, further fixes and improvements

Browse Source 
* call of non-virtual function in ctor
* use getCopy
* return number of merged models
* change current simulator in model set loader (fixes infinite loop: change data -> signal -> change data).
This commit is contained in:
Klaus Basan
2016-06-05 20:24:39 +02:00
parent f02bf0ac0a
commit c39882e5db
10 changed files with 67 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/blackgui/menus/aircraftmodelmenus.cpp
View File

@@ -10,6 +10,7 @@
#include "aircraftmodelmenus.h"
#include "blackgui/guiapplication.h"
#include "blackcore/webdataservices.h"
#include "blackmisc/verify.h"
#include "blackmisc/icons.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/simulation/aircraftmodelinterfaces.h"
@@ -139,15 +140,27 @@ namespace BlackGui
void CMergeWithDbDataMenu::ps_mergeData()
{
Q_ASSERT_X(sGui, Q_FUNC_INFO, "Missing sGui");
BLACK_VERIFY_X(sGui, Q_FUNC_INFO, "Missing sGui");
if (!sGui->hasWebDataServices()) { return; }
const CAircraftModelList dbModels(sGui->getWebDataServices()->getModels());
if (dbModels.isEmpty())
{
CLogMessage().warning("No DB models to merge with");
return;
}
this->modelView()->showLoadIndicator();
CAircraftModelList models(this->getAircraftModels());
CAircraftModelUtilities::mergeWithDbData(models, dbModels, true);
if (this->modelsTargetSetable())
int c = CAircraftModelUtilities::mergeWithDbData(models, dbModels, true);
if (c > 0 && this->modelsTargetSetable())
{
this->modelsTargetSetable()->setModels(models);
CLogMessage().info("Merged %1/%2 models with DB") << c << models.size();
}
else
{
CLogMessage().info("No data merged with DB");
}
}