Add new layout and channel number hiding

Author: kmichaelfox

Source/Plugins/LfpDisplayNodeAlpha/LfpDisplayCanvas.cpp

@@ -2151,9 +2151,11 @@ void LfpDisplay::resized()
         LfpChannelDisplayInfo* info = drawableChannels[i].channelInfo;
 
         info->setBounds(0,
-                        totalHeight-disp->getChannelHeight()/4,
+//                        totalHeight-disp->getChannelHeight()/4,
+                        totalHeight-disp->getChannelHeight() + (disp->getChannelOverlap()*canvas->channelOverlapFactor)/4.0,
                         canvas->leftmargin + 50,
                         disp->getChannelHeight());
+//                        disp->getChannelHeight()+(disp->getChannelOverlap()*canvas->channelOverlapFactor));
 
         totalHeight += disp->getChannelHeight();
 
@@ -2748,7 +2750,7 @@ void LfpDisplay::mouseDown(const MouseEvent& event)
         int cpos = (drawableChannels[n].channel->getY() + (drawableChannels[n].channel->getHeight()/2));
         dist = int(abs(y - cpos));
 
-        std::cout << "Mouse down at " << y << " pos is "<< cpos << " n: " << n << "  dist " << dist << std::endl;
+//        std::cout << "Mouse down at " << y << " pos is "<< cpos << " n: " << n << "  dist " << dist << std::endl;
 
         if (dist < mindist)
         {
@@ -3392,14 +3394,17 @@ LfpChannelDisplayInfo::LfpChannelDisplayInfo(LfpDisplayCanvas* canvas_, LfpDispl
     x = -1.0f;
     y = -1.0f;
 
-    enableButton = new UtilityButton(String(ch+1), Font("Small Text", 13, Font::plain));
+//    enableButton = new UtilityButton(String(ch+1), Font("Small Text", 13, Font::plain));
+    enableButton = new UtilityButton("*", Font("Small Text", 13, Font::plain));
     enableButton->setRadius(5.0f);
 
     enableButton->setEnabledState(true);
     enableButton->setCorners(true, true, true, true);
     enableButton->addListener(this);
     enableButton->setClickingTogglesState(true);
     enableButton->setToggleState(true, dontSendNotification);
+    
+    isSingleChannel = false;
 
     addAndMakeVisible(enableButton);
 
@@ -3530,37 +3535,56 @@ void LfpChannelDisplayInfo::paint(Graphics& g)
 
     int center = getHeight()/2;
 
-    g.setColour(lineColour);
-
+//    g.setColour(lineColour);
     //if (chan > 98)
     //  g.fillRoundedRectangle(5,center-8,51,22,8.0f);
     //else
-    g.fillRoundedRectangle(5,center-8,41,22,8.0f);
-
-    g.setFont(Font("Small Text", 13, Font::plain));
-    g.drawText(typeStr,5,center+16,41,10,Justification::centred,false);
+    
+//    g.fillRoundedRectangle(5,center-8,41,22,8.0f);
+    
+    // Draw the channel numbers
+    g.setColour(Colours::grey);
+    const String channelString = (isChannelNumberHidden() ? ("--") : String(getChannelNumber() + 1));
+    bool isCentered = !getEnabledButtonVisibility();
+    
+    g.drawText(channelString,
+               2,
+               center-4,
+               isCentered ? (getWidth()/2-4) : (getWidth()/4),
+               10,
+               isCentered ? Justification::centred : Justification::centredRight,
+               false);
+    
+    g.setColour(lineColour);
+    g.fillRect(0, 0, 2, getHeight());
+    
+    if (getChannelTypeStringVisibility())
+    {
+        g.setFont(Font("Small Text", 13, Font::plain));
+        g.drawText(typeStr,5,center+10,41,10,Justification::centred,false);
+    }
     // g.setFont(channelHeightFloat*0.3);
     g.setFont(Font("Small Text", 11, Font::plain));
 
     if (isSingleChannel)
     {
         g.setColour(Colours::darkgrey);
-        g.drawText("STD:", 5, center+100,41,10,Justification::centred,false);
-        g.drawText("MEAN:", 5, center+50,41,10,Justification::centred,false);
+        g.drawText("STD:", 5, center+90,41,10,Justification::centred,false);
+        g.drawText("MEAN:", 5, center+40,41,10,Justification::centred,false);
 
         if (x > 0)
         {
-            g.drawText("uV:", 5, center+150,41,10,Justification::centred,false);
+            g.drawText("uV:", 5, center+140,41,10,Justification::centred,false);
         }
         //g.drawText("Y:", 5, center+200,41,10,Justification::centred,false);
 
         g.setColour(Colours::grey);
-        g.drawText(String(canvas->getStd(chan)), 5, center+120,41,10,Justification::centred,false);
-        g.drawText(String(canvas->getMean(chan)), 5, center+70,41,10,Justification::centred,false);
+        g.drawText(String(canvas->getStd(chan)), 5, center+110,41,10,Justification::centred,false);
+        g.drawText(String(canvas->getMean(chan)), 5, center+60,41,10,Justification::centred,false);
         if (x > 0)
         {
             //g.drawText(String(x), 5, center+150,41,10,Justification::centred,false);
-            g.drawText(String(y), 5, center+170,41,10,Justification::centred,false);
+            g.drawText(String(y), 5, center+160,41,10,Justification::centred,false);
         }
 
     }
@@ -3578,12 +3602,64 @@ void LfpChannelDisplayInfo::updateXY(float x_, float y_)
 void LfpChannelDisplayInfo::resized()
 {
 
-    int center = getHeight()/2;
+//    int center = getHeight()/2;
 
     //if (chan > 98)
     //  enableButton->setBounds(8,center-5,45,16);
     //else
-    enableButton->setBounds(8,center-5,35,16);
+//    enableButton->setBounds(8,center-5,35,16);
+    
+    setEnabledButtonVisibility(getHeight() >= 16);
+    
+    if (getEnabledButtonVisibility())
+    {
+        enableButton->setBounds(getWidth()/4 + 5, (getHeight()/2) - 7, 15, 15);
+    }
+    
+    setChannelNumberIsHidden(getHeight() < 16 && getChannelNumber() % 5 != 0);
+    
+    setChannelTypeStringVisibility(getHeight() > 34);
+}
+
+void LfpChannelDisplayInfo::setEnabledButtonVisibility(bool shouldBeVisible)
+{
+    if (shouldBeVisible)
+    {
+        addAndMakeVisible(enableButton);
+        std::cout << "adding enableButton to view for channel " << getChannelNumber() << std::endl;
+    }
+    else if (enableButton->isVisible())
+    {
+        std::cout << "removing enableButton for channel " << getChannelNumber() + 1 << std::endl;
+        removeChildComponent(enableButton);
+        enableButton->setVisible(false);
+    }
+    
+}
+
+bool LfpChannelDisplayInfo::getEnabledButtonVisibility()
+{
+    return enableButton->isVisible();
+}
+
+void LfpChannelDisplayInfo::setChannelTypeStringVisibility(bool shouldBeVisible)
+{
+    channelTypeStringIsVisible = shouldBeVisible;
+}
+
+bool LfpChannelDisplayInfo::getChannelTypeStringVisibility()
+{
+    return channelTypeStringIsVisible || isSingleChannel;
+}
+
+void LfpChannelDisplayInfo::setChannelNumberIsHidden(bool shouldBeHidden)
+{
+    channelNumberHidden = shouldBeHidden;
+}
+
+bool LfpChannelDisplayInfo::isChannelNumberHidden()
+{
+    return channelNumberHidden;
 }
 
 

Source/Plugins/LfpDisplayNodeAlpha/LfpDisplayCanvas.h

@@ -781,7 +781,18 @@ class LfpChannelDisplayInfo : public LfpChannelDisplay,
     int subProcessorIdx;
 
     ScopedPointer<UtilityButton> enableButton;
+    
+    bool channelTypeStringIsVisible;
+    bool channelNumberHidden;
+    
+    void setEnabledButtonVisibility(bool shouldBeVisible);
+    bool getEnabledButtonVisibility();
 
+    void setChannelTypeStringVisibility(bool shouldBeVisible);
+    bool getChannelTypeStringVisibility();
+    
+    void setChannelNumberIsHidden(bool shouldBeHidden);
+    bool isChannelNumberHidden();
 };