fix gGraph calcultion to minimum layer height requirements. Moved minimum size for Event Flags to corresponding layer.

oscar/Graphs/gFlagsLine.cpp

@@ -9,6 +9,8 @@
 
 #define TEST_MACROS_ENABLEDoff
 #include <test_macros.h>
+#define BAR_TITLE_BAR_DEBUGoff
+
 
 #include <cmath>
 #include <QVector>
@@ -134,6 +136,19 @@ bool gFlagsGroup::isEmpty()
     return true;
 }
 
+void gFlagsGroup::refreshConfiguration(gGraph* graph)
+{
+   int numOn=0;
+    for (const auto & flagsline : lvisible) {
+        if (schema::channel[flagsline->code()].enabled()) numOn++;
+    }
+    if (numOn==0) numOn=1;  // always have an area showing in graph.
+    float barHeight = QFontMetrics(*defaultfont).capHeight() + QFontMetrics(*defaultfont).descent() ;
+    int height (barHeight * numOn);
+    setMinimumHeight (height);
+    graph->setHeight (height);
+}
+
 void gFlagsGroup::paint(QPainter &painter, gGraph &g, const QRegion &region)
 {
     QRectF outline(region.boundingRect());

oscar/Graphs/gFlagsLine.h

@@ -115,6 +115,7 @@ class gFlagsGroup: public LayerGroup
     QVector<gFlagsLine *> &visibleLayers() { return lvisible; }
 
     void alwaysVisible(ChannelID code) { m_alwaysvisible.push_back(code); }
+    void refreshConfiguration(gGraph* graph) ;
 
     virtual Layer * Clone() {
         gFlagsGroup * layer = new gFlagsGroup();  //ouchie..
@@ -144,6 +145,7 @@ class gFlagsGroup: public LayerGroup
     QList<ChannelID> availableChans;
 
     QVector<gFlagsLine *> lvisible;
+    QVector<gFlagsLine *> visflags;
     float m_barh;
     bool m_empty;
     bool m_rebuild_cpap;

oscar/Graphs/gGraph.cpp

@@ -202,7 +202,8 @@ gGraph::gGraph(QString name, gGraphView *graphview, QString title, QString units
         qDebug() << "Trying to duplicate " << name << " when a graph with the same name already exists";
         name+="-1";
     }
-    m_min_height = 60;
+    m_min_height = 60;      // this is the graphs minimum height.- does not consider the graphs layer height requirements. 
+    m_defaultLayerMinHeight = 25;   // this is the minimum requirements for the layer height. can be chnaged by a layer. // not changable
     m_width = 0;
 
     m_layers.clear();
@@ -1531,24 +1532,14 @@ Layer *gGraph::getLineChart()
 
 int gGraph::minHeight()
 {
-    int minheight = m_min_height;
+    // adjust graph height for centerLayer (ploting area) required height.
-
+    int adjustment  = top + bottom;    //adjust graph minimun to layer minimum
+    int minlayerheight = m_min_height  - adjustment;
     for (const auto & layer : m_layers) {
-        // caution.
+        if (layer->position() != LayerCenter) continue;
-        // The logical around this area of code does not work.
+        minlayerheight = max(max (m_defaultLayerMinHeight,layer->minimumHeight()),minlayerheight);
-        // This assumes that one layer has the total height for the graph.
-        // this is not the case.
-        // for exaple the xaxis layer contains part of the total height
-        // and so does the graph area.
-        // what about the top margin for text .
-        // There are some layers that do not contribute to the minimum height.
-
-        int mh = layer->minimumHeight();
-        mh += m_margintop + m_marginbottom;
-        if (mh > minheight) minheight = mh;
     }
-    // layers need to set their own too..
+    return minlayerheight + adjustment; // adjust layer min to graph minimum
-    return minheight;
 }
 
 int GetXHeight(QFont *font)

oscar/Graphs/gGraph.h

@@ -404,6 +404,7 @@ class gGraph : public QObject
     ZoomyScaling m_zoomY;
     bool m_block_select;
     QRect m_rect;
+    int m_defaultLayerMinHeight;
 
     qint64 m_selectedDuration;
 

oscar/Graphs/layer.h

@@ -81,7 +81,10 @@ class Layer
     virtual void deselect() { }
 
     //! \brief Override to set the minimum allowed height for this layer
-    virtual int minimumHeight() { return 0; }
+    virtual void setMinimumHeight(int height) { m_minimumHeight=height; }
+
+    //! \brief Override to set the minimum allowed height for this layer
+    virtual int minimumHeight() { return  m_minimumHeight; }
 
     //! \brief Override to set the minimum allowed width for this layer
     virtual int minimumWidth() { return 0; }
@@ -188,6 +191,7 @@ class Layer
     bool m_mouseover;
     volatile bool m_recalculating;
     LayerType m_layertype;
+    int  m_minimumHeight=0;
 public:
 
 //    //! \brief A vector containing all this layers custom drawing buffers

oscar/daily.cpp

@@ -316,14 +316,12 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
 
     // Add event flags to the event flags graph
     gFlagsGroup *fg=new gFlagsGroup();
+    sleepFlagsGroup = fg;
     SF->AddLayer(fg);
 
     SF->setBlockZoom(true);
     SF->AddLayer(new gShadowArea());
-
     SF->AddLayer(new gLabelArea(fg),LayerLeft,gYAxis::Margin);
-
-    //SF->AddLayer(new gFooBar(),LayerBottom,0,1);
     SF->AddLayer(new gXAxis(COLOR_Text,false),LayerBottom,0,gXAxis::Margin);
 
 
@@ -333,7 +331,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     QStringList skipgraph;
     skipgraph.push_back(STR_GRAPH_EventBreakdown);
     skipgraph.push_back(STR_GRAPH_SleepFlags);
-//    skipgraph.push_back(STR_GRAPH_DailySummary);
     skipgraph.push_back(STR_GRAPH_TAP);
 
     QHash<QString, gGraph *>::iterator it;
@@ -348,8 +345,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared)
     l=new gLineChart(CPAP_FlowRate,false,false);
 
     gGraph *FRW = graphlist[schema::channel[CPAP_FlowRate].code()];
-
-    // Then the graph itself
     FRW->AddLayer(l);
 
 
@@ -2677,20 +2672,7 @@ void Daily::setFlagText () {
     }
 
     ui->eventsCombo->setItemText(0, flagsText);
-    if (numOn==0) numOn=1;  // always have an area showing in graph.
+    sleepFlagsGroup->refreshConfiguration(sleepFlags); // need to know display changes before painting.
-    float barHeight = QFontMetrics(*defaultfont).capHeight() + QFontMetrics(*defaultfont).descent() ;
-    float fontHeight = QFontMetrics(*defaultfont).height() ;
-
-    float flagGroupHeight = barHeight * numOn;      // space for graphs
-    // account for ispace above and below events bars
-    flagGroupHeight += fontHeight *2 ; // for axis font Height & vertical markers
-    flagGroupHeight += fontHeight  ; // top margin
-    flagGroupHeight += 4  ; // padding
-
-    DEBUGFW Q(sleepFlags->name()) Q(sleepFlags->title()) Q(flagGroupHeight) Q(barHeight) Q(numOn) Q(numOff);
-    sleepFlags->setMinHeight(flagGroupHeight);      // set minimum height so height is enforced.
-    sleepFlags->setHeight(flagGroupHeight);         // set height so height is adjusted when eventtypes are removed from display
-
 }
 
 void Daily::showAllGraphs(bool show) {

oscar/daily.h

@@ -37,6 +37,7 @@ namespace Ui {
 
 class MainWindow;
 class DailySearchTab;
+class gFlagsGroup;
 
 
 /*! \class Daily
@@ -351,6 +352,7 @@ private:
 
     gGraphView *GraphView,*snapGV;
     gGraph* sleepFlags;
+    gFlagsGroup* sleepFlagsGroup;
     MyScrollBar *scrollbar;
     QHBoxLayout *layout;
     QLabel *emptyToggleArea;