comparison framework/Document.cpp @ 697:a27a6113fdd7

Restore/reimplement cancelAsyncLayerCreation - I had forgotten Tony uses it
author Chris Cannam
date Thu, 18 Jul 2019 14:12:00 +0100
parents bd6e2fc53377
children 7669c8cc869d
comparison
equal deleted inserted replaced
696:155008f1bf10 697:a27a6113fdd7
289 SVDEBUG << "AdditionalModelConverter::noMoreModelsAvailable" << endl; 289 SVDEBUG << "AdditionalModelConverter::noMoreModelsAvailable" << endl;
290 m_handler->layersCreated(this, m_primary, vector<Layer *>()); 290 m_handler->layersCreated(this, m_primary, vector<Layer *>());
291 delete this; 291 delete this;
292 } 292 }
293 293
294 void cancel() {
295 foreach (Layer *layer, m_primary) {
296 m_doc->setModel(layer, {});
297 }
298 }
299
294 private: 300 private:
295 Document *m_doc; 301 Document *m_doc;
296 vector<Layer *> m_primary; 302 vector<Layer *> m_primary;
297 Document::LayerCreationHandler *m_handler; //!!! how to handle destruction of this? 303 Document::LayerCreationHandler *m_handler; //!!! how to handle destruction of this?
298 }; 304 };
329 emit modelGenerationWarning(transforms[0].getIdentifier(), message); 335 emit modelGenerationWarning(transforms[0].getIdentifier(), message);
330 //!!! what to do with amc? 336 //!!! what to do with amc?
331 } 337 }
332 338
333 return amc; 339 return amc;
340 }
341
342 void
343 Document::cancelAsyncLayerCreation(Document::LayerCreationAsyncHandle h)
344 {
345 AdditionalModelConverter *conv = static_cast<AdditionalModelConverter *>(h);
346 conv->cancel();
334 } 347 }
335 348
336 vector<Layer *> 349 vector<Layer *>
337 Document::createLayersForDerivedModels(vector<ModelId> newModels, 350 Document::createLayersForDerivedModels(vector<ModelId> newModels,
338 QStringList names) 351 QStringList names)