cleaned up patch selector code

fixed issue where saving a patch causes it to look like none is selected
hsetlik · Jun 3, 2021 · e92ce99 · e92ce99
1 parent 08c646f
commit e92ce99
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 40 deletions.
diff --git a/Source/PatchManagerComponent.cpp b/Source/PatchManagerComponent.cpp
@@ -10,26 +10,47 @@
 
 #include "PatchManagerComponent.h"
 
+void PatchSelector::addPatch(std::unique_ptr<juce::XmlElement> &currentXml, int idNum)
+{
+ if(currentXml != nullptr)
+ {
+ if(currentXml->hasAttribute("HexFmPatchName"))
+ {
+ auto presetName = currentXml->getStringAttribute("HexFmPatchName");
+ patchNames.add(presetName);
+ addItem(presetName, idNum);
+ }
+ }
+}
+void PatchSelector::selectNewest()
+{
+ int newestIndex = 0;
+ for(int i = 0; i < patchNames.size(); ++i)
+ {
+ if(!lastPatchNames.contains(patchNames[i]))
+ {
+ newestIndex = i;
+ setSelectedItemIndex(newestIndex);
+ setText(getItemText(newestIndex));
+ lastPatchNames = patchNames;
+ return;
+ }
+ }
+}
+
 void PatchSelector::initialize()
 {
  int nextId = 1;
+ patchNames.clear();
  if(lib->bassGroup.patches.size() > 0)
  {
  addSectionHeading("Bass");
  addSeparator();
  for(auto f : lib->bassGroup.patches)
  {
  std::unique_ptr<juce::XmlElement> currentXml = juce::parseXML(f);
- if(currentXml != nullptr)
- {
- if(currentXml->hasAttribute("HexFmPatchName"))
- {
- auto presetName = currentXml->getStringAttribute("HexFmPatchName");
- patchNames.add(presetName);
- addItem(presetName, nextId);
- ++nextId;
- }
- }
+ addPatch(currentXml, nextId);
+ ++nextId;
  }
  }
 
@@ -40,16 +61,8 @@ void PatchSelector::initialize()
  for(auto f : lib->leadGroup.patches)
  {
  std::unique_ptr<juce::XmlElement> currentXml = juce::parseXML(f);
- if(currentXml != nullptr)
- {
- if(currentXml->hasAttribute("HexFmPatchName"))
- {
- auto presetName = currentXml->getStringAttribute("HexFmPatchName");
- patchNames.add(presetName);
- addItem(presetName, nextId);
- ++nextId;
- }
- }
+ addPatch(currentXml, nextId);
+ ++nextId;
  }
  }
 
@@ -60,16 +73,8 @@ void PatchSelector::initialize()
  for(auto f : lib->chordGroup.patches)
  {
  std::unique_ptr<juce::XmlElement> currentXml = juce::parseXML(f);
- if(currentXml != nullptr)
- {
- if(currentXml->hasAttribute("HexFmPatchName"))
- {
- auto presetName = currentXml->getStringAttribute("HexFmPatchName");
- patchNames.add(presetName);
- addItem(presetName, nextId);
- ++nextId;
- }
- }
+ addPatch(currentXml, nextId);
+ ++nextId;
  }
  }
 
@@ -80,16 +85,8 @@ void PatchSelector::initialize()
  for(auto f : lib->padGroup.patches)
  {
  std::unique_ptr<juce::XmlElement> currentXml = juce::parseXML(f);
- if(currentXml != nullptr)
- {
- if(currentXml->hasAttribute("HexFmPatchName"))
- {
- auto presetName = currentXml->getStringAttribute("HexFmPatchName");
- patchNames.add(presetName);
- addItem(presetName, nextId);
- ++nextId;
- }
- }
+ addPatch(currentXml, nextId);
+ ++nextId;
  }
  }
 }

diff --git a/Source/PatchManagerComponent.h b/Source/PatchManagerComponent.h
@@ -19,14 +19,19 @@ class PatchSelector : public juce::ComboBox
  PatchSelector() : lib(std::make_unique<PatchLibrary>())
  {
  initialize();
+ lastPatchNames = patchNames;
  }
  ~PatchSelector(){}
  void initialize();
+ void selectNewest();
+ void addPatch(std::unique_ptr<juce::XmlElement>& element, int idNum);
  void reInitList()
  {
  clear();
  lib.reset(new PatchLibrary());
  initialize();
+ selectNewest();
+
  }
  int getIndexWithText(juce::String text)
  {
@@ -38,6 +43,7 @@ class PatchSelector : public juce::ComboBox
  return getNumItems() - 1;
  }
  juce::StringArray patchNames;
+ juce::StringArray lastPatchNames;
 private:
  std::unique_ptr<PatchLibrary> lib;
 };