Improve tab reloading

Author: jsiegle

Source/Processors/Editors/VisualizerEditor.cpp

@@ -392,6 +392,8 @@ void VisualizerEditor::setActiveTabId (int tindex)
 
 void VisualizerEditor::removeTab (int tindex)
 {
+
+    //std::cout << "Removing tab for " << nodeId << std::endl;
     AccessClass::getDataViewport()->destroyTab (tindex);
     tabIndex = -1;
 }
@@ -402,5 +404,7 @@ int VisualizerEditor::addTab (String textOfTab, Visualizer* contentComponent)
     tabText  = textOfTab;
     tabIndex = AccessClass::getDataViewport()->addTabToDataViewport (textOfTab, contentComponent);
 
+    //std::cout << "Adding tab for " << nodeId << " at " << tabIndex << std::endl;
+
     return tabIndex;
 }

Source/UI/DataViewport.cpp

@@ -27,13 +27,9 @@
 
 DataViewport::DataViewport() :
     TabbedComponent(TabbedButtonBar::TabsAtRight),
-    tabDepth(32), tabIndex(0), shutdown(false)
+    tabDepth(32), tabIndex(1), shutdown(false)
 {
 
-    tabArray.clear();
-    tabNameMap.clear();
-    tabComponentMap.clear();
-
     setTabBarDepth(tabDepth);
     setIndent(8); // gap to leave around the edge
                   // of the content component
@@ -51,7 +47,7 @@ int DataViewport::addTabToDataViewport(String name,
     if (tabArray.size() == 0)
         setVisible(true);
 
-    tabIndex++;
+    
 
     addTab(name, Colours::lightgrey, component, false, tabIndex);
 
@@ -62,18 +58,28 @@ int DataViewport::addTabToDataViewport(String name,
 
     tabArray.add(tabIndex);
 
-    LOGDD("Data Viewport adding tab with index ", tabIndex);
+    //std::cout << "Tab Array: ";
+   // for (int i = 0; i < tabArray.size(); i++)
+   //     std::cout << tabArray[i] << " ";
+   // std::cout << std::endl;
+
+    LOGD("Data Viewport adding tab with index ", tabIndex);
 
     setCurrentTabIndex(tabArray.size()-1);
 
-    return tabIndex;
+    tabIndex++;
+
+    return tabIndex - 1;
 
 }
 
-void DataViewport::addTabAtIndex(int tabIndex, String tabName, Component* tabComponent)
+void DataViewport::addTabAtIndex(int tabIndex_, String tabName, Component* tabComponent)
 {
-    tabNameMap.emplace(tabIndex, tabName);
-    tabComponentMap.emplace(tabIndex, tabComponent);
+
+    savedTabIndices.add(tabIndex_);
+    savedTabComponents.add(tabComponent);
+    savedTabNames.add(tabName);
+
 }
 
 
@@ -92,7 +98,7 @@ void DataViewport::destroyTab(int index)
     int newIndex = tabArray.indexOf(index);
 
     tabArray.remove(newIndex);
-    tabIndex--;
+    //tabIndex--;
 
     removeTab(newIndex);
 
@@ -101,6 +107,14 @@ void DataViewport::destroyTab(int index)
 
     setCurrentTabIndex(tabArray.size()-1);
 
+    //std::cout << "Tab Array: ";
+   // for (int i = 0; i < tabArray.size(); i++)
+    //    std::cout << tabArray[i] << " ";
+    //std::cout << std::endl;
+    
+    if (tabArray.size() == 2) // just graph and info tab left
+        tabIndex = 3;
+
 }
 
 void DataViewport::saveStateToXml(XmlElement* xml)
@@ -111,25 +125,32 @@ void DataViewport::saveStateToXml(XmlElement* xml)
 
 void DataViewport::loadStateFromXml(XmlElement* xml)
 {
-    for (const auto& tab : tabNameMap) 
+
+    std::vector<int> tabOrder(savedTabIndices.size());
+    std::iota(tabOrder.begin(), tabOrder.end(), 0); //Initializing
+    sort(tabOrder.begin(), tabOrder.end(), [&](int i, int j)
+        {return savedTabIndices[i] < savedTabIndices[j]; });
+
+    for (int i = 0; i < tabOrder.size(); i++)
     {
-        // LOGC("********* ADDING ", tab.second, " to index ", tab.first, " ", tabComponentMap[tab.first]->getName());
-        addTabToDataViewport(tab.second, tabComponentMap[tab.first]);
+        tabIndex = savedTabIndices[tabOrder[i]];
+        addTabToDataViewport(savedTabNames[tabOrder[i]], savedTabComponents[tabOrder[i]]);
     }
 
     for (auto* xmlNode : xml->getChildIterator())
     {
         if (xmlNode->hasTagName("DATAVIEWPORT"))
         {
 			int index = xmlNode->getIntAttribute("selectedTab", -1);
-			if (index != -1)
+            if (index != -1)
                 selectTab(index);
         }
 
     }
 
-    tabNameMap.clear();
-    tabComponentMap.clear();
+    savedTabIndices.clear();
+    savedTabComponents.clear();
+    savedTabNames.clear();
 
 }
 

Source/UI/DataViewport.h

@@ -85,8 +85,9 @@ class DataViewport : public TabbedComponent
     Array<int> tabArray;
 
     /** Maps processors to their respective tabs within the DataViewport. */
-    std::map<int, String> tabNameMap;
-    std::map<int, Component*> tabComponentMap;
+    Array<int> savedTabIndices;
+    Array<String> savedTabNames;
+    Array<Component*> savedTabComponents;
 
     void paint(Graphics& g);
     int tabDepth;