Mercurial > hg > sonic-visualiser
comparison main/MainWindow.cpp @ 2332:1057ae621c87 time-frequency-boxes
Rename time-frequency box to plain box; have it adopt the unit from the layer beneath if created empty
author | Chris Cannam |
---|---|
date | Wed, 25 Sep 2019 09:53:15 +0100 |
parents | f2dd9218617e |
children | f576895641c2 |
comparison
equal
deleted
inserted
replaced
2331:10f7d8210957 | 2332:1057ae621c87 |
---|---|
4018 LayerFactory::LayerTypeSet emptyTypes = | 4018 LayerFactory::LayerTypeSet emptyTypes = |
4019 LayerFactory::getInstance()->getValidEmptyLayerTypes(); | 4019 LayerFactory::getInstance()->getValidEmptyLayerTypes(); |
4020 | 4020 |
4021 Layer *newLayer = nullptr; | 4021 Layer *newLayer = nullptr; |
4022 | 4022 |
4023 bool isNewEmptyLayer = false; | |
4024 | |
4023 if (emptyTypes.find(type) != emptyTypes.end()) { | 4025 if (emptyTypes.find(type) != emptyTypes.end()) { |
4024 | 4026 |
4025 newLayer = m_document->createEmptyLayer(type); | 4027 newLayer = m_document->createEmptyLayer(type); |
4026 if (newLayer) { | 4028 if (newLayer) { |
4027 for (auto &a : m_toolActions) { | 4029 isNewEmptyLayer = true; |
4028 if (a.first == ViewManager::DrawMode) { | |
4029 a.second->trigger(); | |
4030 break; | |
4031 } | |
4032 } | |
4033 } | 4030 } |
4034 | 4031 |
4035 } else { | 4032 } else { |
4036 | 4033 |
4037 ModelId modelId = i->second.sourceModel; | 4034 ModelId modelId = i->second.sourceModel; |
4062 m_document->setChannel(newLayer, i->second.channel); | 4059 m_document->setChannel(newLayer, i->second.channel); |
4063 m_document->setModel(newLayer, modelId); | 4060 m_document->setModel(newLayer, modelId); |
4064 } else { | 4061 } else { |
4065 SVCERR << "WARNING: MainWindow::addLayer: unknown model " | 4062 SVCERR << "WARNING: MainWindow::addLayer: unknown model " |
4066 << modelId << " in layer action map" << endl; | 4063 << modelId << " in layer action map" << endl; |
4064 } | |
4065 } | |
4066 } | |
4067 | |
4068 if (isNewEmptyLayer) { | |
4069 | |
4070 double vmin, vmax, dmin, dmax; | |
4071 QString unit; | |
4072 if (pane->getTopLayerDisplayExtents | |
4073 (vmin, vmax, dmin, dmax, &unit)) { | |
4074 newLayer->adoptExtents(vmin, vmax, unit); | |
4075 } | |
4076 | |
4077 for (auto &a : m_toolActions) { | |
4078 if (a.first == ViewManager::DrawMode) { | |
4079 a.second->trigger(); | |
4080 break; | |
4067 } | 4081 } |
4068 } | 4082 } |
4069 } | 4083 } |
4070 | 4084 |
4071 if (newLayer) { | 4085 if (newLayer) { |