Use viewport to display Spike Detector table

Author: jsiegle

Plugins/BasicSpikeDisplay/SpikeDetector/PopupConfigurationWindow.cpp

@@ -198,7 +198,6 @@ void PopupThresholdComponent::sliderValueChanged(Slider* slider)
                                             lockButton->getToggleState(), // isLocked
                                             slider->getValue());         // value
 
-    owner->repaint();
 }
 
 void PopupThresholdComponent::buttonClicked(Button* button)
@@ -222,8 +221,7 @@ void PopupThresholdComponent::buttonClicked(Button* button)
                                                 thresholdType);       // threshold type
 
     createSliders();
-    
-    owner->repaint();
+
 }
 
 ThresholdSelectorCustomComponent::ThresholdSelectorCustomComponent(SpikeChannel* channel_, bool acquisitionIsActive_)
@@ -303,7 +301,7 @@ void ThresholdSelectorCustomComponent::paint(Graphics& g)
 
     if (channel == nullptr)
         return;
-    
+
     thresholdString = "";
 
     switch (thresholder_type->getSelectedIndex())
@@ -578,6 +576,8 @@ void SpikeDetectorTableModel::broadcastThresholdTypeToSelectedRows(int rowThatWa
     }
 
     table->updateContent();
+    
+    table->repaint();
 }
 
 void SpikeDetectorTableModel::broadcastThresholdToSelectedRows(int rowThatWasClicked,
@@ -588,7 +588,7 @@ void SpikeDetectorTableModel::broadcastThresholdToSelectedRows(int rowThatWasCli
 {
     SparseSet<int> selectedRows = table->getSelectedRows();
 
-    //std::cout << "Broadcasting value." << std::endl;
+    //std::cout << "Broadcasting value for " << rowThatWasClicked << ", " << channelIndex << std::endl;
 
     float actualValue;
 
@@ -639,12 +639,18 @@ void SpikeDetectorTableModel::broadcastThresholdToSelectedRows(int rowThatWasCli
             Component* c = table->getCellComponent(SpikeDetectorTableModel::Columns::THRESHOLD, i);
 
             if (c != nullptr)
+            {
+                //std::cout << "Repainting" << std::endl;
                 c->repaint();
+            }
+                
 
         }
     }
 
     table->updateContent();
+    
+    table->repaint();
 }
 
 Component* SpikeDetectorTableModel::refreshComponentForCell(int rowNumber, 
@@ -949,7 +955,7 @@ void SpikeChannelGenerator::buttonClicked(Button* button)
         int numSpikeChannelsToAdd = spikeChannelCountLabel->getText().getIntValue();
         SpikeChannel::Type channelType = (SpikeChannel::Type) spikeChannelTypeSelector->getSelectedId();
 
-        std::cout << "Button clicked! Sending " << startChannels.size() << " start channels " << std::endl;
+        //std::cout << "Button clicked! Sending " << startChannels.size() << " start channels " << std::endl;
 
         if (startChannels.size() == 0)
              editor->addSpikeChannels(window, channelType, numSpikeChannelsToAdd);
@@ -1008,7 +1014,7 @@ void SpikeChannelGenerator::channelStateChanged(Array<int> selectedChannels)
 {
     startChannels = selectedChannels;
 
-    std::cout << "Size of start channels: " << startChannels.size() << std::endl;
+    //std::cout << "Size of start channels: " << startChannels.size() << std::endl;
 }
 
 void SpikeChannelGenerator::paint(Graphics& g)
@@ -1054,46 +1060,66 @@ PopupConfigurationWindow::PopupConfigurationWindow(SpikeDetectorEditor* editor_,
     electrodeTable->setHeaderHeight(30);
     electrodeTable->setRowHeight(30);
     electrodeTable->setMultipleSelectionEnabled(true);
+    
+    viewport = std::make_unique<Viewport>();
 
-    addChildComponent(electrodeTable.get());
+    viewport->setViewedComponent(electrodeTable.get(), false);
+    viewport->setScrollBarsShown(true, false);
+    viewport->getVerticalScrollBar().addListener(this);
 
+    addAndMakeVisible(viewport.get());
     update(spikeChannels);
 
 
 }
 
+void PopupConfigurationWindow::scrollBarMoved(ScrollBar* scrollBar, double newRangeStart)
+{
+
+    if (!updating)
+    {
+        scrollDistance = viewport->getViewPositionY();
+    }
+    
+}
+
 
 void PopupConfigurationWindow::update(Array<SpikeChannel*> spikeChannels)
 {
 
     if (spikeChannels.size() > 0)
     {
 
+        updating = true;
+        
         tableModel->update(spikeChannels);
 
         int maxRows = 16;
 
-        int numRows = spikeChannels.size() <= maxRows ? spikeChannels.size() : maxRows;
+        int numRowsVisible = spikeChannels.size() <= maxRows ? spikeChannels.size() : maxRows;
 
         int scrollBarWidth = 0;
 
-        electrodeTable->getHorizontalScrollBar().setVisible(false);
-
         if (spikeChannels.size() > maxRows)
         {
-            electrodeTable->getVerticalScrollBar().setVisible(true);
+            viewport->getVerticalScrollBar().setVisible(true);
             scrollBarWidth += 20;
         }
         else {
-            electrodeTable->getVerticalScrollBar().setVisible(false);
+            viewport->getVerticalScrollBar().setVisible(false);
         }
-            
-        setSize(530 + scrollBarWidth, (numRows + 1) * 30 + 10 + 40);
-        electrodeTable->setBounds(5, 5, 520 + scrollBarWidth, (numRows + 1) * 30);
+          
+        setSize(530 + scrollBarWidth, (numRowsVisible + 1) * 30 + 10 + 40);
+        viewport->setBounds(5, 5, 520 + scrollBarWidth, (numRowsVisible + 1) * 30);
+        electrodeTable->setBounds(0, 0, 520 + scrollBarWidth, (spikeChannels.size() + 1) * 30);
+        
+        viewport->setViewPosition(0, scrollDistance);
 
         electrodeTable->setVisible(true);
 
-        spikeChannelGenerator->setBounds(60, electrodeTable->getBottom() + 8, 420, 30);
+        spikeChannelGenerator->setBounds(60, viewport->getBottom() + 8, 420, 30);
+        
+        updating = false;
 
     }
     else {

Plugins/BasicSpikeDisplay/SpikeDetector/PopupConfigurationWindow.h

@@ -449,7 +449,8 @@ class SpikeChannelGenerator :
 /**
 *   Popup window used to edit Spike Channel settings
 */
-class PopupConfigurationWindow : public Component
+class PopupConfigurationWindow : public Component,
+    public ScrollBar::Listener
 {
 
 public:
@@ -463,7 +464,7 @@ class PopupConfigurationWindow : public Component
     ~PopupConfigurationWindow() { }
 
     /** Updates the window with a new set of Spike Channels*/
-    void update(Array<SpikeChannel*> spikeChannels);\
+    void update(Array<SpikeChannel*> spikeChannels);
 
     /** Custom table header component (not currently used)*/
     //std::unique_ptr<TableHeaderComponent> tableHeader;
@@ -473,11 +474,20 @@ class PopupConfigurationWindow : public Component
 
     /** Custom list box for Spike Channel settings*/
     std::unique_ptr<TableListBox> electrodeTable;
+    
+    /** Listens for viewport scrolling */
+    void scrollBarMoved(ScrollBar* scrollBar, double newRangeStart);
 
 private:
     SpikeDetectorEditor* editor;
 
     std::unique_ptr<SpikeChannelGenerator> spikeChannelGenerator;
+    
+    std::unique_ptr<Viewport> viewport;
+
+    int scrollDistance = 0;
+    
+    bool updating = false;
 };