Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 09:50:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup memory management in memory bake widget

Browse source
This commit is contained in:
Stephen Birarda 2017-04-14 18:20:55 -07:00
parent 3925493539
commit 2b188427f1
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tools/oven/src/ui/ModelBakeWidget.cpp
View file

@ -183,7 +183,7 @@ void ModelBakeWidget::bakeButtonClicked() {
} }
// everything seems to be in place, kick off a bake for this model now // everything seems to be in place, kick off a bake for this model now
auto baker = QSharedPointer<FBXBaker> { new FBXBaker(modelToBakeURL, outputDirectory.absolutePath(), false) }; auto baker = std::unique_ptr<FBXBaker> { new FBXBaker(modelToBakeURL, outputDirectory.absolutePath(), false) };
// move the baker to the baker thread // move the baker to the baker thread
baker->moveToThread(_bakerThread); baker->moveToThread(_bakerThread);
@ -194,10 +194,10 @@ void ModelBakeWidget::bakeButtonClicked() {
} }
// invoke the bake method on the baker thread // invoke the bake method on the baker thread
QMetaObject::invokeMethod(baker.data(), "bake"); QMetaObject::invokeMethod(baker.get(), "bake");
// make sure we hear about the results of this baker when it is done // make sure we hear about the results of this baker when it is done
connect(baker.data(), &FBXBaker::finished, this, &ModelBakeWidget::handleFinishedBaker); connect(baker.get(), &FBXBaker::finished, this, &ModelBakeWidget::handleFinishedBaker);
// add a pending row to the results window to show that this bake is in process // add a pending row to the results window to show that this bake is in process
auto resultsWindow = qApp->getMainWindow()->showResultsWindow(); auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
@ -205,24 +205,26 @@ void ModelBakeWidget::bakeButtonClicked() {
// keep a unique_ptr to this baker // keep a unique_ptr to this baker
// and remember the row that represents it in the results table // and remember the row that represents it in the results table
_bakers.insert(baker, resultsRow); _bakers.emplace_back(std::move(baker), resultsRow);
} }
} }
void ModelBakeWidget::handleFinishedBaker() { void ModelBakeWidget::handleFinishedBaker() {
if (auto baker = qobject_cast<FBXBaker*>(sender())) { if (auto baker = qobject_cast<FBXBaker*>(sender())) {
// turn this baker into a shared pointer
auto sharedBaker = QSharedPointer<FBXBaker>(baker);
// add the results of this bake to the results window // add the results of this bake to the results window
auto resultRow = _bakers.value(sharedBaker); auto it = std::remove_if(_bakers.begin(), _bakers.end(), [baker](const BakerRowPair& value) {
return value.first.get() == baker;
});
auto resultsWindow = qApp->getMainWindow()->showResultsWindow(); if (it != _bakers.end()) {
auto resultRow = it->second;
auto resultsWindow = qApp->getMainWindow()->showResultsWindow();
if (sharedBaker->hasErrors()) { if (baker->hasErrors()) {
resultsWindow->changeStatusForRow(resultRow, baker->getErrors().join("\n")); resultsWindow->changeStatusForRow(resultRow, baker->getErrors().join("\n"));
} else { } else {
resultsWindow->changeStatusForRow(resultRow, "Success"); resultsWindow->changeStatusForRow(resultRow, "Success");
}
} }
} }
} }

4
tools/oven/src/ui/ModelBakeWidget.h
View file

@ -41,7 +41,9 @@ private slots:
private: private:
void setupUI(); void setupUI();
QHash<QSharedPointer<FBXBaker>, int> _bakers; using BakerRowPair = std::pair<std::unique_ptr<FBXBaker>, int>;
using BakerRowPairList = std::list<BakerRowPair>;
BakerRowPairList _bakers;
QLineEdit* _modelLineEdit; QLineEdit* _modelLineEdit;
QLineEdit* _outputDirLineEdit; QLineEdit* _outputDirLineEdit;