comparison main/MainWindow.cpp @ 2538:9910ba30a572

Update subrepos with various performance tweaks; when rebuilding menus, delete old actions (turns out addAction(QAction*) doesn't take ownership - I did know this once, but...)

         Surveyer::Config config;
         config.hostname = "sonicvisualiser.org";
         config.testPath = "feedback41-present.txt";
         config.surveyPath = "feedback41.php";
         config.countdownKey = "countdown41";
-        config.countdownFrom = 1;
+        config.countdownFrom = 5;
         config.title = "Sonic Visualiser - Can you help?";
         config.text = "<h3>Sonic Visualiser: Can you help?</h3><p>"
             "<p>Are you using Sonic Visualiser in academic research or for commercial purposes? Or do you intend to do so?</p>"
             "<p>If so, would you be interested in telling us something about your work? We are gathering case studies to gauge the impact of our work and to guide our future actions.</p><p>Anything you tell us will be used only to guide research and development at the Centre for Digital Music, Queen Mary University of London.</p>";
         config.acceptLabel = tr("Yes, I'd be happy to");

 }
 
 void
 MainWindow::setupPaneAndLayerMenus()
 {
+    Profiler profiler("MainWindow::setupPaneAndLayerMenus");
+    
     if (m_paneMenu) {
+        m_paneMenu->clear();
+        for (auto a: m_paneActions) {
+            delete a.first;
+        }
         m_paneActions.clear();
-        m_paneMenu->clear();
     } else {
         m_paneMenu = menuBar()->addMenu(tr("&Pane"));
         m_paneMenu->setTearOffEnabled(true);
-    }
-
-    if (m_layerMenu) {
-        m_layerActions.clear();
-        m_layerMenu->clear();
-    } else {
-        m_layerMenu = menuBar()->addMenu(tr("&Layer"));
-        m_layerMenu->setTearOffEnabled(true);
     }
 
     if (m_rightButtonLayerMenu) {
         m_rightButtonLayerMenu->clear();
     } else {
         m_rightButtonLayerMenu = m_rightButtonMenu->addMenu(tr("&Layer"));
         m_rightButtonLayerMenu->setTearOffEnabled(true);
         m_rightButtonMenu->addSeparator();
+    }
+
+    if (m_layerMenu) {
+        m_layerMenu->clear();
+        for (auto a: m_layerActions) {
+            delete a.first;
+        }
+        m_layerActions.clear();
+    } else {
+        m_layerMenu = menuBar()->addMenu(tr("&Layer"));
+        m_layerMenu->setTearOffEnabled(true);
     }
 
     QMenu *menu = m_paneMenu;
 
     IconLoader il;

 
 void
 MainWindow::setupTransformsMenu()
 {
     if (m_transformsMenu) {
+        m_transformsMenu->clear();
+        m_recentTransformsMenu->clear();
+        m_transformActionsReverse.clear();
         m_transformActions.clear();
-        m_transformActionsReverse.clear();
-        m_transformsMenu->clear();
+        for (auto a: m_transformActions) {
+            delete a.first;
+        }
     } else {
         m_transformsMenu = menuBar()->addMenu(tr("&Transform")); 
         m_transformsMenu->setTearOffEnabled(true);
         m_transformsMenu->setSeparatorsCollapsible(true);
     }

 {
     m_recentFilesMenu->clear();
     vector<QString> files = m_recentFiles.getRecent();
     for (size_t i = 0; i < files.size(); ++i) {
         QString path = files[i];
-        QAction *action = new QAction(path, this);
+        QAction *action = m_recentFilesMenu->addAction(path);
         action->setObjectName(path);
         connect(action, SIGNAL(triggered()), this, SLOT(openRecentFile()));
         if (i == 0) {
             action->setShortcut(tr("Ctrl+R"));
             m_keyReference->registerShortcut
                 (tr("Re-open"),
                  action->shortcut().toString(),
                  tr("Re-open the current or most recently opened file"));
         }
-        m_recentFilesMenu->addAction(action);
     }
 }
 
 void
 MainWindow::setupTemplatesMenu()
 {
     m_templatesMenu->clear();
 
-    QAction *defaultAction = new QAction(tr("Standard Waveform"), this);
+    QAction *defaultAction = m_templatesMenu->addAction(tr("Standard Waveform"));
     defaultAction->setObjectName("default");
     connect(defaultAction, SIGNAL(triggered()), this, SLOT(applyTemplate()));
-    m_templatesMenu->addAction(defaultAction);
 
     m_templatesMenu->addSeparator();
 
     QAction *action = nullptr;
 

         byName.insert(QFileInfo(t).baseName());
     }
 
     foreach (QString t, byName) {
         if (t.toLower() == "default") continue;
-        action = new QAction(t, this);
+        action = m_templatesMenu->addAction(t);
         connect(action, SIGNAL(triggered()), this, SLOT(applyTemplate()));
-        m_templatesMenu->addAction(action);
     }
 
     if (!templates.empty()) m_templatesMenu->addSeparator();
 
     if (!m_templateWatcher) {

         m_templateWatcher->addPath(ResourceFinder().getResourceSaveDir("templates"));
         connect(m_templateWatcher, SIGNAL(directoryChanged(const QString &)),
                 this, SLOT(setupTemplatesMenu()));
     }
 
-    QAction *setDefaultAction = new QAction(tr("Choose Default Template..."), this);
+    m_templatesMenu->addSeparator();
+
+    QAction *setDefaultAction = m_templatesMenu->addAction(tr("Choose Default Template..."));
     setDefaultAction->setObjectName("set_default_template");
     connect(setDefaultAction, SIGNAL(triggered()), this, SLOT(preferences()));
-    m_templatesMenu->addSeparator();
-    m_templatesMenu->addAction(setDefaultAction);
 
     m_manageTemplatesAction->setEnabled(havePersonal);
 }
 
 

 {
     if (!m_existingLayersMenu) return; // should have been created by setupMenus
 
 //    SVDEBUG << "MainWindow::setupExistingLayersMenu" << endl;
 
+    Profiler profiler1("MainWindow::setupExistingLayersMenu");
+
     m_existingLayersMenu->clear();
+    for (auto a: m_existingLayerActions) {
+        delete a.first;
+    }
     m_existingLayerActions.clear();
 
     m_sliceMenu->clear();
+    for (auto a: m_sliceActions) {
+        delete a.first;
+    }
     m_sliceActions.clear();
 
     IconLoader il;
 
     vector<Layer *> orderedLayers;

                 sliceableLayers.insert(layer);
             }
         }
     }
 
+    Profiler profiler3("MainWindow::setupExistingLayersMenu: after sorting");
+    
     map<QString, int> observedNames;
 
     for (size_t i = 0; i < orderedLayers.size(); ++i) {
         
         Layer *layer = orderedLayers[i];

 }
 
 void
 MainWindow::layerRemoved(Layer *layer)
 {
+    Profiler profiler("MainWindow::layerRemoved");
     setupExistingLayersMenus();
     MainWindowBase::layerRemoved(layer);
 }
 
 void