Moved the two barcharts to empty Overview page

Graphs/gBarChart.cpp

@@ -152,7 +152,7 @@ void gBarChart::paint(gGraph & w,int left, int top, int width, int height)
     }
     if (total_days>0) {
         float val=total_val/float(total_days);
-        QString z=m_label+"="+QString::number(val,'f',2)+" days="+QString::number(total_days,'f',0)+" This will go in overview";
+        QString z=m_label+"="+QString::number(val,'f',2)+" days="+QString::number(total_days,'f',0);
         w.renderText(z,left,top-1);
         // val = AHI for selected area.
     }

Graphs/gGraphView.h

@@ -326,7 +326,7 @@ public:
     void setScrollBar(MyScrollBar *sb);
     MyScrollBar * scrollBar() { return m_scrollbar; }
     static const int titleWidth=30;
-    static const int graphSpacer=3;
+    static const int graphSpacer=4;
 
     float findTop(gGraph * graph);
 

daily.cpp

@@ -83,8 +83,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
 
     SF->AddLayer(AddCPAP(seg),LayerRight,100); */
 
-    BC=new gGraph(GraphView,"AHI Chart",default_height,2);
-    UC=new gGraph(GraphView,"Usage Chart",default_height,2);
     SF=new gGraph(GraphView,"Event Flags",default_height);
     FRW=new gGraph(GraphView,"Flow Rate",default_height);
     MP=new gGraph(GraphView,"Mask Pressure",default_height);
@@ -106,29 +104,6 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw)
     SPO2=new gGraph(GraphView,"SPO2",default_height,1);
     PLETHY=new gGraph(GraphView,"Plethy",default_height,1);
 
-    uc=new UsageChart(profile);
-    UC->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
-    gXAxis *gx=new gXAxis();
-    gx->setUtcFix(true);
-    UC->AddLayer(gx,LayerBottom,0,gXAxis::Margin);
-    UC->AddLayer(uc);
-    UC->AddLayer(new gXGrid());
-
-
-    bc=new AHIChart(profile);
-    //bc->setProfile(profile);
-    bc->addSlice(CPAP_Hypopnea,QColor("blue"));
-    bc->addSlice(CPAP_Apnea,QColor("dark green"));
-    bc->addSlice(CPAP_Obstructive,QColor("#40c0ff"));
-    bc->addSlice(CPAP_ClearAirway,QColor("purple"));
-    BC->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
-    gx=new gXAxis();
-    gx->setUtcFix(true);
-    BC->AddLayer(gx,LayerBottom,0,gXAxis::Margin);
-    BC->AddLayer(bc);
-    BC->AddLayer(new gXGrid());
-
-
     gFlagsGroup *fg=new gFlagsGroup();
     fg->AddLayer((new gFlagsLine(CPAP_CSR,QColor("light green"),"CSR",false,FT_Span)));
     fg->AddLayer((new gFlagsLine(CPAP_ClearAirway,QColor("purple"),"CA",true)));
@@ -780,13 +755,6 @@ void Daily::Load(QDate date)
     UpdateCPAPGraphs(cpap);
     UpdateEventsTree(ui->treeWidget,cpap);
 
-    bc->SetDay(NULL);
-    BC->MinX();
-    BC->MaxX();
-
-    uc->SetDay(NULL);
-    UC->MinX();
-    UC->MaxX();
 
     GraphView->ResetBounds();
     //GraphView->ResetBounds(1);

mainwindow.cpp

@@ -149,10 +149,10 @@ MainWindow::~MainWindow()
         daily->close();
         delete daily;
     }
