Update change message and editor for SelectedChannelsParameter

Author: jsiegle

Source/Processors/Parameter/Parameter.cpp

@@ -773,40 +773,27 @@ String SelectedChannelsParameter::getValueAsString()
 
 String SelectedChannelsParameter::getChangeDescription()
 {
-    //compare previousValue to currentValue and return a string describing the change
-    Array<int> prev;
-    for (int i = 0; i < previousValue.getArray()->size(); i++)
-    {
-        prev.add (previousValue[i]);
-    }
-
-    Array<int> curr;
-    for (int i = 0; i < currentValue.getArray()->size(); i++)
-    {
-        curr.add (currentValue[i]);
-    }
-
-    //find how many values different from prev to curr
-    int diff = 0;
-
-    for (int i = 0; i < curr.size(); i++)
-    {
-        if (! prev.contains (curr[i]))
-            diff++;
-    }
-
-    for (int i = 0; i < prev.size(); i++)
-    {
-        if (! curr.contains (prev[i]))
-            diff++;
+    // Check number of selected channels:
+    int selectedChannelCount = currentValue.getArray()->size();
+    
+    // If more than four channels, state the number selected
+    if (selectedChannelCount > 4)
+        return "selected " + String(selectedChannelCount) + " channels";
+    else // Get string describing selected channels
+    {
+        String selectedChannelsString;
+        
+        for (int i = 0; i < selectedChannelCount; i++)
+        {
+            selectedChannelsString += String(int(currentValue[i]) + 1);
+            
+            if (i < selectedChannelCount - 1)
+                selectedChannelsString += ", ";
+        }
+        
+        return selectedChannelsString;
     }
-
-    if (diff == 0) //should never get here
-        return "No change";
-    else if (diff == 1)
-        return "changed 1";
-    else
-        return "changed selection";
+        
 }
 
 void SelectedChannelsParameter::toXml (XmlElement* xml)

Source/Processors/Parameter/ParameterEditor.cpp

@@ -582,6 +582,8 @@ SelectedChannelsParameterEditor::SelectedChannelsParameterEditor (Parameter* par
     button->setBounds (0, 0, rowWidthPixels / 2, rowHeightPixels);
 
     editor = (Component*) button.get();
+    
+    updateView();
 }
 
 Array<int> SelectedChannelsParameterEditor::getSelectedChannels()
@@ -648,12 +650,31 @@ void SelectedChannelsParameterEditor::updateView()
     else
     {
         button->setEnabled (true);
+        
         int numChannels = int (((SelectedChannelsParameter*) param)->getChannelStates().size());
-        int selected = 0;
+        
+        int numSelected = 0;
         for (auto chan : ((SelectedChannelsParameter*) param)->getChannelStates())
             if (chan)
-                selected++;
-        button->setButtonText (String (selected) + "/" + String (numChannels));
+                numSelected++;
+        
+        if (numSelected > 4)
+        {
+            button->setButtonText (String (numSelected) + "/" + String (numChannels));
+        } else {
+            String selectedChannelsString;
+            
+            for (int i = 0; i < numSelected; i++)
+            {
+                selectedChannelsString += String(int(param->currentValue[i]) + 1);
+                
+                if (i < numSelected - 1)
+                    selectedChannelsString += ", ";
+            }
+            button->setButtonText (selectedChannelsString);
+        }
+        
+        
     }
 }