Mercurial > hg > sonic-visualiser
comparison main/MainWindow.cpp @ 432:e1bde903c65c debug-output
Remove most toStdString calls (no longer needed, with debug header)
author | Chris Cannam |
---|---|
date | Thu, 12 May 2011 17:32:07 +0100 |
parents | aa8117d79702 |
children | ae68fc09bf16 |
comparison
equal
deleted
inserted
replaced
415:aa8117d79702 | 432:e1bde903c65c |
---|---|
1457 for (unsigned int i = 0; i < transforms.size(); ++i) { | 1457 for (unsigned int i = 0; i < transforms.size(); ++i) { |
1458 | 1458 |
1459 QString name = transforms[i].name; | 1459 QString name = transforms[i].name; |
1460 if (name == "") name = transforms[i].identifier; | 1460 if (name == "") name = transforms[i].identifier; |
1461 | 1461 |
1462 // std::cerr << "Plugin Name: " << name.toStdString() << std::endl; | 1462 // std::cerr << "Plugin Name: " << name << std::endl; |
1463 | 1463 |
1464 TransformDescription::Type type = transforms[i].type; | 1464 TransformDescription::Type type = transforms[i].type; |
1465 QString typeStr = factory->getTransformTypeName(type); | 1465 QString typeStr = factory->getTransformTypeName(type); |
1466 | 1466 |
1467 QString category = transforms[i].category; | 1467 QString category = transforms[i].category; |
1493 action->setStatusTip(transforms[i].longDescription); | 1493 action->setStatusTip(transforms[i].longDescription); |
1494 | 1494 |
1495 if (categoryMenus[type].find(category) == categoryMenus[type].end()) { | 1495 if (categoryMenus[type].find(category) == categoryMenus[type].end()) { |
1496 std::cerr << "WARNING: MainWindow::setupMenus: Internal error: " | 1496 std::cerr << "WARNING: MainWindow::setupMenus: Internal error: " |
1497 << "No category menu for transform \"" | 1497 << "No category menu for transform \"" |
1498 << name.toStdString() << "\" (category = \"" | 1498 << name << "\" (category = \"" |
1499 << category.toStdString() << "\")" << std::endl; | 1499 << category << "\")" << std::endl; |
1500 } else { | 1500 } else { |
1501 categoryMenus[type][category]->addAction(action); | 1501 categoryMenus[type][category]->addAction(action); |
1502 } | 1502 } |
1503 | 1503 |
1504 if (makerMenus[type].find(maker) == makerMenus[type].end()) { | 1504 if (makerMenus[type].find(maker) == makerMenus[type].end()) { |
1505 std::cerr << "WARNING: MainWindow::setupMenus: Internal error: " | 1505 std::cerr << "WARNING: MainWindow::setupMenus: Internal error: " |
1506 << "No maker menu for transform \"" | 1506 << "No maker menu for transform \"" |
1507 << name.toStdString() << "\" (maker = \"" | 1507 << name << "\" (maker = \"" |
1508 << maker.toStdString() << "\")" << std::endl; | 1508 << maker << "\")" << std::endl; |
1509 } else { | 1509 } else { |
1510 makerMenus[type][maker]->addAction(action); | 1510 makerMenus[type][maker]->addAction(action); |
1511 } | 1511 } |
1512 | 1512 |
1513 action = new QAction(tr("%1...").arg(output == "" ? pluginName : output), this); | 1513 action = new QAction(tr("%1...").arg(output == "" ? pluginName : output), this); |
1514 connect(action, SIGNAL(triggered()), this, SLOT(addLayer())); | 1514 connect(action, SIGNAL(triggered()), this, SLOT(addLayer())); |
1515 m_transformActions[action] = transforms[i].identifier; | 1515 m_transformActions[action] = transforms[i].identifier; |
1516 connect(this, SIGNAL(canAddLayer(bool)), action, SLOT(setEnabled(bool))); | 1516 connect(this, SIGNAL(canAddLayer(bool)), action, SLOT(setEnabled(bool))); |
1517 action->setStatusTip(transforms[i].longDescription); | 1517 action->setStatusTip(transforms[i].longDescription); |
1518 | 1518 |
1519 // cerr << "Transform: \"" << name.toStdString() << "\": plugin name \"" << pluginName.toStdString() << "\"" << endl; | 1519 // cerr << "Transform: \"" << name << "\": plugin name \"" << pluginName << "\"" << endl; |
1520 | 1520 |
1521 if (pluginNameMenus[type].find(pluginName) == | 1521 if (pluginNameMenus[type].find(pluginName) == |
1522 pluginNameMenus[type].end()) { | 1522 pluginNameMenus[type].end()) { |
1523 | 1523 |
1524 SubdividingMenu *parentMenu = byPluginNameMenus[type]; | 1524 SubdividingMenu *parentMenu = byPluginNameMenus[type]; |
1677 // std::cerr << "found duplicate layer " << layer << std::endl; | 1677 // std::cerr << "found duplicate layer " << layer << std::endl; |
1678 continue; | 1678 continue; |
1679 } | 1679 } |
1680 | 1680 |
1681 // std::cerr << "found new layer " << layer << " (name = " | 1681 // std::cerr << "found new layer " << layer << " (name = " |
1682 // << layer->getLayerPresentationName().toStdString() << ")" << std::endl; | 1682 // << layer->getLayerPresentationName() << ")" << std::endl; |
1683 | 1683 |
1684 orderedLayers.push_back(layer); | 1684 orderedLayers.push_back(layer); |
1685 observedLayers.insert(layer); | 1685 observedLayers.insert(layer); |
1686 | 1686 |
1687 if (factory->isLayerSliceable(layer)) { | 1687 if (factory->isLayerSliceable(layer)) { |
2184 Pane *pane = m_paneStack->getPane(i); | 2184 Pane *pane = m_paneStack->getPane(i); |
2185 if (!pane) continue; | 2185 if (!pane) continue; |
2186 for (int j = 0; j < pane->getLayerCount(); ++j) { | 2186 for (int j = 0; j < pane->getLayerCount(); ++j) { |
2187 Layer *layer = pane->getLayer(j); | 2187 Layer *layer = pane->getLayer(j); |
2188 if (!layer) continue; | 2188 if (!layer) continue; |
2189 cerr << "layer = " << layer->objectName().toStdString() << endl; | 2189 cerr << "layer = " << layer->objectName() << endl; |
2190 Model *m = layer->getModel(); | 2190 Model *m = layer->getModel(); |
2191 RangeSummarisableTimeValueModel *wm = | 2191 RangeSummarisableTimeValueModel *wm = |
2192 dynamic_cast<RangeSummarisableTimeValueModel *>(m); | 2192 dynamic_cast<RangeSummarisableTimeValueModel *>(m); |
2193 if (wm) { | 2193 if (wm) { |
2194 cerr << "found: " << wm->objectName().toStdString() << endl; | 2194 cerr << "found: " << wm->objectName() << endl; |
2195 otherModels.insert(wm); | 2195 otherModels.insert(wm); |
2196 if (pane == m_paneStack->getCurrentPane()) { | 2196 if (pane == m_paneStack->getCurrentPane()) { |
2197 current = wm; | 2197 current = wm; |
2198 } | 2198 } |
2199 } | 2199 } |
3057 | 3057 |
3058 PaneActionMap::iterator i = m_paneActions.find(action); | 3058 PaneActionMap::iterator i = m_paneActions.find(action); |
3059 | 3059 |
3060 if (i == m_paneActions.end()) { | 3060 if (i == m_paneActions.end()) { |
3061 std::cerr << "WARNING: MainWindow::addPane: unknown action " | 3061 std::cerr << "WARNING: MainWindow::addPane: unknown action " |
3062 << action->objectName().toStdString() << std::endl; | 3062 << action->objectName() << std::endl; |
3063 return; | 3063 return; |
3064 } | 3064 } |
3065 | 3065 |
3066 addPane(i->second, action->text()); | 3066 addPane(i->second, action->text()); |
3067 } | 3067 } |
3194 | 3194 |
3195 LayerActionMap::iterator i = m_layerActions.find(action); | 3195 LayerActionMap::iterator i = m_layerActions.find(action); |
3196 | 3196 |
3197 if (i == m_layerActions.end()) { | 3197 if (i == m_layerActions.end()) { |
3198 std::cerr << "WARNING: MainWindow::addLayer: unknown action " | 3198 std::cerr << "WARNING: MainWindow::addLayer: unknown action " |
3199 << action->objectName().toStdString() << std::endl; | 3199 << action->objectName() << std::endl; |
3200 return; | 3200 return; |
3201 } | 3201 } |
3202 | 3202 |
3203 LayerFactory::LayerType type = i->second.layer; | 3203 LayerFactory::LayerType type = i->second.layer; |
3204 | 3204 |
3336 duration, | 3336 duration, |
3337 &configurator); | 3337 &configurator); |
3338 | 3338 |
3339 if (!input.getModel()) return; | 3339 if (!input.getModel()) return; |
3340 | 3340 |
3341 // std::cerr << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName().toStdString() << "\"" << std::endl << "transform:" << std::endl << transform.toXmlString().toStdString() << std::endl; | 3341 // std::cerr << "MainWindow::addLayer: Input model is " << input.getModel() << " \"" << input.getModel()->objectName() << "\"" << std::endl << "transform:" << std::endl << transform.toXmlString() << std::endl; |
3342 | 3342 |
3343 Layer *newLayer = m_document->createDerivedLayer(transform, input); | 3343 Layer *newLayer = m_document->createDerivedLayer(transform, input); |
3344 | 3344 |
3345 if (newLayer) { | 3345 if (newLayer) { |
3346 m_document->addLayerToView(pane, newLayer); | 3346 m_document->addLayerToView(pane, newLayer); |