From 6b31181103383c600637b52a12ffec262e9ffd10 Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Fri, 11 Oct 2013 03:36:53 +1000 Subject: [PATCH] Added SessionBar for easier CPAP session toggling, directory layout clean --- LICENSE.txt => sleepyhead/LICENSE.txt | 0 Resources.qrc => sleepyhead/Resources.qrc | 0 sleepyhead/daily.cpp | 48 +++++ sleepyhead/daily.h | 5 + sleepyhead/daily.ui | 86 ++++++-- {docs => sleepyhead/docs}/0.0.gif | Bin .../docs}/PRS1 Data Format.odt | Bin {docs => sleepyhead/docs}/changelog.txt | 0 {docs => sleepyhead/docs}/channels.xml | 0 {docs => sleepyhead/docs}/countries.txt | 0 {docs => sleepyhead/docs}/graphs.xml | 0 {docs => sleepyhead/docs}/index.html | 0 {docs => sleepyhead/docs}/release_notes.html | 0 {docs => sleepyhead/docs}/schema.xml | 0 {docs => sleepyhead/docs}/script.js | 0 {docs => sleepyhead/docs}/sheep.png | Bin {docs => sleepyhead/docs}/sheep.svg | 0 {docs => sleepyhead/docs}/sheep2.svg | 0 {docs => sleepyhead/docs}/startup_tips.txt | 0 {docs => sleepyhead/docs}/tooltips.css | 0 {docs => sleepyhead/docs}/tz.txt | 0 {docs => sleepyhead/docs}/update_notes.html | 0 {docs => sleepyhead/docs}/usage.html | 0 {fonts => sleepyhead/fonts}/FreeSans.ttf | Bin .../icons}/Bob Strikes Back.png | Bin {icons => sleepyhead/icons}/README.txt | 0 {icons => sleepyhead/icons}/arrow-end.png | Bin {icons => sleepyhead/icons}/arrow-left.png | Bin {icons => sleepyhead/icons}/arrow-right.png | Bin {icons => sleepyhead/icons}/back.png | Bin {icons => sleepyhead/icons}/bob-v3.0.png | Bin {icons => sleepyhead/icons}/bookmark.png | Bin {icons => sleepyhead/icons}/brick.png | Bin {icons => sleepyhead/icons}/cubeoximeter.png | Bin {icons => sleepyhead/icons}/edit-find.png | Bin {icons => sleepyhead/icons}/forward.png | Bin {icons => sleepyhead/icons}/go-home.png | Bin {icons => sleepyhead/icons}/help.png | Bin {icons => sleepyhead/icons}/iconfile.icns | Bin {icons => sleepyhead/icons}/last.png | Bin {icons => sleepyhead/icons}/mask.png | Bin {icons => sleepyhead/icons}/moon.png | Bin {icons => sleepyhead/icons}/nodata.png | Bin {icons => sleepyhead/icons}/nographs.png | Bin {icons => sleepyhead/icons}/overview.png | Bin {icons => sleepyhead/icons}/oximeter.png | Bin {icons => sleepyhead/icons}/preferences.png | Bin {icons => sleepyhead/icons}/refresh.png | Bin {icons => sleepyhead/icons}/sadface.png | Bin {icons => sleepyhead/icons}/save.png | Bin {icons => sleepyhead/icons}/sdcard.png | Bin {icons => sleepyhead/icons}/session-off.png | Bin {icons => sleepyhead/icons}/session-on.png | Bin {icons => sleepyhead/icons}/sheep.png | Bin {icons => sleepyhead/icons}/smileyface.png | Bin .../icons}/svg/applications-viewers.svg | 0 {icons => sleepyhead/icons}/svg/back.svg | 0 {icons => sleepyhead/icons}/svg/calendar.svg | 0 .../icons}/svg/close-window.svg | 0 {icons => sleepyhead/icons}/svg/edit-find.svg | 0 .../icons}/svg/emblem-marketing.svg | 0 {icons => sleepyhead/icons}/svg/forward.svg | 0 .../icons}/svg/gnome-dev-media-sdmmc.svg | 0 {icons => sleepyhead/icons}/svg/media.svg | 0 {icons => sleepyhead/icons}/svg/moon.svg | 0 .../icons}/svg/preferences.svg | 0 {icons => sleepyhead/icons}/trophy.png | Bin sleepyhead/sessionbar.cpp | 188 ++++++++++++++++++ sleepyhead/sessionbar.h | 49 +++++ sleepyhead/sleepyhead.pro | 15 +- 70 files changed, 365 insertions(+), 26 deletions(-) rename LICENSE.txt => sleepyhead/LICENSE.txt (100%) rename Resources.qrc => sleepyhead/Resources.qrc (100%) rename {docs => sleepyhead/docs}/0.0.gif (100%) rename {docs => sleepyhead/docs}/PRS1 Data Format.odt (100%) rename {docs => sleepyhead/docs}/changelog.txt (100%) rename {docs => sleepyhead/docs}/channels.xml (100%) rename {docs => sleepyhead/docs}/countries.txt (100%) rename {docs => sleepyhead/docs}/graphs.xml (100%) rename {docs => sleepyhead/docs}/index.html (100%) rename {docs => sleepyhead/docs}/release_notes.html (100%) rename {docs => sleepyhead/docs}/schema.xml (100%) rename {docs => sleepyhead/docs}/script.js (100%) rename {docs => sleepyhead/docs}/sheep.png (100%) rename {docs => sleepyhead/docs}/sheep.svg (100%) rename {docs => sleepyhead/docs}/sheep2.svg (100%) rename {docs => sleepyhead/docs}/startup_tips.txt (100%) rename {docs => sleepyhead/docs}/tooltips.css (100%) rename {docs => sleepyhead/docs}/tz.txt (100%) rename {docs => sleepyhead/docs}/update_notes.html (100%) rename {docs => sleepyhead/docs}/usage.html (100%) rename {fonts => sleepyhead/fonts}/FreeSans.ttf (100%) rename {icons => sleepyhead/icons}/Bob Strikes Back.png (100%) rename {icons => sleepyhead/icons}/README.txt (100%) rename {icons => sleepyhead/icons}/arrow-end.png (100%) rename {icons => sleepyhead/icons}/arrow-left.png (100%) rename {icons => sleepyhead/icons}/arrow-right.png (100%) rename {icons => sleepyhead/icons}/back.png (100%) rename {icons => sleepyhead/icons}/bob-v3.0.png (100%) rename {icons => sleepyhead/icons}/bookmark.png (100%) rename {icons => sleepyhead/icons}/brick.png (100%) rename {icons => sleepyhead/icons}/cubeoximeter.png (100%) rename {icons => sleepyhead/icons}/edit-find.png (100%) rename {icons => sleepyhead/icons}/forward.png (100%) rename {icons => sleepyhead/icons}/go-home.png (100%) rename {icons => sleepyhead/icons}/help.png (100%) rename {icons => sleepyhead/icons}/iconfile.icns (100%) rename {icons => sleepyhead/icons}/last.png (100%) rename {icons => sleepyhead/icons}/mask.png (100%) rename {icons => sleepyhead/icons}/moon.png (100%) rename {icons => sleepyhead/icons}/nodata.png (100%) rename {icons => sleepyhead/icons}/nographs.png (100%) rename {icons => sleepyhead/icons}/overview.png (100%) rename {icons => sleepyhead/icons}/oximeter.png (100%) rename {icons => sleepyhead/icons}/preferences.png (100%) rename {icons => sleepyhead/icons}/refresh.png (100%) rename {icons => sleepyhead/icons}/sadface.png (100%) rename {icons => sleepyhead/icons}/save.png (100%) rename {icons => sleepyhead/icons}/sdcard.png (100%) rename {icons => sleepyhead/icons}/session-off.png (100%) rename {icons => sleepyhead/icons}/session-on.png (100%) rename {icons => sleepyhead/icons}/sheep.png (100%) rename {icons => sleepyhead/icons}/smileyface.png (100%) rename {icons => sleepyhead/icons}/svg/applications-viewers.svg (100%) rename {icons => sleepyhead/icons}/svg/back.svg (100%) rename {icons => sleepyhead/icons}/svg/calendar.svg (100%) rename {icons => sleepyhead/icons}/svg/close-window.svg (100%) rename {icons => sleepyhead/icons}/svg/edit-find.svg (100%) rename {icons => sleepyhead/icons}/svg/emblem-marketing.svg (100%) rename {icons => sleepyhead/icons}/svg/forward.svg (100%) rename {icons => sleepyhead/icons}/svg/gnome-dev-media-sdmmc.svg (100%) rename {icons => sleepyhead/icons}/svg/media.svg (100%) rename {icons => sleepyhead/icons}/svg/moon.svg (100%) rename {icons => sleepyhead/icons}/svg/preferences.svg (100%) rename {icons => sleepyhead/icons}/trophy.png (100%) create mode 100644 sleepyhead/sessionbar.cpp create mode 100644 sleepyhead/sessionbar.h diff --git a/LICENSE.txt b/sleepyhead/LICENSE.txt similarity index 100% rename from LICENSE.txt rename to sleepyhead/LICENSE.txt diff --git a/Resources.qrc b/sleepyhead/Resources.qrc similarity index 100% rename from Resources.qrc rename to sleepyhead/Resources.qrc diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp index bb23e6d2..0cbb2264 100644 --- a/sleepyhead/daily.cpp +++ b/sleepyhead/daily.cpp @@ -16,6 +16,8 @@ #include #include #include +#include + #include //#include //#include @@ -62,6 +64,23 @@ Daily::Daily(QWidget *parent,gGraphView * shared) layout->setSpacing(0); layout->setMargin(0); layout->setContentsMargins(0,0,0,0); + + sessbar=new SessionBar(this); + + const bool sessbar_under_graphs=false; + if (sessbar_under_graphs) { + ui->sessionBarLayout->addWidget(sessbar,1); + } else { + QLabel *label=new QLabel("The session bar could go here instead??",this); + label->setAlignment(Qt::AlignCenter); + ui->sessionBarLayout->addWidget(label,1); + ui->splitter->insertWidget(2,sessbar); + sessbar->setMaximumHeight(sessbar->height()); + sessbar->setMinimumHeight(sessbar->height()); + } + sessbar->setMouseTracking(true); + + connect(sessbar, SIGNAL(toggledSession(Session*)), this, SLOT(doToggleSession(Session*))); ui->graphMainArea->setLayout(layout); //ui->graphMainArea->setLayout(layout); @@ -340,6 +359,7 @@ Daily::Daily(QWidget *parent,gGraphView * shared) Daily::~Daily() { GraphView->SaveSettings("Daily"); + disconnect(sessbar, SIGNAL(toggledSession(Session*)), this, SLOT(doToggleSession(Session*))); disconnect(ui->webView,SIGNAL(linkClicked(QUrl)),this,SLOT(Link_clicked(QUrl))); // Save any last minute changes.. @@ -351,6 +371,17 @@ Daily::~Daily() delete icon_on; delete icon_off; } + +void Daily::doToggleSession(Session * sess) +{ + // sess->StoreSummary(); + Day *day=PROFILE.GetDay(previous_date,MT_CPAP); + if (day) { + day->machine->Save(); + this->LoadDate(previous_date); + } +} + void Daily::Link_clicked(const QUrl &url) { QString code=url.toString().section("=",0,0).toLower(); @@ -1515,8 +1546,25 @@ Session * Daily::GetJournalSession(QDate date) // Get the first journal session void Daily::UpdateCPAPGraphs(Day *day) { //if (!day) return; + QColor cols[]={ + QColor("gold"), + QColor("light blue"), + QColor("light green"), + QColor("purple"), + QColor("red"), + }; + const int maxcolors=sizeof(cols)/sizeof(QColor); if (day) { day->OpenEvents(); + QVector::iterator i; + sessbar->clear(); + int c=0; + for (i=day->begin();i!=day->end();++i) { + Session * s=*i; + sessbar->add(s, cols[c % maxcolors]); + c++; + } + sessbar->update(); } for (QList::iterator g=CPAPData.begin();g!=CPAPData.end();g++) { (*g)->SetDay(day); diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h index 908679b4..d8844b2e 100644 --- a/sleepyhead/daily.h +++ b/sleepyhead/daily.h @@ -25,6 +25,7 @@ #include "Graphs/gGraphView.h" #include "Graphs/gLineChart.h" +#include "sessionbar.h" namespace Ui { class Daily; @@ -222,6 +223,7 @@ private slots: void on_weightSpinBox_valueChanged(double arg1); + void doToggleSession(Session *); protected: private: @@ -283,6 +285,7 @@ private: void UpdateOXIGraphs(Day *day); void UpdateSTAGEGraphs(Day *day); + Ui::Daily *ui; QDate previous_date; QMenu *show_graph_menu; @@ -294,6 +297,8 @@ private: QIcon * icon_on; QIcon * icon_off; + SessionBar * sessbar; + bool ZombieMeterMoved; bool BookmarksChanged; }; diff --git a/sleepyhead/daily.ui b/sleepyhead/daily.ui index 538abdcf..64a2190b 100644 --- a/sleepyhead/daily.ui +++ b/sleepyhead/daily.ui @@ -23,7 +23,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -52,7 +61,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -261,7 +279,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -292,7 +319,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -321,7 +357,16 @@ - + + 4 + + + 4 + + + 4 + + 4 @@ -358,7 +403,7 @@ 0 - + 3 @@ -378,7 +423,16 @@ 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -635,7 +689,7 @@ true - + 5 @@ -784,17 +838,11 @@ - - - Qt::Horizontal + + + QLayout::SetMaximumSize - - - 40 - 20 - - - + @@ -838,7 +886,7 @@ QWebView QWidget -
QtWebKit/QWebView
+
QtWebKitWidgets/QWebView
 diff --git a/docs/0.0.gif b/sleepyhead/docs/0.0.gif similarity index 100% rename from docs/0.0.gif rename to sleepyhead/docs/0.0.gif diff --git a/docs/PRS1 Data Format.odt b/sleepyhead/docs/PRS1 Data Format.odt similarity index 100% rename from docs/PRS1 Data Format.odt rename to sleepyhead/docs/PRS1 Data Format.odt diff --git a/docs/changelog.txt b/sleepyhead/docs/changelog.txt similarity index 100% rename from docs/changelog.txt rename to sleepyhead/docs/changelog.txt diff --git a/docs/channels.xml b/sleepyhead/docs/channels.xml similarity index 100% rename from docs/channels.xml rename to sleepyhead/docs/channels.xml diff --git a/docs/countries.txt b/sleepyhead/docs/countries.txt similarity index 100% rename from docs/countries.txt rename to sleepyhead/docs/countries.txt diff --git a/docs/graphs.xml b/sleepyhead/docs/graphs.xml similarity index 100% rename from docs/graphs.xml rename to sleepyhead/docs/graphs.xml diff --git a/docs/index.html b/sleepyhead/docs/index.html similarity index 100% rename from docs/index.html rename to sleepyhead/docs/index.html diff --git a/docs/release_notes.html b/sleepyhead/docs/release_notes.html similarity index 100% rename from docs/release_notes.html rename to sleepyhead/docs/release_notes.html diff --git a/docs/schema.xml b/sleepyhead/docs/schema.xml similarity index 100% rename from docs/schema.xml rename to sleepyhead/docs/schema.xml diff --git a/docs/script.js b/sleepyhead/docs/script.js similarity index 100% rename from docs/script.js rename to sleepyhead/docs/script.js diff --git a/docs/sheep.png b/sleepyhead/docs/sheep.png similarity index 100% rename from docs/sheep.png rename to sleepyhead/docs/sheep.png diff --git a/docs/sheep.svg b/sleepyhead/docs/sheep.svg similarity index 100% rename from docs/sheep.svg rename to sleepyhead/docs/sheep.svg diff --git a/docs/sheep2.svg b/sleepyhead/docs/sheep2.svg similarity index 100% rename from docs/sheep2.svg rename to sleepyhead/docs/sheep2.svg diff --git a/docs/startup_tips.txt b/sleepyhead/docs/startup_tips.txt similarity index 100% rename from docs/startup_tips.txt rename to sleepyhead/docs/startup_tips.txt diff --git a/docs/tooltips.css b/sleepyhead/docs/tooltips.css similarity index 100% rename from docs/tooltips.css rename to sleepyhead/docs/tooltips.css diff --git a/docs/tz.txt b/sleepyhead/docs/tz.txt similarity index 100% rename from docs/tz.txt rename to sleepyhead/docs/tz.txt diff --git a/docs/update_notes.html b/sleepyhead/docs/update_notes.html similarity index 100% rename from docs/update_notes.html rename to sleepyhead/docs/update_notes.html diff --git a/docs/usage.html b/sleepyhead/docs/usage.html similarity index 100% rename from docs/usage.html rename to sleepyhead/docs/usage.html diff --git a/fonts/FreeSans.ttf b/sleepyhead/fonts/FreeSans.ttf similarity index 100% rename from fonts/FreeSans.ttf rename to sleepyhead/fonts/FreeSans.ttf diff --git a/icons/Bob Strikes Back.png b/sleepyhead/icons/Bob Strikes Back.png similarity index 100% rename from icons/Bob Strikes Back.png rename to sleepyhead/icons/Bob Strikes Back.png diff --git a/icons/README.txt b/sleepyhead/icons/README.txt similarity index 100% rename from icons/README.txt rename to sleepyhead/icons/README.txt diff --git a/icons/arrow-end.png b/sleepyhead/icons/arrow-end.png similarity index 100% rename from icons/arrow-end.png rename to sleepyhead/icons/arrow-end.png diff --git a/icons/arrow-left.png b/sleepyhead/icons/arrow-left.png similarity index 100% rename from icons/arrow-left.png rename to sleepyhead/icons/arrow-left.png diff --git a/icons/arrow-right.png b/sleepyhead/icons/arrow-right.png similarity index 100% rename from icons/arrow-right.png rename to sleepyhead/icons/arrow-right.png diff --git a/icons/back.png b/sleepyhead/icons/back.png similarity index 100% rename from icons/back.png rename to sleepyhead/icons/back.png diff --git a/icons/bob-v3.0.png b/sleepyhead/icons/bob-v3.0.png similarity index 100% rename from icons/bob-v3.0.png rename to sleepyhead/icons/bob-v3.0.png diff --git a/icons/bookmark.png b/sleepyhead/icons/bookmark.png similarity index 100% rename from icons/bookmark.png rename to sleepyhead/icons/bookmark.png diff --git a/icons/brick.png b/sleepyhead/icons/brick.png similarity index 100% rename from icons/brick.png rename to sleepyhead/icons/brick.png diff --git a/icons/cubeoximeter.png b/sleepyhead/icons/cubeoximeter.png similarity index 100% rename from icons/cubeoximeter.png rename to sleepyhead/icons/cubeoximeter.png diff --git a/icons/edit-find.png b/sleepyhead/icons/edit-find.png similarity index 100% rename from icons/edit-find.png rename to sleepyhead/icons/edit-find.png diff --git a/icons/forward.png b/sleepyhead/icons/forward.png similarity index 100% rename from icons/forward.png rename to sleepyhead/icons/forward.png diff --git a/icons/go-home.png b/sleepyhead/icons/go-home.png similarity index 100% rename from icons/go-home.png rename to sleepyhead/icons/go-home.png diff --git a/icons/help.png b/sleepyhead/icons/help.png similarity index 100% rename from icons/help.png rename to sleepyhead/icons/help.png diff --git a/icons/iconfile.icns b/sleepyhead/icons/iconfile.icns similarity index 100% rename from icons/iconfile.icns rename to sleepyhead/icons/iconfile.icns diff --git a/icons/last.png b/sleepyhead/icons/last.png similarity index 100% rename from icons/last.png rename to sleepyhead/icons/last.png diff --git a/icons/mask.png b/sleepyhead/icons/mask.png similarity index 100% rename from icons/mask.png rename to sleepyhead/icons/mask.png diff --git a/icons/moon.png b/sleepyhead/icons/moon.png similarity index 100% rename from icons/moon.png rename to sleepyhead/icons/moon.png diff --git a/icons/nodata.png b/sleepyhead/icons/nodata.png similarity index 100% rename from icons/nodata.png rename to sleepyhead/icons/nodata.png diff --git a/icons/nographs.png b/sleepyhead/icons/nographs.png similarity index 100% rename from icons/nographs.png rename to sleepyhead/icons/nographs.png diff --git a/icons/overview.png b/sleepyhead/icons/overview.png similarity index 100% rename from icons/overview.png rename to sleepyhead/icons/overview.png diff --git a/icons/oximeter.png b/sleepyhead/icons/oximeter.png similarity index 100% rename from icons/oximeter.png rename to sleepyhead/icons/oximeter.png diff --git a/icons/preferences.png b/sleepyhead/icons/preferences.png similarity index 100% rename from icons/preferences.png rename to sleepyhead/icons/preferences.png diff --git a/icons/refresh.png b/sleepyhead/icons/refresh.png similarity index 100% rename from icons/refresh.png rename to sleepyhead/icons/refresh.png diff --git a/icons/sadface.png b/sleepyhead/icons/sadface.png similarity index 100% rename from icons/sadface.png rename to sleepyhead/icons/sadface.png diff --git a/icons/save.png b/sleepyhead/icons/save.png similarity index 100% rename from icons/save.png rename to sleepyhead/icons/save.png diff --git a/icons/sdcard.png b/sleepyhead/icons/sdcard.png similarity index 100% rename from icons/sdcard.png rename to sleepyhead/icons/sdcard.png diff --git a/icons/session-off.png b/sleepyhead/icons/session-off.png similarity index 100% rename from icons/session-off.png rename to sleepyhead/icons/session-off.png diff --git a/icons/session-on.png b/sleepyhead/icons/session-on.png similarity index 100% rename from icons/session-on.png rename to sleepyhead/icons/session-on.png diff --git a/icons/sheep.png b/sleepyhead/icons/sheep.png similarity index 100% rename from icons/sheep.png rename to sleepyhead/icons/sheep.png diff --git a/icons/smileyface.png b/sleepyhead/icons/smileyface.png similarity index 100% rename from icons/smileyface.png rename to sleepyhead/icons/smileyface.png diff --git a/icons/svg/applications-viewers.svg b/sleepyhead/icons/svg/applications-viewers.svg similarity index 100% rename from icons/svg/applications-viewers.svg rename to sleepyhead/icons/svg/applications-viewers.svg diff --git a/icons/svg/back.svg b/sleepyhead/icons/svg/back.svg similarity index 100% rename from icons/svg/back.svg rename to sleepyhead/icons/svg/back.svg diff --git a/icons/svg/calendar.svg b/sleepyhead/icons/svg/calendar.svg similarity index 100% rename from icons/svg/calendar.svg rename to sleepyhead/icons/svg/calendar.svg diff --git a/icons/svg/close-window.svg b/sleepyhead/icons/svg/close-window.svg similarity index 100% rename from icons/svg/close-window.svg rename to sleepyhead/icons/svg/close-window.svg diff --git a/icons/svg/edit-find.svg b/sleepyhead/icons/svg/edit-find.svg similarity index 100% rename from icons/svg/edit-find.svg rename to sleepyhead/icons/svg/edit-find.svg diff --git a/icons/svg/emblem-marketing.svg b/sleepyhead/icons/svg/emblem-marketing.svg similarity index 100% rename from icons/svg/emblem-marketing.svg rename to sleepyhead/icons/svg/emblem-marketing.svg diff --git a/icons/svg/forward.svg b/sleepyhead/icons/svg/forward.svg similarity index 100% rename from icons/svg/forward.svg rename to sleepyhead/icons/svg/forward.svg diff --git a/icons/svg/gnome-dev-media-sdmmc.svg b/sleepyhead/icons/svg/gnome-dev-media-sdmmc.svg similarity index 100% rename from icons/svg/gnome-dev-media-sdmmc.svg rename to sleepyhead/icons/svg/gnome-dev-media-sdmmc.svg diff --git a/icons/svg/media.svg b/sleepyhead/icons/svg/media.svg similarity index 100% rename from icons/svg/media.svg rename to sleepyhead/icons/svg/media.svg diff --git a/icons/svg/moon.svg b/sleepyhead/icons/svg/moon.svg similarity index 100% rename from icons/svg/moon.svg rename to sleepyhead/icons/svg/moon.svg diff --git a/icons/svg/preferences.svg b/sleepyhead/icons/svg/preferences.svg similarity index 100% rename from icons/svg/preferences.svg rename to sleepyhead/icons/svg/preferences.svg diff --git a/icons/trophy.png b/sleepyhead/icons/trophy.png similarity index 100% rename from icons/trophy.png rename to sleepyhead/icons/trophy.png diff --git a/sleepyhead/sessionbar.cpp b/sleepyhead/sessionbar.cpp new file mode 100644 index 00000000..7eb36a50 --- /dev/null +++ b/sleepyhead/sessionbar.cpp @@ -0,0 +1,188 @@ +#include +#include +#include +#include +#include +#include + +#include "sessionbar.h" + +SessionBar::SessionBar(QWidget *parent) : + QWidget(parent) +{ + timer.setParent(this); +} +SessionBar::~SessionBar() +{ + +} +void SessionBar::updateTimer() +{ + if (!underMouse()) { + QList::iterator i; + + for (i=segments.begin();i!=segments.end();++i) { + (*i).highlight=false; + } + } else { + timer.singleShot(50,this, SLOT(updateTimer())); + } + update(); +} + +SegType SessionBar::min() +{ + if (segments.isEmpty()) + return 0; + + QList::iterator i=segments.begin(); + SegType min=(*i).session->first(); + i++; + + qint64 val; + for (;i!=segments.end();++i) { + val=(*i).session->first(); + if (min > val) + min=val; + } + return min; +} + +SegType SessionBar::max() +{ + if (segments.isEmpty()) + return 0; + + QList::iterator i=segments.begin(); + SegType max=(*i).session->last(); + i++; + qint64 val; + for (;i!=segments.end();++i) { + val=(*i).session->last(); + if (max < val) + max=val; + } + return max; +} + +QColor brighten(QColor color); + +void SessionBar::mousePressEvent(QMouseEvent * ev) +{ + SegType mn=min(); + SegType mx=max(); + Q_ASSERT(mx > mn); + + SegType total=mx-mn; + double px=double(width()-5) / double(total); + + double sx,ex; + QList::iterator i; + + int cnt=0; + for (i=segments.begin();i!=segments.end();++i) { + Session * sess=(*i).session; + sx=double(sess->first() - mn) * px; + ex=double(sess->last() - mn) * px; + if (ex>width()-5) ex=width()-5; + //ex-=sx; + + if ((ev->x() > sx) && (ev->x() < ex) + && (ev->y() > 0) && (ev->y() < height())) { + (*i).session->setEnabled(!(*i).session->enabled()); + emit toggledSession((*i).session); + break; + } + cnt++; + } + if (timer.isActive()) timer.stop(); + timer.singleShot(50,this, SLOT(updateTimer())); + +} + +void SessionBar::mouseMoveEvent(QMouseEvent * ev) +{ + SegType mn=min(); + SegType mx=max(); + Q_ASSERT(mx > mn); + + SegType total=mx-mn; + double px=double(width()-5) / double(total); + + double sx,ex; + QList::iterator i; + + for (i=segments.begin();i!=segments.end();++i) { + SBSeg & seg=*i; + sx=double(seg.session->first() - mn) * px; + ex=double(seg.session->last() - mn) * px; + if (ex>width()-5) ex=width()-5; + //ex-=sx; + + if ((ev->x() > sx) && (ev->x() < ex) + && (ev->y() > 0) && (ev->y() < height())) { + seg.highlight=true; + } else seg.highlight=false; + } + if (timer.isActive()) timer.stop(); + timer.singleShot(50,this, SLOT(updateTimer())); +} + + +void SessionBar::paintEvent(QPaintEvent *) +{ + QPainter painter(this); + + QRect rect(1,1,width()-2,height()-2); + + painter.drawRect(rect); + + SegType mn=min(); + SegType mx=max(); + Q_ASSERT(mx > mn); + + SegType total=mx-mn; + double px=double(width()-5) / double(total); + + double sx,ex; + QList::iterator i; + for (i=segments.begin();i!=segments.end();++i) { + SBSeg & seg=*i; + qint64 mm=seg.session->first(), MM=seg.session->last(), L=MM-mm; + sx=double(mm - mn) * px; + ex=double(MM - mn) * px; + if (ex>width()-5) ex=width()-5; + ex-=sx; + + int len=L/1000L; + int h=len/3600; + int m=(len/60) % 60; + int s=len % 60; + + QString msg=QString("%1h %2m").arg((short)h,1,10,QChar('0')).arg((short)m,1,10,QChar('0'));//.arg((short)s,2,10,QChar('0')); + //painter.setBrush(QBrush((*i).color); + QRect segrect(3+sx,3,ex,height()-6); + if (seg.session->enabled()) { + QLinearGradient linearGrad(QPointF(0, 0), QPointF(0, height()/2)); + linearGrad.setSpread(QGradient::ReflectSpread); + QColor col=seg.color; + if (seg.highlight) col=brighten(col); + linearGrad.setColorAt(0, col); + linearGrad.setColorAt(1, brighten(col)); + QBrush brush(linearGrad); + painter.fillRect(segrect,brush); + } else { + if (seg.highlight) { + QColor col=QColor("#f0f0f0"); + painter.fillRect(segrect,col); + } + //msg="Off"; + } + QRect rect=painter.boundingRect(segrect, Qt::AlignCenter, msg); + if (rect.width() < segrect.width()) { + painter.drawText(segrect,Qt::AlignCenter,msg); + } + painter.drawRect(segrect); + + } +} diff --git a/sleepyhead/sessionbar.h b/sleepyhead/sessionbar.h new file mode 100644 index 00000000..e2138f1d --- /dev/null +++ b/sleepyhead/sessionbar.h @@ -0,0 +1,49 @@ +#ifndef SESSIONBAR_H +#define SESSIONBAR_H + +#include +#include +#include +#include + +#include "SleepLib/session.h" + +typedef qint64 SegType; + +class SBSeg { +public: + SBSeg() { session=NULL; color=QColor(); highlight=false; } + SBSeg(Session * sess, QColor col) { session=sess; color=col; highlight=false; } + SBSeg(const SBSeg & a) { session=a.session; color=a.color; highlight=a.highlight; } + + Session * session; + QColor color; + bool highlight; +}; + + +class SessionBar : public QWidget +{ + Q_OBJECT +public: + SessionBar(QWidget *parent = 0); + virtual ~SessionBar(); + void clear() { segments.clear(); } + void add(Session * sess, QColor col) { if (sess) segments.push_back(SBSeg(sess,col)); } + +protected slots: + void updateTimer(); +signals: + void toggledSession(Session * sess); +protected: + void paintEvent(QPaintEvent * event); + void mouseMoveEvent(QMouseEvent *); + void mousePressEvent(QMouseEvent *); + + QList segments; + SegType min(); + SegType max(); + QTimer timer; +}; + +#endif diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro index c33e0486..d3ab1d1d 100644 --- a/sleepyhead/sleepyhead.pro +++ b/sleepyhead/sleepyhead.pro @@ -109,7 +109,8 @@ SOURCES += main.cpp\ SleepLib/loader_plugins/icon_loader.cpp \ SleepLib/loader_plugins/mseries_loader.cpp \ reports.cpp \ - summary.cpp + summary.cpp \ + sessionbar.cpp HEADERS += \ SleepLib/machine.h \ @@ -154,7 +155,8 @@ HEADERS += \ SleepLib/loader_plugins/icon_loader.h \ SleepLib/loader_plugins/mseries_loader.h \ reports.h \ - summary.h + summary.h \ + sessionbar.h FORMS += \ @@ -170,7 +172,7 @@ FORMS += \ UpdaterWindow.ui RESOURCES += \ - ../Resources.qrc + Resources.qrc OTHER_FILES += \ docs/index.html \ @@ -182,13 +184,12 @@ OTHER_FILES += \ docs/startup_tips.txt \ docs/countries.txt \ docs/tz.txt \ - LICENSE.txt \ + ../LICENSE.txt \ docs/tooltips.css \ docs/script.js \ - update.xml \ + ../update.xml \ docs/changelog.txt \ - docs/update_notes.html \ - qextserialport/qextserialport.pri + docs/update_notes.html win32 { CONFIG(debug, debug|release) {