diff --git a/Graphs/gXAxis.cpp b/Graphs/gXAxis.cpp index 5c6e60bd..6250ec60 100644 --- a/Graphs/gXAxis.cpp +++ b/Graphs/gXAxis.cpp @@ -91,7 +91,9 @@ void gXAxis::Plot(gGraphWindow & w,float scrx,float scry) //if (min_tick<1.0) min_tick=1.0; //if (min_tick>10) min_tick=10; } - assert(min_tick>0); + if (min_tick<=0) { + assert(min_tick>0); + } double st3=st; while (st3>minx) { diff --git a/Graphs/graphdata_custom.cpp b/Graphs/graphdata_custom.cpp index 4c9f708d..5e55d468 100644 --- a/Graphs/graphdata_custom.cpp +++ b/Graphs/graphdata_custom.cpp @@ -377,8 +377,8 @@ void HistoryData::Reload(Day *day) double y,lasty=0; min_y=max_y=0; min_x=max_x=0; - for (qint64 x=floor(real_min_x);x<=ceil(real_max_x);x++) { - date=QDateTime::fromMSecsSinceEpoch(x*86400000L); + for (double x=floor(real_min_x);x<=ceil(real_max_x);x++) { + date=QDateTime::fromMSecsSinceEpoch(x*86400000.0L); date.setTime(QTime(0,0,0)); if (profile->daylist.find(date.date())==profile->daylist.end()) continue; diff --git a/Resources.qrc b/Resources.qrc index 3fb072e0..4fb2e559 100644 --- a/Resources.qrc +++ b/Resources.qrc @@ -1,22 +1,14 @@ - Docs/index.html - Icons/toggle-on-us.svg - Icons/toggle-off-us.svg - Icons/preferences.svg - Icons/moon.svg - Icons/media.svg - Icons/go-home.png - Icons/gnome-dev-media-sdmmc.svg - Icons/forward.svg - Icons/emblem-marketing.svg - Icons/edit-find.svg - Icons/close-window.svg - Icons/calendar.svg - Icons/back.svg - Icons/applications-viewers.svg - Fonts/FreeSans.ttf - Docs/sheep.svg - Docs/sheep.png + docs/sheep.png + docs/index.html + icons/sdcard.png + icons/preferences.png + icons/overview.png + icons/moon.png + icons/go-home.png + icons/forward.png + icons/edit-find.png + icons/back.png diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index 9e0735ab..a5f2ceaf 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -6,6 +6,16 @@ QT += core gui webkit opengl +#CONFIG += static + +#static { +# CONFIG += static +# QTPLUGIN += qsvg qgif + +# DEFINES += STATIC // Equivalent to "#define STATIC" in source code +# message("Static build.") +#} + #CONFIG += link_pkgconfig #PKGCONFIG += freetype2 @@ -91,4 +101,4 @@ RESOURCES += \ Resources.qrc OTHER_FILES += \ - Docs/index.html + docs/index.html diff --git a/daily.cpp b/daily.cpp index fad1c484..f2d26695 100644 --- a/daily.cpp +++ b/daily.cpp @@ -86,7 +86,7 @@ Daily::Daily(QWidget *parent,QGLContext *context) : SF->AddLayer(new gFlagsLine(flags[0],QColor("light green"),"CSR",0,sfc)); SF->AddLayer(new gFooBar(10,QColor("lime green"),QColor("dark grey"),true)); SF->setMinimumHeight(150+(extras ? 20 : 0)); - SF->setMaximumHeight(350); + // SF->setMaximumHeight(350); AddCPAPData(pressure_iap=new EventData(CPAP_IAP)); AddCPAPData(pressure_eap=new EventData(CPAP_EAP)); diff --git a/daily.ui b/daily.ui index 31ac83ce..ac57764a 100644 --- a/daily.ui +++ b/daily.ui @@ -10,6 +10,12 @@ 622 + + + 0 + 0 + + Form @@ -22,6 +28,12 @@ + + + 0 + 0 + + Qt::Horizontal @@ -66,7 +78,7 @@ - 1 + 2 true diff --git a/Docs/index.html b/docs/index.html similarity index 96% rename from Docs/index.html rename to docs/index.html index 89fabf43..c784a00b 100644 --- a/Docs/index.html +++ b/docs/index.html @@ -14,7 +14,7 @@

About Sleep Apnea: http://en.wikipedia.org/wiki/Sleep_apnea

CPAPTalk Forum: http://www.cpaptalk.com

