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

refs #661, reset order when creating a new model set

Browse Source 
(found during demo in meeting)
This commit is contained in:
Klaus Basan
2016-05-24 18:25:31 +02:00
parent c0fda8687d
commit f92765d515
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackcore/modelsetbuilder.cpp
View File

@@ -56,17 +56,18 @@ namespace BlackCore
// without any information we can not use them // without any information we can not use them
modelSet = modelSet.findWithKnownAircraftDesignator(); modelSet = modelSet.findWithKnownAircraftDesignator();
} }
modelSet = modelSet.matchesSimulator(simulator);
modelSet.setModelMode(CAircraftModel::Include); // in sets we only include, exclude means not present in set modelSet.setModelMode(CAircraftModel::Include); // in sets we only include, exclude means not present in set
if (oprions.testFlag(Incremental)) if (oprions.testFlag(Incremental))
{ {
if (currentSet.isEmpty()) { return modelSet; } if (currentSet.isEmpty()) { return modelSet; }
CAircraftModelList copy(currentSet); CAircraftModelList copy(currentSet);
copy.replaceOrAddModelsWithString(modelSet, Qt::CaseInsensitive); // incremental copy.replaceOrAddModelsWithString(modelSet, Qt::CaseInsensitive); // incremental
return copy.matchesSimulator(simulator);
}
else
{
return modelSet.matchesSimulator(simulator);
} }
modelSet.resetOrder();
return modelSet;
} }
} // ns } // ns