Fix channel info display for very small channel heights when depth sorting is enabled

Author: anjaldoshi

Plugins/LfpViewer/LfpChannelDisplayInfo.cpp

@@ -46,12 +46,12 @@ constexpr int channelLabelHeight = 12;
 constexpr int channelButtonSize = 10;
 constexpr int singleChannelInfoOffset = 75;
 
-bool shouldDrawDenseChannelLabel (const int channelHeight, const int drawableChannelNumber, bool isSingleChannel)
+bool shouldDrawDenseChannelLabel (const int channelHeight, const int channelIndex, bool isSingleChannel)
 {
     if (isSingleChannel || channelHeight >= 15)
         return true;
 
-    return (drawableChannelNumber + 1) % 10 == 0;
+    return (channelIndex + 1) % 10 == 0;
 }
 
 String getChannelLabelString (LfpChannelDisplay& channel, LfpDisplayOptions::ChannelLabelDisplayMode labelMode)
@@ -233,7 +233,7 @@ void LfpChannelDisplayInfo::paint (Graphics& g)
     {
         auto* channel = display->drawableChannels[i];
         const int center = getTrackCenterY (*channel);
-        const bool drawChannelLabel = shouldDrawDenseChannelLabel (channelHeight, channel->getDrawableChannelNumber(), isSingleChannel);
+        const bool drawChannelLabel = shouldDrawDenseChannelLabel (channelHeight, i, isSingleChannel);
         const bool showTypeString = isSingleChannel || channel->getChannelHeight() > 34;
 
         g.setColour (channel->getRecorded() && recordingIsActive ? Colours::red : Colours::grey);

Plugins/LfpViewer/LfpDisplayCanvas.cpp

@@ -713,7 +713,8 @@ LfpDisplaySplitter::LfpDisplaySplitter (LfpDisplayNode* node,
                                                   screenBufferWidth (0),
                                                   nChans (0),
                                                   selectedStreamId (0),
-                                                  isSelected (false)
+                                                  isSelected (false),
+                                                  hasAnyDepthInfo (false)
 {
     viewport = std::make_unique<LfpViewport> (this);
     lfpDisplay = std::make_unique<LfpDisplay> (this, viewport.get());
@@ -766,9 +767,12 @@ void LfpDisplaySplitter::refreshLeftMargin()
 
         if (options->getChannelLabelDisplayMode() == LfpDisplayOptions::ChannelLabelDisplayMode::Depth)
         {
-            // If displaying depth, we want to ensure enough space for the largest possible depth label
-            const float textWidth = labelFont.getStringWidthFloat ("99999 μm");
-            newMargin = std::max (newMargin, static_cast<int> (std::ceil (textWidth)) + 10);
+            if (hasAnyDepthInfo)
+            {
+                // If displaying depth, we want to ensure enough space for the largest possible depth label
+                const float textWidth = labelFont.getStringWidthFloat ("99999 μm");
+                newMargin = std::max (newMargin, static_cast<int> (std::ceil (textWidth)) + 10);
+            }
         }
         else
         {
@@ -1008,6 +1012,10 @@ void LfpDisplaySplitter::updateSettings()
         lfpDisplay->channels[i]->setName (displayBuffer->channelMetadata[i].name);
         lfpDisplay->channels[i]->setGroup (displayBuffer->channelMetadata[i].group);
         lfpDisplay->channels[i]->setDepth (displayBuffer->channelMetadata[i].ypos);
+        if (displayBuffer->channelMetadata[i].ypos != 0)
+        {
+            hasAnyDepthInfo = true;
+        }
         lfpDisplay->channels[i]->setXpos (displayBuffer->channelMetadata[i].xpos);
         lfpDisplay->channels[i]->setMetadataPresence (displayBuffer->channelMetadata[i].hasGroupMetadata,
                                                       displayBuffer->channelMetadata[i].hasYposMetadata,

Plugins/LfpViewer/LfpDisplayCanvas.h

@@ -399,6 +399,8 @@ class LfpDisplaySplitter : public Component,
 
     int eventState;
 
+    bool hasAnyDepthInfo;
+
     std::unique_ptr<AudioBuffer<float>> eventDisplayBuffer; // buffer for event data
 
     /** Define buffers for min, mean, and max for better plotting of spikes */