-
+
This is a temporary logo
(from OpenClipart.org)
diff --git a/Docs/sheep.png b/docs/sheep.png similarity index 100% rename from Docs/sheep.png rename to docs/sheep.png diff --git a/Docs/sheep.svg b/docs/sheep.svg similarity index 100% rename from Docs/sheep.svg rename to docs/sheep.svg diff --git a/Docs/sheep2.svg b/docs/sheep2.svg similarity index 100% rename from Docs/sheep2.svg rename to docs/sheep2.svg diff --git a/Fonts/FreeSans.ttf b/fonts/FreeSans.ttf similarity index 100% rename from Fonts/FreeSans.ttf rename to fonts/FreeSans.ttf diff --git a/Icons/README.txt b/icons/README.txt similarity index 100% rename from Icons/README.txt rename to icons/README.txt diff --git a/icons/back.png b/icons/back.png new file mode 100644 index 00000000..3b18c042 Binary files /dev/null and b/icons/back.png differ diff --git a/icons/edit-find.png b/icons/edit-find.png new file mode 100644 index 00000000..d945887f Binary files /dev/null and b/icons/edit-find.png differ diff --git a/icons/forward.png b/icons/forward.png new file mode 100644 index 00000000..9ed87378 Binary files /dev/null and b/icons/forward.png differ diff --git a/Icons/go-home.png b/icons/go-home.png similarity index 100% rename from Icons/go-home.png rename to icons/go-home.png diff --git a/icons/moon.png b/icons/moon.png new file mode 100644 index 00000000..c391d07b Binary files /dev/null and b/icons/moon.png differ diff --git a/icons/overview.png b/icons/overview.png new file mode 100644 index 00000000..cb4aefb4 Binary files /dev/null and b/icons/overview.png differ diff --git a/icons/preferences.png b/icons/preferences.png new file mode 100644 index 00000000..586a52bc Binary files /dev/null and b/icons/preferences.png differ diff --git a/icons/sdcard.png b/icons/sdcard.png new file mode 100644 index 00000000..7eab2b26 Binary files /dev/null and b/icons/sdcard.png differ diff --git a/Icons/applications-viewers.svg b/icons/svg/applications-viewers.svg similarity index 100% rename from Icons/applications-viewers.svg rename to icons/svg/applications-viewers.svg diff --git a/Icons/back.svg b/icons/svg/back.svg similarity index 100% rename from Icons/back.svg rename to icons/svg/back.svg diff --git a/Icons/calendar.svg b/icons/svg/calendar.svg similarity index 100% rename from Icons/calendar.svg rename to icons/svg/calendar.svg diff --git a/Icons/close-window.svg b/icons/svg/close-window.svg similarity index 100% rename from Icons/close-window.svg rename to icons/svg/close-window.svg diff --git a/Icons/edit-find.svg b/icons/svg/edit-find.svg similarity index 100% rename from Icons/edit-find.svg rename to icons/svg/edit-find.svg diff --git a/Icons/emblem-marketing.svg b/icons/svg/emblem-marketing.svg similarity index 100% rename from Icons/emblem-marketing.svg rename to icons/svg/emblem-marketing.svg diff --git a/Icons/forward.svg b/icons/svg/forward.svg similarity index 100% rename from Icons/forward.svg rename to icons/svg/forward.svg diff --git a/Icons/gnome-dev-media-sdmmc.svg b/icons/svg/gnome-dev-media-sdmmc.svg similarity index 100% rename from Icons/gnome-dev-media-sdmmc.svg rename to icons/svg/gnome-dev-media-sdmmc.svg diff --git a/Icons/media.svg b/icons/svg/media.svg similarity index 100% rename from Icons/media.svg rename to icons/svg/media.svg diff --git a/Icons/moon.svg b/icons/svg/moon.svg similarity index 100% rename from Icons/moon.svg rename to icons/svg/moon.svg diff --git a/Icons/preferences.svg b/icons/svg/preferences.svg similarity index 100% rename from Icons/preferences.svg rename to icons/svg/preferences.svg diff --git a/Icons/toggle-off-us.svg b/icons/toggle-off-us.svg similarity index 100% rename from Icons/toggle-off-us.svg rename to icons/toggle-off-us.svg diff --git a/Icons/toggle-on-us.svg b/icons/toggle-on-us.svg similarity index 100% rename from Icons/toggle-on-us.svg rename to icons/toggle-on-us.svg diff --git a/main.cpp b/main.cpp index 99231ca8..defad798 100644 --- a/main.cpp +++ b/main.cpp @@ -4,6 +4,7 @@ License: GPL *********************************************************************/ +//#include #include #include "mainwindow.h" #include "SleepLib/profiles.h" diff --git a/mainwindow.cpp b/mainwindow.cpp index e4831992..d2c1e9ca 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -47,7 +47,7 @@ MainWindow::MainWindow(QWidget *parent) : ui->statusbar->addPermanentWidget(qstatus); ui->statusbar->addPermanentWidget(qprogress); qprogress->hide(); - on_homeButton_clicked(); + //on_homeButton_clicked(); } @@ -123,7 +123,7 @@ void MainWindow::on_actionUse_AntiAliasing_triggered() void MainWindow::on_homeButton_clicked() { - QString file="qrc:/Docs/index.html"; + QString file="qrc:/docs/index.html"; QUrl url(file); //QResource res(file); //QByteArray html((const char*)res.data(), res.size()); diff --git a/mainwindow.ui b/mainwindow.ui index d1d016f3..41734b3b 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,20 +6,20 @@ 0 0 - 1029 - 512 + 1094 + 514 - + 0 - 0 + 1 16777215 - 787 + 16777215 @@ -27,12 +27,12 @@ - :/Icons/moon.svg:/Icons/moon.svg + :/icons/moon.png:/icons/moon.png - 128 - 128 + 64 + 64 @@ -42,7 +42,16 @@ 0 - + + + 0 + + + QLayout::SetNoConstraint + + + 0 + @@ -82,97 +91,131 @@ &Welcome - + + + + 0 + 0 + + Qt::Horizontal - - - - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 0 - - - 0 - + + - - - 0 + + + + 0 + 0 + - - - - 4 - - - 6 - - - - - ... - - - - :/Icons/back.svg:/Icons/back.svg - - - - - - - ... - - - - :/Icons/forward.svg:/Icons/forward.svg - - - - - - - ... - - - - :/Icons/go-home.png:/Icons/go-home.png - - - - - - - true - - - - - - - - - - qrc:/docs/index.html - - - - - + + + 0 + 40 + + + + + 16777215 + 40 + + + + QFrame::StyledPanel + + + QFrame::Raised + + + + 6 + + + 6 + + + 0 + + + 6 + + + 0 + + + + + ... + + + + :/icons/go-home.png:/icons/go-home.png + + + + + + + ... + + + + :/icons/forward.png:/icons/forward.png + + + + + + + ... + + + + :/icons/back.png:/icons/back.png + + + + + + + true + + + + + + + + + + + 0 + 0 + + + + + 0 + 200 + + + + + 0 + 200 + + + + + qrc:/docs/index.html + + + @@ -268,189 +311,188 @@ QFrame::Raised - - - 0 + + + + 2 + 194 + 92 + 90 + - - 0 + + + 0 + 0 + - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 90 - - - - Import Data - - - - :/Icons/gnome-dev-media-sdmmc.svg:/Icons/gnome-dev-media-sdmmc.svg - - - - 64 - 64 - - - - false - - - Qt::ToolButtonTextUnderIcon - - - true - - - Qt::NoArrow - - - - - - - - 0 - 0 - - - - - 0 - 90 - - - - - 16777215 - 90 - - - - Daily - - - - :/Icons/edit-find.svg:/Icons/edit-find.svg - - - - 64 - 64 - - - - Qt::ToolButtonTextUnderIcon - - - true - - - - - - - - 0 - 0 - - - - - 16777215 - 90 - - - - Overview - - - - :/Icons/applications-viewers.svg:/Icons/applications-viewers.svg - - - - 64 - 64 - - - - Qt::ToolButtonTextUnderIcon - - - true - - - - - - - - 0 - 0 - - - - - 16777215 - 90 - - - - Preferences - - - - :/Icons/preferences.svg:/Icons/preferences.svg - - - - 64 - 64 - - - - Qt::ToolButtonTextUnderIcon - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - + + + 16777215 + 90 + + + + Overview + + + + :/icons/overview.png:/icons/overview.png + + + + 64 + 64 + + + + Qt::ToolButtonTextUnderIcon + + + true + + + + + + 2 + 98 + 92 + 90 + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 90 + + + + Daily + + + + :/icons/edit-find.png:/icons/edit-find.png + + + + 64 + 64 + + + + Qt::ToolButtonTextUnderIcon + + + true + + + + + + 2 + 290 + 92 + 90 + + + + + 0 + 0 + + + + + 16777215 + 90 + + + + Preferences + + + + :/icons/preferences.png:/icons/preferences.png + + + + 64 + 64 + + + + Qt::ToolButtonTextUnderIcon + + + true + + + + + + 2 + 2 + 92 + 90 + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 90 + + + + Import Data + + + + :/icons/sdcard.png:/icons/sdcard.png + + + + 64 + 64 + + + + false + + + Qt::ToolButtonTextUnderIcon + + + true + + + Qt::NoArrow + + @@ -465,7 +507,7 @@ 0 0 - 1029 + 1094 25