flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T237, init/read from JSON files

Browse Source 
* multi format compatible (automatically detect format)
* flag if cache values shall be overridden
* init from resource files (those are the files coming with the installer)
* automatically read in background if reader is (already) in its own thread (otherwise cache.set() ASSERT)
This commit is contained in:
Klaus Basan
2018-01-30 06:34:17 +01:00
parent 28b5ec9ec6
commit f3afde76ff
14 changed files with 369 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/blackgui/components/datainfoareacomponent.cpp
View File

@@ -104,11 +104,12 @@ namespace BlackGui
bool CDataInfoAreaComponent::readDbDataFromResourceDir()
{
const bool s = sGui &&
sGui->getWebDataServices()->readDbDataFromDisk(CDirectoryUtils::staticDbFilesDirectory(), true);
if (!sGui) { return false; }
const CStatusMessageList msgs = sGui->getWebDataServices()->initDbCachesFromLocalResourceFiles(true);
// info
if (s)
bool ok = false;
if (msgs.isSuccess())
{
CLogMessage(this).info("Read DB data from directory: %1") << CDirectoryUtils::staticDbFilesDirectory();
ui->comp_DbAircraftIcao->showLoadIndicator();
@@ -117,12 +118,13 @@ namespace BlackGui
ui->comp_DbDistributors->showLoadIndicator();
ui->comp_DbLiveries->showLoadIndicator();
ui->comp_DbModels->showLoadIndicator();
ok = true;
}
else
{
CLogMessage(this).error("Failed to load DB data");
CLogMessage::preformatted(msgs);
}
return s;
return ok;
}
QSize CDataInfoAreaComponent::getPreferredSizeWhenFloating(int areaIndex) const
@@ -145,20 +147,13 @@ namespace BlackGui
InfoArea area = static_cast<InfoArea>(areaIndex);
switch (area)
{
case InfoAreaAircraftIcao:
return CIcons::appAircraftIcao16();
case InfoAreaAirlineIcao:
return CIcons::appAirlineIcao16();
case InfoAreaLiveries:
return CIcons::appLiveries16();
case InfoAreaDistributors:
return CIcons::appDistributors16();
case InfoAreaModels:
return CIcons::appModels16();
case InfoAreaCountries:
return CIcons::appCountries16();
default:
return CIcons::empty();
case InfoAreaAircraftIcao: return CIcons::appAircraftIcao16();
case InfoAreaAirlineIcao: return CIcons::appAirlineIcao16();
case InfoAreaLiveries: return CIcons::appLiveries16();
case InfoAreaDistributors: return CIcons::appDistributors16();
case InfoAreaModels: return CIcons::appModels16();
case InfoAreaCountries: return CIcons::appCountries16();
default: return CIcons::empty();
}
}