Merge branch 'development' of github.com:open-ephys/plugin-GUI into development

Author: aacuevas

Source/Plugins/BasicSpikeDisplay/SpikeDisplayNode/SpikeDisplayCanvas.cpp

@@ -123,22 +123,22 @@ void SpikeDisplayCanvas::refreshState()
 
 void SpikeDisplayCanvas::resized()
 {
-    viewport->setBounds(0,0,getWidth(),getHeight()-90);
+    viewport->setBounds(0, 0, getWidth(), getHeight()-30); // leave space at bottom for buttons
 
     spikeDisplay->setBounds(0,0,getWidth()-scrollBarThickness, spikeDisplay->getTotalHeight());
 
-    clearButton->setBounds(10, getHeight()-40, 100,20);
+    clearButton->setBounds(10, getHeight()-25, 130, 20);
 
-    lockThresholdsButton->setBounds(130, getHeight()-40, 130,20);
+    lockThresholdsButton->setBounds(10+130+10, getHeight()-25, 130, 20);
 
-    invertSpikesButton->setBounds(270, getHeight()-40, 130,20);
+    invertSpikesButton->setBounds(10+130+10+130+10, getHeight()-25, 130, 20);
 
 }
 
 void SpikeDisplayCanvas::paint(Graphics& g)
 {
 
-    g.fillAll(Colours::darkgrey);
+    g.fillAll(Colours::black);
 
 }
 
@@ -423,7 +423,7 @@ void SpikeDisplay::resized()
 
         }
 
-        totalHeight = (int) maxHeight + 50;
+        totalHeight = (int) maxHeight;
 
         // std::cout << "New height = " << totalHeight << std::endl;
 

Source/Plugins/ChannelMappingNode/ChannelMappingEditor.cpp

@@ -228,9 +228,13 @@ void ChannelMappingEditor::refreshButtonLocations()
         button->setBounds(column*width, row*height, width, height);
         totalWidth =  jmax(totalWidth, ++column*width);
 
-        if (column % 16 == 0)
+        if (column == 1)
         {
-            totalHeight =  jmax(totalHeight, ++row*height);
+            totalHeight = jmax(totalHeight, (row + 1)*height);
+        }
+        else if (column == 16)
+        {
+            row++;
             column = 0;            
         }
     }