Merge branch 'mspacek-lfpchanname' into development

Author: aacuevas

Plugins/LfpDisplayNode/LfpDisplayCanvas.cpp

@@ -32,7 +32,7 @@ using namespace LfpViewer;
 #pragma mark - LfpDisplayCanvas -
 
 LfpDisplayCanvas::LfpDisplayCanvas(LfpDisplayNode* processor_) :
-     timebase(1.0f), displayGain(1.0f),   timeOffset(0.0f),
+     timebase(1.0f), displayGain(1.0f),   timeOffset(0.0f), 
     processor(processor_)
 {
 
@@ -255,12 +255,9 @@ void LfpDisplayCanvas::update()
 		//std::cout << "Updating channel names" << std::endl;
 		for (int i = 0; i < nChans; i++)
         {
-
            String chName = processor->getDataChannel(i)->getName();
-
             lfpDisplay->channelInfo[i]->setName(chName);
             lfpDisplay->setEnabledState(isChannelEnabled[i], i);
-
         }
 
         if (nChans == 0) lfpDisplay->setBounds(0, 0, getWidth(), getHeight());
@@ -275,7 +272,8 @@ void LfpDisplayCanvas::update()
     {
 		for (int i = 0; i < nChans; i++)
         {
-			//std::cout << i << std::endl;
+            String chName = processor->getDataChannel(i)->getName();
+            lfpDisplay->channelInfo[i]->setName(chName);
             lfpDisplay->channels[i]->updateType();
             lfpDisplay->channelInfo[i]->updateType();
         }
@@ -949,7 +947,21 @@ LfpDisplayOptions::LfpDisplayOptions(LfpDisplayCanvas* canvas_, LfpTimescale* ti
     medianOffsetPlottingButton->setToggleState(false, sendNotification);
     addAndMakeVisible(medianOffsetPlottingButton);
 
-    
+	//init channel name toggle
+	showChannelNumberLabel = new Label("showcChannelLabel", "Show channel number instead of name");
+	showChannelNumberLabel->setFont(labelFont);
+	showChannelNumberLabel->setColour(Label::textColourId, labelColour);
+	addAndMakeVisible(showChannelNumberLabel);
+
+	showChannelNumberButton = new UtilityButton("0", labelFont);
+	showChannelNumberButton->setRadius(5.0f);
+	showChannelNumberButton->setEnabledState(true);
+	showChannelNumberButton->setCorners(true, true, true, true);
+	showChannelNumberButton->addListener(this);
+	showChannelNumberButton->setClickingTogglesState(true);
+	showChannelNumberButton->setToggleState(false, sendNotification);
+	addAndMakeVisible(showChannelNumberButton);
+
 
     // init show/hide options button
     showHideOptionsButton = new ShowHideOptionsButton(this);
@@ -1153,7 +1165,7 @@ LfpDisplayOptions::LfpDisplayOptions(LfpDisplayCanvas* canvas_, LfpTimescale* ti
         EventDisplayInterface* eventOptions = new EventDisplayInterface(lfpDisplay, canvas, i);
         eventDisplayInterfaces.add(eventOptions);
         addAndMakeVisible(eventOptions);
-        eventOptions->setBounds(500+(floor(i/2)*20), getHeight()-20-(i%2)*20, 40, 20);
+        eventOptions->setBounds(700+(floor(i/2)*20), getHeight()-20-(i%2)*20, 40, 20);
 
         lfpDisplay->setEventDisplayState(i,true);
 
@@ -1223,6 +1235,15 @@ void LfpDisplayOptions::resized()
                                          150,
                                          22);
 
+	//Channel name toggle
+	showChannelNumberButton->setBounds(medianOffsetPlottingLabel->getRight() + 5,
+		medianOffsetPlottingLabel->getY(),
+		20,
+		20);
+	showChannelNumberLabel->setBounds(showChannelNumberButton->getRight(),
+		showChannelNumberButton->getY(),
+		200,
+		22);
 
     // Spike raster plotting button
     spikeRasterSelection->setBounds(medianOffsetPlottingButton->getX(),
@@ -1334,6 +1355,11 @@ bool LfpDisplayOptions::getInputInvertedState()
     return invertInputButton->getToggleState();
 }
 
+bool LfpDisplayOptions::getChannelNameState()
+{
+	return showChannelNumberButton->getToggleState();
+}
+
 bool LfpDisplayOptions::getDisplaySpikeRasterizerState()
 {
 //    return spikeRasterButton->getToggleState();
@@ -1446,6 +1472,16 @@ void LfpDisplayOptions::buttonClicked(Button* b)
         canvas->toggleOptionsDrawer(b->getToggleState());
     }
 
+	if (b == showChannelNumberButton)
+	{
+		int numChannels = lfpDisplay->channelInfo.size();
+		for (int i = 0; i < numChannels; ++i)
+		{
+			lfpDisplay->channelInfo[i]->repaint();
+		}
+		return;
+	}
+
     int idx = typeButtons.indexOf((UtilityButton*)b);
 
     if ((idx >= 0) && (b->getToggleState()))
@@ -3078,6 +3114,7 @@ LfpChannelDisplay::LfpChannelDisplay(LfpDisplayCanvas* c, LfpDisplay* d, LfpDisp
     , options(o)
     , isSelected(false)
     , chan(channelNumber)
+    , name("")
     , drawableChan(channelNumber)
     , channelOverlap(300)
     , channelHeight(30)
@@ -3513,6 +3550,11 @@ int LfpChannelDisplay::getChannelNumber()
     return chan;
 }
 
+String LfpChannelDisplay::getName()
+{
+    return name;
+}
+
 int LfpChannelDisplay::getDrawableChannelNumber()
 {
     return drawableChan;
@@ -3569,7 +3611,7 @@ LfpChannelDisplayInfo::LfpChannelDisplayInfo(LfpDisplayCanvas* canvas_, LfpDispl
     y = -1.0f;
 
 //    enableButton = new UtilityButton(String(ch+1), Font("Small Text", 13, Font::plain));
-    enableButton = new UtilityButton("*", Font("Small Text", 13, Font::plain));
+    enableButton = new UtilityButton("", Font("Small Text", 13, Font::plain));
     enableButton->setRadius(5.0f);
 
     enableButton->setEnabledState(true);
@@ -3728,25 +3770,20 @@ void LfpChannelDisplayInfo::paint(Graphics& g)
 {
 
     int center = getHeight()/2 - (isSingleChannel?(75):(0));
+	const bool showChannelNumbers = options->getChannelNameState();
 
-//    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);
-    
     // Draw the channel numbers
     g.setColour(Colours::grey);
-    const String channelString = (isChannelNumberHidden() ? ("--") : String(getChannelNumber() + 1));
+    const String channelString = (isChannelNumberHidden() ? ("--") :
+		showChannelNumbers ? String(getChannelNumber() + 1) : getName());
     bool isCentered = !getEnabledButtonVisibility();
 
     g.drawText(channelString,
-               2,
+               showChannelNumbers ? 6 : 2,
                center-4,
-               isCentered ? (getWidth()/2-4) : (getWidth()/4),
+               getWidth()/2,
                10,
-               isCentered ? Justification::centred : Justification::centredRight,
+               isCentered ? Justification::centred : Justification::centredLeft,
                false);
 
     g.setColour(lineColour);
@@ -3797,17 +3834,11 @@ void LfpChannelDisplayInfo::resized()
 {
 
     int center = getHeight()/2 - (isSingleChannel?(75):(0));
-
-    //if (chan > 98)
-    //  enableButton->setBounds(8,center-5,45,16);
-    //else
-//    enableButton->setBounds(8,center-5,35,16);
-    
     setEnabledButtonVisibility(getHeight() >= 16);
 
     if (getEnabledButtonVisibility())
     {
-        enableButton->setBounds(getWidth()/4 + 5, (center) - 7, 15, 15);
+        enableButton->setBounds(getWidth()/2 - 10, center - 5, 10, 10);
     }
 
     setChannelNumberIsHidden(getHeight() < 16 && (getDrawableChannelNumber() + 1) % 10 != 0);

Plugins/LfpDisplayNode/LfpDisplayCanvas.h

@@ -148,7 +148,7 @@ class LfpDisplayCanvas : public Visualizer,
     //void scrollBarMoved(ScrollBar *scrollBarThatHasMoved, double newRangeStart);
 
     bool fullredraw; // used to indicate that a full redraw is required. is set false after each full redraw, there is a similar switch for each display;
-    static const int leftmargin=50; // left margin for lfp plots (so the ch number text doesnt overlap)
+    static const int leftmargin = 50; // left margin for lfp plots (so the ch number text doesnt overlap)
 
     Array<bool> isChannelEnabled;
 
@@ -276,6 +276,7 @@ class LfpDisplayOptions : public Component,
     int getChannelHeight();
     bool getDrawMethodState();
     bool getInputInvertedState();
+	bool getChannelNameState();
 
     /** Return a bool describing whether the spike raster functionality is enabled */
     bool getDisplaySpikeRasterizerState();
@@ -376,6 +377,10 @@ class LfpDisplayOptions : public Component,
     // label and toggle button for the median offset plotting feature
     ScopedPointer<Label> medianOffsetPlottingLabel;
     ScopedPointer<UtilityButton> medianOffsetPlottingButton;
+
+	// label and toggle button for channel numbering
+	ScopedPointer<Label> showChannelNumberLabel;
+	ScopedPointer<UtilityButton> showChannelNumberButton;
 
     // label and combobox for color scheme options
     ScopedPointer<Label> colourSchemeOptionLabel;
@@ -694,9 +699,12 @@ class LfpChannelDisplay : public Component
     void setChannelOverlap(int);
     int getChannelOverlap();
 
-    /** Return the assigned channel number for this display */
+    /** Return the assigned channel number */
     int getChannelNumber();
 
+    /** Return the assigned channel name */
+    String getName();
+
     /** Returns the assigned channel number for this display, relative
         to the subset of channels being drawn to the canvas */
     int getDrawableChannelNumber();