Ref T362, Ref T348 improved matcher saves removed models (if any) when destructed and improved UI

This commit is contained in:
Klaus Basan
2018-09-30 22:46:42 +02:00
parent 72a7b67e7a
commit 5af029467e
3 changed files with 17 additions and 11 deletions

View File

@@ -48,14 +48,7 @@ namespace BlackCore
CAircraftMatcher::~CAircraftMatcher()
{
if (!m_removedModels.isEmpty())
{
// log the models
const QString fileName("removed models %1.json");
const QString ts = QDateTime::currentDateTimeUtc().toString("yyyyMMddHHmmss");
const QString json = m_removedModels.toJsonString();
CFileUtils::writeStringToFile(json, CFileUtils::appendFilePathsAndFixUnc(CDirectoryUtils::logDirectory(), fileName.arg(ts)));
}
this->saveRemovedModels();
}
bool CAircraftMatcher::setSetup(const CAircraftMatcherSetup &setup)
@@ -688,6 +681,16 @@ namespace BlackCore
}
}
bool CAircraftMatcher::saveRemovedModels()
{
if (m_removedModels.isEmpty()) { return false; }
// log the models
const QString fileName("removed models %1.json");
const QString ts = QDateTime::currentDateTimeUtc().toString("yyyyMMddHHmmss");
const QString json = m_removedModels.toJsonString();
return CFileUtils::writeStringToFile(json, CFileUtils::appendFilePathsAndFixUnc(CDirectoryUtils::logDirectory(), fileName.arg(ts)));
}
CAircraftModelList CAircraftMatcher::getClosestMatchStepwiseReduceImplementation(const CAircraftModelList &modelSet, const CAircraftMatcherSetup &setup, const CSimulatedAircraft &remoteAircraft, CStatusMessageList *log)
{
CAircraftModelList matchedModels(modelSet);

View File

@@ -185,6 +185,9 @@ namespace BlackCore
void setupChanged();
private:
//! Save the removed models if any
bool saveRemovedModels();
//! The search based implementation
static BlackMisc::Simulation::CAircraftModelList getClosestMatchStepwiseReduceImplementation(const BlackMisc::Simulation::CAircraftModelList &modelSet, const BlackMisc::Simulation::CAircraftMatcherSetup &setup, const BlackMisc::Simulation::CSimulatedAircraft &remoteAircraft, BlackMisc::CStatusMessageList *log = nullptr);

View File

@@ -37,7 +37,7 @@
<x>0</x>
<y>0</y>
<width>296</width>
<height>400</height>
<height>450</height>
</rect>
</property>
<layout class="QVBoxLayout" name="vl_ScrollAreaContent">
@@ -58,7 +58,7 @@
<property name="minimumSize">
<size>
<width>0</width>
<height>400</height>
<height>450</height>
</size>
</property>
</widget>
@@ -89,7 +89,7 @@
<string>do matching for all models again</string>
</property>
<property name="text">
<string>re-matching</string>
<string> re-matching </string>
</property>
</widget>
</item>