Fix YAxis scaling stuff for new right click menu

sleepyhead/Graphs/gGraph.cpp

@@ -508,44 +508,25 @@ void gGraph::ToolTip(QString text, int x, int y, ToolTipAlignment align, int tim
 // YAxis Autoscaling code
 void gGraph::roundY(EventDataType &miny, EventDataType &maxy)
 {
-    if ((zoomY() == 0) && p_profile->appearance->allowYAxisScaling()) {
-        if (rec_maxy > rec_miny) {
-            // Use graph preference settings only for this graph
-            miny = rec_miny;
-            maxy = rec_maxy;
-            return;
-        } // else use loader defined min/max settings
 
+    if (zoomY() == 0) {
+        // AutoScale mode
+        miny = rmin_y; // MinY();
+        maxy = rmax_y; //MaxY();
+        // fall through.
+    } else if (zoomY() == 1) {
+        miny = rphysmin_y; //physMinY()
+        maxy = rphysmax_y; //physMaxY();
+        return;
     } else {
-        // Autoscale this graph
+        miny = rec_miny;
-        miny = min_y, maxy = max_y;
+        maxy = rec_maxy;
+        return;
     }
 
     int m, t;
     bool ymin_good = false, ymax_good = false;
 
-    // rec_miny/maxy are the graph settings defined in preferences
-    if (rec_miny != rec_maxy) {
-        // Clip min
-        if (miny > rec_miny) {
-            miny = rec_miny;
-        }
-
-        // Clip max
-        if (maxy < rec_maxy) {
-            maxy = rec_maxy;
-        }
-
-        //
-        if (miny == rec_miny) {
-            ymin_good = true;
-        }
-
-        if (maxy == rec_maxy) {
-            ymax_good = true;
-        }
-    }
-
     // Have no minx/miny reference, have to create one
     if (maxy == miny) {
         m = ceil(maxy / 2.0);
@@ -1220,7 +1201,7 @@ EventDataType gGraph::MinY()
     }
 
     for (QVector<Layer *>::iterator l = m_layers.begin(); l != m_layers.end(); l++) {
-        if ((*l)->isEmpty()) {
+        if ((*l)->isEmpty() || ((*l)->layerType() == LT_Other)) {
             continue;
         }
 
@@ -1254,7 +1235,7 @@ EventDataType gGraph::MaxY()
     QVector<Layer *>::const_iterator iterEnd = m_layers.constEnd();
     for (QVector<Layer *>::const_iterator iter = m_layers.constBegin(); iter != iterEnd; ++iter) {
         Layer *layer = *iter;
-        if (layer->isEmpty()) {
+        if (layer->isEmpty() || (layer->layerType() == LT_Other)) {
             continue;
         }
 

sleepyhead/Graphs/gGraph.h

@@ -297,7 +297,7 @@ class gGraph : public QObject
     gGraphView *graphView() { return m_graphview; }
     short m_marginleft, m_marginright, m_margintop, m_marginbottom;
 
-    short zoomY() { return m_zoomY; }
+    inline short zoomY() { return m_zoomY; }
     void setZoomY(short zoom);
 
     static const short maxZoomY = 2;

sleepyhead/Graphs/gGraphView.cpp

@@ -372,6 +372,8 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
     lines_menu = context_menu->addMenu(tr("Dotted Lines"));
     connect(lines_menu, SIGNAL(triggered(QAction*)), this, SLOT(onLinesClicked(QAction*)));
 
+
+#if !defined(Q_OS_MAC)
     context_menu->setStyleSheet("QMenu {\
                               background-color: #f0f0f0; /* sets background of the menu */\
                               border: 1px solid black;\
@@ -385,7 +387,11 @@ gGraphView::gGraphView(QWidget *parent, gGraphView *shared)
                               background-color: #ABCDEF;\
                           }");
 
-
+#else
+    context_menu->setStyleSheet("QMenu::item:selected { /* when user selects item using mouse or keyboard */\
+                                    background-color: #ABCDEF;\
+                                }");
+#endif
 }
 
 void gGraphView::togglePin()
@@ -1694,48 +1700,38 @@ void MinMaxWidget::onMaxChanged(double d)
     graph->rec_maxy = d;
     graph->timedRedraw(0);
 }
-//void MinMaxWidget::onCheckToggled(bool b)
+void MinMaxWidget::onResetClicked()
-//{
+{
-//    graph->setZoomY(b ? 1 : 0);
+    EventDataType miny = graph->MinY(),
-//}
+                  maxy = graph->MaxY();
+
+    graph->roundY(miny, maxy);
+    setMin(graph->rec_miny = miny);
+    setMax(graph->rec_maxy = maxy);
+}
 
 void MinMaxWidget::onComboChanged(int idx)
 {
     minbox->setEnabled(idx == 2);
     maxbox->setEnabled(idx == 2);
+    reset->setEnabled(idx == 2);
 
     graph->setZoomY(idx);
 
     if (idx == 2) {
-        if (qAbs(graph->rec_maxy - graph->rec_miny) < 0.000001) {
+        if (qAbs(graph->rec_maxy - graph->rec_miny) < 0.0001) {
-            setMax(graph->rec_maxy = floor(graph->MaxY()));
+            onResetClicked();
-            setMin(graph->rec_miny = ceil(graph->MinY()));
-
         }
     }
 }
 
-#include <QFrame>
 void MinMaxWidget::createLayout()
 {
 
-//    QHBoxLayout * lay1 = new QHBoxLayout;
-//    setLayout(lay1);
-//    QFrame *frame = new QFrame(this);
-//    frame->setFrameShape(QFrame::Box);
-//    lay1->addWidget(frame);
-//    lay1->setMargin(2);
-//    lay1->setSpacing(0);
 
     QGridLayout * layout = new QGridLayout;
-//    frame->setLayout(layout);
-//    layout->set
-//    QHBoxLayout *layout = new QHBoxLayout;
     layout->setMargin(4);
     layout->setSpacing(4);
-//    checkbox = new QCheckBox(tr("Auto Scale")+" ",this);
-//    checkbox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
-//    connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(onCheckToggled(bool)));
 
     combobox = new QComboBox(this);
     combobox->addItem(tr("Auto-Fit"), 0);
@@ -1752,15 +1748,15 @@ void MinMaxWidget::createLayout()
     minbox->setEnabled(idx == 2);
     maxbox->setEnabled(idx == 2);
 
-    setMin(graph->rec_miny);
-    setMax(graph->rec_maxy);
     minbox->setAlignment(Qt::AlignRight);
     maxbox->setAlignment(Qt::AlignRight);
 
-    minbox->setMinimum(graph->physMinY());
+    minbox->setMinimum(-9999.0);
-    maxbox->setMinimum(graph->physMinY());
+    maxbox->setMinimum(-9999.0);
     minbox->setMaximum(9999.99);
     maxbox->setMaximum(9999.99);
+    setMin(graph->rec_miny);
+    setMax(graph->rec_maxy);
     connect(minbox, SIGNAL(valueChanged(double)), this, SLOT(onMinChanged(double)));
     connect(maxbox, SIGNAL(valueChanged(double)), this, SLOT(onMaxChanged(double)));
 
@@ -1783,6 +1779,13 @@ void MinMaxWidget::createLayout()
     label->setAlignment(Qt::AlignCenter);
     layout->addWidget(label,0,2);
     layout->addWidget(maxbox,1,2);
+
+    reset = new QToolButton(this);
+    reset->setIcon(QIcon(":/icons/refresh.png"));
+    reset->setEnabled(idx == 2);
+
+    layout->addWidget(reset,1,3);
+    connect(reset, SIGNAL(clicked()), this, SLOT(onResetClicked()));
     this->setLayout(layout);
 }
 

sleepyhead/Graphs/gGraphView.h

@@ -22,6 +22,7 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QDoubleSpinBox>
+#include <QToolButton>
 
 #ifndef BROKEN_OPENGL_BUILD
 #include <QGLWidget>
@@ -59,13 +60,14 @@ public slots:
     void onMinChanged(double d);
     void onMaxChanged(double d);
     void onComboChanged(int idx);
-    //void onCheckToggled(bool b);
+    void onResetClicked();
 protected:
     gGraph * graph;
     QComboBox *combobox;
 //    QCheckBox *checkbox;
     QDoubleSpinBox *minbox;
     QDoubleSpinBox *maxbox;
+    QToolButton * reset;
 };
 
 enum FlagType { FT_Bar, FT_Dot, FT_Span };