Remove unused combo box in spike sorter

Author: aacuevas

Source/Plugins/SpikeSorter/SpikeSorterEditor.cpp

@@ -148,7 +148,7 @@ SpikeSorterEditor::SpikeSorterEditor(GenericProcessor* parentNode, bool useDefau
     channelSelector->paramButtonsToggledByDefault(false);
     //	updateAdvancerList();
 
-    dacAssignmentLabel= new Label("DAC output","DAC output");
+ /*   dacAssignmentLabel= new Label("DAC output","DAC output");
     dacAssignmentLabel->setFont(Font("Default", 10, Font::plain));
     dacAssignmentLabel->setEditable(false);
     dacAssignmentLabel->setBounds(210,115,80,20);
@@ -164,7 +164,7 @@ SpikeSorterEditor::SpikeSorterEditor(GenericProcessor* parentNode, bool useDefau
         dacCombo->addItem("DAC"+String(k+1),k+2);
     }
     dacCombo->setSelectedId(1);
-    addAndMakeVisible(dacCombo);
+    addAndMakeVisible(dacCombo);*/
 
 }
 
@@ -211,13 +211,13 @@ void SpikeSorterEditor::sliderEvent(Slider* slider)
 
 
 
-        //Array<int> dacChannels = processor->getDACassignments;
+     /*   //Array<int> dacChannels = processor->getDACassignments;
         int dacChannel = dacCombo->getSelectedId()-2;
         if (dacChannel >= 0)
         {
             // update dac threshold.
             processor->updateDACthreshold(dacChannel, slider->getValue());
-        }
+        }*/
 
     }
     repaint();
@@ -259,7 +259,7 @@ void SpikeSorterEditor::buttonEvent(Button* button)
                                                                      electrodeButtons.indexOf((ElectrodeButton*) button)));
 
 
-            if (processor->getAutoDacAssignmentStatus())
+        /*    if (processor->getAutoDacAssignmentStatus())
             {
                 processor->assignDACtoChannel(0, channelNum);
                 processor->assignDACtoChannel(1, channelNum);
@@ -274,7 +274,7 @@ void SpikeSorterEditor::buttonEvent(Button* button)
                     dacCombo->setSelectedId(i+2, sendNotification);
                     break;
                 }
-            }
+            }*/
 
         }
     }
@@ -517,7 +517,7 @@ void SpikeSorterEditor::channelChanged (int channel, bool newState)
                                   i,
                                   channel - 1);
 
-            // if DAC is selected, update the mapping.
+         /*   // if DAC is selected, update the mapping.
             int dacchannel = dacCombo->getSelectedId() - 2;
             if (dacchannel >=0)
             {
@@ -528,7 +528,7 @@ void SpikeSorterEditor::channelChanged (int channel, bool newState)
                 processor->assignDACtoChannel (0, channel - 1);
                 processor->assignDACtoChannel (1, channel - 1);
                 break;
-            }
+            }*/
         }
     }
 }
@@ -587,7 +587,7 @@ void SpikeSorterEditor::refreshElectrodeList(int selected)
             processor->assignDACtoChannel(0, e->channels[0]);
             processor->assignDACtoChannel(1, e->channels[0]);
         }
-        Array<int> dacAssignmentToChannels = processor->getDACassignments();
+     /*   Array<int> dacAssignmentToChannels = processor->getDACassignments();
         // search for channel[0]. If found, set the combo box accordingly...
         dacCombo->setSelectedId(1, sendNotification);
         for (int i=0; i<dacAssignmentToChannels.size(); i++)
@@ -598,7 +598,7 @@ void SpikeSorterEditor::refreshElectrodeList(int selected)
                 processor->updateDACthreshold(i+2, e->thresholds[0]);
                 break;
             }
-        }
+        }*/
 
 
 
@@ -664,7 +664,7 @@ void SpikeSorterEditor::comboBoxChanged(ComboBox* comboBox)
 {
     SpikeSorter* processor = (SpikeSorter*) getProcessor();
 
-    if (comboBox == dacCombo)
+   /* if (comboBox == dacCombo)
     {
         int selection = dacCombo->getSelectedId();
         // modify the dac channel assignment...
@@ -688,7 +688,7 @@ void SpikeSorterEditor::comboBoxChanged(ComboBox* comboBox)
         }
 
     }
-    else if (comboBox == electrodeList)
+    else*/ if (comboBox == electrodeList)
     {
         int ID = comboBox->getSelectedId();
 
@@ -726,7 +726,7 @@ void SpikeSorterEditor::comboBoxChanged(ComboBox* comboBox)
                 processor->assignDACtoChannel(0, e->channels[0]);
                 processor->assignDACtoChannel(1, e->channels[0]);
             }
-            Array<int> dacAssignmentToChannels = processor->getDACassignments();
+         /*   Array<int> dacAssignmentToChannels = processor->getDACassignments();
             // search for channel[0]. If found, set the combo box accordingly...
             dacCombo->setSelectedId(1, sendNotification);
             for (int i=0; i<dacAssignmentToChannels.size(); i++)
@@ -736,7 +736,7 @@ void SpikeSorterEditor::comboBoxChanged(ComboBox* comboBox)
                     dacCombo->setSelectedId(i+2, sendNotification);
                     break;
                 }
-            }
+            }*/
 
         }
 

Source/Plugins/SpikeSorter/SpikeSorterEditor.h

@@ -73,11 +73,11 @@ class SpikeSorterEditor : public VisualizerEditor,
 
 
     //  ComboBox* electrodeTypes;
-    ScopedPointer<ComboBox> electrodeList,dacCombo;
+	ScopedPointer<ComboBox> electrodeList;// , dacCombo;
     ScopedPointer<ComboBox> advancerList;
     ScopedPointer<Label> advancerLabel, depthOffsetLabel, depthOffsetEdit;
     ScopedPointer<Label> numElectrodes;
-    ScopedPointer<Label> thresholdLabel,dacAssignmentLabel;
+	ScopedPointer<Label> thresholdLabel; // , dacAssignmentLabel;
     ScopedPointer<TriangleButton> upButton;
     ScopedPointer<TriangleButton> downButton;
     ScopedPointer<UtilityButton> plusButton;