-    /*if (overview) {
+    if (overview) {
         overview->close();
         delete overview;
-    } */
+    }
     if (oximetry) {
         oximetry->close();
         delete oximetry;
@@ -176,8 +176,8 @@ void MainWindow::Startup()
     daily=new Daily(ui->tabWidget,NULL,this);
     ui->tabWidget->insertTab(1,daily,tr("Daily"));
 
-    //overview=new Overview(ui->tabWidget,daily->SharedWidget());
-    //ui->tabWidget->insertTab(2,overview,tr("Overview"));
+    overview=new Overview(ui->tabWidget,daily->SharedWidget());
+    ui->tabWidget->insertTab(2,overview,tr("Overview"));
     //oximetry=NULL;
     //overview=NULL;
     oximetry=new Oximetry(ui->tabWidget,daily->SharedWidget());

mainwindow.h

@@ -92,7 +92,7 @@ private slots:
 private:
     Ui::MainWindow *ui;
     Daily * daily;
-    //Overview * overview;
+    Overview * overview;
     Oximetry * oximetry;
     bool first_load;
     Profile *profile;

overview.cpp

@@ -10,18 +10,92 @@
 #include <QDebug>
 #include "overview.h"
 #include "ui_overview.h"
-#include "Graphs/graphdata_custom.h"
 #include "Graphs/gXAxis.h"
-#include "Graphs/gBarChart.h"
 #include "Graphs/gLineChart.h"
 #include "Graphs/gYAxis.h"
-#include "Graphs/gFooBar.h"
-#include "Graphs/gSessionTime.h"
 
-/*Overview::Overview(QWidget *parent,QGLWidget * shared) :
+Overview::Overview(QWidget *parent,gGraphView * shared) :
     QWidget(parent),
     ui(new Ui::Overview)
 {
+    m_shared=shared;
+    ui->setupUi(this);
+
+    QString prof=pref["Profile"].toString();
+    profile=Profiles::Get(prof);
+    if (!profile) {
+        qWarning("Couldn't get profile.. Have to abort!");
+        exit(-1);
+    }
+
+    // Create dummy day & session for holding eventlists.
+    //day=new Day(mach);
+
+    layout=new QHBoxLayout(ui->graphArea);
+    layout->setSpacing(0);
+    layout->setMargin(0);
+    layout->setContentsMargins(0,0,0,0);
+    ui->graphArea->setLayout(layout);
+    ui->graphArea->setAutoFillBackground(false);
+
+    GraphView=new gGraphView(ui->graphArea,m_shared);
+    GraphView->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding);
+
+    scrollbar=new MyScrollBar(ui->graphArea);
+    scrollbar->setOrientation(Qt::Vertical);
+    scrollbar->setSizePolicy(QSizePolicy::Maximum,QSizePolicy::Expanding);
+    scrollbar->setMaximumWidth(20);
+
+    GraphView->setScrollBar(scrollbar);
+    layout->addWidget(GraphView,1);
+    layout->addWidget(scrollbar,0);
+
+    layout->layout();
+
+    const int default_height=180;
+    AHI=new gGraph(GraphView,"AHI Chart",default_height,2);
+    UC=new gGraph(GraphView,"Usage Chart",default_height,2);
+    Layer *uc=new UsageChart(profile);
+    UC->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
+    gXAxis *gx=new gXAxis();
+    gx->setUtcFix(true);
+    UC->AddLayer(gx,LayerBottom,0,gXAxis::Margin);
+    UC->AddLayer(uc);
+    UC->AddLayer(new gXGrid());
+
+
+    bc=new AHIChart(profile);
+    //bc->setProfile(profile);
+    bc->addSlice(CPAP_Hypopnea,QColor("blue"));
+    bc->addSlice(CPAP_Apnea,QColor("dark green"));
+    bc->addSlice(CPAP_Obstructive,QColor("#40c0ff"));
+    bc->addSlice(CPAP_ClearAirway,QColor("purple"));
+    AHI->AddLayer(new gYAxis(),LayerLeft,gYAxis::Margin);
+    gx=new gXAxis();
+    gx->setUtcFix(true);
+    AHI->AddLayer(gx,LayerBottom,0,gXAxis::Margin);
+    AHI->AddLayer(bc);
+    AHI->AddLayer(new gXGrid());
+
+
+    bc->SetDay(NULL);
+    AHI->MinX();
+    AHI->MaxX();
+
+    uc->SetDay(NULL);
+    UC->MinX();
+    UC->MaxX();
+
+    GraphView->ResetBounds();
+
+}
+Overview::~Overview()
+{
+    //delete day;
+    delete ui;
+}
+
+    /*
     ui->setupUi(this);
     profile=Profiles::Get(pref["Profile"].toString());
     AddData(ahidata=new HistoryData(profile));
@@ -119,11 +193,6 @@
     ReloadGraphs();
 }
 
-Overview::~Overview()
-{
-    delete dummyday;
-    delete ui;
-}
 void Overview::RedrawGraphs()
 {
     for (QList<gGraphWindow *>::iterator g=Graphs.begin();g!=Graphs.end();g++) {

overview.h

@@ -7,12 +7,13 @@
 #ifndef OVERVIEW_H
 #define OVERVIEW_H
 
-/*#include <QWidget>
+#include <QWidget>
 #include <QGLContext>
-#include <QSplitter>
-#include <QLabel>
-#include <SleepLib/profiles.h>
-#include <Graphs/graphdata_custom.h>
+#include <QHBoxLayout>
+
+#include "SleepLib/profiles.h"
+#include "Graphs/gGraphView.h"
+#include "Graphs/gBarChart.h"
 
 namespace Ui {
     class Overview;
@@ -23,43 +24,42 @@ class Overview : public QWidget
     Q_OBJECT
 
 public:
-    explicit Overview(QWidget *parent,QGLWidget *shared=NULL);
+    explicit Overview(QWidget *parent,gGraphView *shared=NULL);
     ~Overview();
 
-    void ReloadGraphs();
-    void UpdateGraphs();
+    //void ReloadGraphs();
+    //void UpdateGraphs();
 
 
 private slots:
-    void on_drStart_dateChanged(const QDate &date);
+/*    void on_drStart_dateChanged(const QDate &date);
     void on_drEnd_dateChanged(const QDate &date);
     void on_rbDateRange_toggled(bool checked);
     void on_rbLastWeek_clicked();
     void on_rbLastMonth_clicked();
     void on_rbEverything_clicked();
-    void on_rbDateRange_clicked();
+    void on_rbDateRange_clicked(); */
 
 private:
     Ui::Overview *ui;
     Profile *profile;
+    gGraphView *GraphView;
+    MyScrollBar *scrollbar;
+    QHBoxLayout *layout;
+    gGraphView * m_shared;
 
-    void AddData(HistoryData *d) { Data.push_back(d);  };
-    void AddGraph(gGraphWindow *w) { Graphs.push_back(w); };
-    void RedrawGraphs();
     void UpdateHTML();
 
-    HistoryData *ahidata,*pressure,*leak,*usage,*bedtime,*waketime,*pressure_iap,*pressure_eap;
-    HistoryData *pressure_min,*pressure_max;
-    SessionTimes *session_times;
-    gGraphWindow *AHI,*PRESSURE,*LEAK,*USAGE,*SESSTIMES;
+    //SessionTimes *session_times;
+    gGraph *AHI,*UC;
+    AHIChart *bc;
+    UsageChart *uc;
+    //,*PRESSURE,*LEAK,*SESSTIMES;
 
-    gLayer *prmax,*prmin,*iap,*eap,*pr,*sesstime;
+    //Layer *prmax,*prmin,*iap,*eap,*pr,*sesstime;
+
+    Day * day;// dummy in this case
 
-    QList<HistoryData *> Data;
-    QList<gGraphWindow *> Graphs;
-    Day *dummyday;
-    QSplitter *gSplitter;
-    QLabel *NoData;
 };
-*/
+
 #endif // OVERVIEW_H

overview.ui

@@ -33,7 +33,7 @@
      <widget class="QTabWidget" name="tabWidget">
       <property name="maximumSize">
        <size>
-        <width>250</width>
+        <width>200</width>
         <height>16777215</height>
        </size>
       </property>
@@ -57,23 +57,15 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="QWebView" name="webView">
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>0</height>
-             </size>
+           <widget class="QLabel" name="label">
+            <property name="text">
+             <string>Not sure if we even need this. Try shrinking it and see how it looks.</string>
             </property>
-            <property name="maximumSize">
-             <size>
-              <width>16777215</width>
-              <height>16777215</height>
-             </size>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
             </property>
-            <property name="url">
-             <url>
-              <string>about:blank</string>
-             </url>
+            <property name="wordWrap">
+             <bool>true</bool>
             </property>
            </widget>
           </item>
@@ -85,171 +77,7 @@
      <widget class="QWidget" name="layoutWidget">
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="0">
-        <widget class="QScrollArea" name="scrollArea_2">
-         <property name="widgetResizable">
-          <bool>true</bool>
-         </property>
-         <widget class="QWidget" name="SummaryGraphWindow">
-          <property name="geometry">
-           <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>458</width>
-            <height>282</height>
-           </rect>
-          </property>
-          <layout class="QVBoxLayout" name="verticalLayout_4">
-           <property name="spacing">
-            <number>0</number>
-           </property>
-           <property name="margin">
-            <number>0</number>
-           </property>
-           <item>
-            <layout class="QVBoxLayout" name="graphLayout">
-             <property name="spacing">
-              <number>0</number>
-             </property>
-            </layout>
-           </item>
-          </layout>
-         </widget>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QFrame" name="frame">
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>40</height>
-          </size>
-         </property>
-         <property name="frameShape">
-          <enum>QFrame::StyledPanel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Raised</enum>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <property name="margin">
-           <number>0</number>
-          </property>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout">
-            <item>
-             <widget class="QRadioButton" name="rbDateRange">
-              <property name="text">
-               <string>Date Range</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="rbLastWeek">
-              <property name="text">
-               <string>Last Week</string>
-              </property>
-              <property name="checked">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="rbLastMonth">
-              <property name="text">
-               <string>Last Month</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QRadioButton" name="rbEverything">
-              <property name="text">
-               <string>Everything</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>277</width>
-                <height>23</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-          <item>
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <property name="leftMargin">
-             <number>4</number>
-            </property>
-            <item>
-             <widget class="QLabel" name="drStartLabel">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="text">
-               <string>Start</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QDateEdit" name="drStart">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="locale">
-               <locale language="C" country="AnyCountry"/>
-              </property>
-              <property name="calendarPopup">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="drEndLabel">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="text">
-               <string>End</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QDateEdit" name="drEnd">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="locale">
-               <locale language="C" country="AnyCountry"/>
-              </property>
-              <property name="calendarPopup">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_2">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
+        <widget class="QWidget" name="graphArea" native="true"/>
        </item>
       </layout>
      </widget>
@@ -257,13 +85,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>QWebView</class>
-   <extends>QWidget</extends>
-   <header>QtWebKit/QWebView</header>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>