chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-07 03:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Appearance tweaks to Statistics page

Browse Source
This commit is contained in:
Mark Watkins 2014-05-27 05:29:01 +10:00
parent a2305e4569
commit d049c4f0fa
5 changed files with 219 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sleepyhead/SleepLib/profiles.cpp
View File

@ -512,11 +512,8 @@ void Done()
PREF.Save(); PREF.Save();
LAYOUT.Save(); LAYOUT.Save();
Q_FOREACH(Profile * profile, profiles) { p_profile->Save();
// TODO: only save open profiles.. (maybe add an open bit?) delete p_profile;
profile->Save();
delete profile;
}
profiles.clear(); profiles.clear();
delete p_pref; delete p_pref;

345
sleepyhead/newprofile.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>607</width> <width>614</width>
<height>395</height> <height>395</height>
</rect> </rect>
</property> </property>
@ -40,7 +40,7 @@
<item> <item>
<widget class="QStackedWidget" name="stackedWidget"> <widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>3</number>
</property> </property>
<widget class="QWidget" name="welcomePage"> <widget class="QWidget" name="welcomePage">
<layout class="QVBoxLayout" name="verticalLayout_8"> <layout class="QVBoxLayout" name="verticalLayout_8">
@ -91,19 +91,19 @@
<widget class="QWidget" name="userPage"> <widget class="QWidget" name="userPage">
<layout class="QVBoxLayout" name="verticalLayout_9"> <layout class="QVBoxLayout" name="verticalLayout_9">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>-1</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>4</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
@ -114,17 +114,20 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_10"> <layout class="QVBoxLayout" name="verticalLayout_10">
<property name="spacing">
<number>-1</number>
</property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>4</number> <number>8</number>
</property> </property>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <layout class="QHBoxLayout" name="horizontalLayout_7">
@ -140,66 +143,64 @@
</item> </item>
</layout> </layout>
</item> </item>
<item> </layout>
<widget class="Line" name="line_5"> </widget>
<property name="orientation"> </item>
<enum>Qt::Horizontal</enum> <item>
<widget class="QGroupBox" name="passwordGroupBox">
<property name="toolTip">
<string>Keep the kids out.. Nothing more.. This isn't meant to be uber security.</string>
</property>
<property name="title">
<string>Password Protect Profile</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<property name="leftMargin">
<number>8</number>
</property>
<property name="topMargin">
<number>8</number>
</property>
<property name="rightMargin">
<number>8</number>
</property>
<property name="bottomMargin">
<number>8</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Password</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="1">
<widget class="QGroupBox" name="passwordGroupBox"> <widget class="QLineEdit" name="passwordEdit1">
<property name="toolTip"> <property name="echoMode">
<string>Keep the kids out.. Nothing more.. This isn't meant to be uber security.</string> <enum>QLineEdit::PasswordEchoOnEdit</enum>
</property> </property>
<property name="title">
<string>Password Protect Profile</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>Password</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="passwordEdit1">
<property name="echoMode">
<enum>QLineEdit::PasswordEchoOnEdit</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>...twice...</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="passwordEdit2">
<property name="echoMode">
<enum>QLineEdit::PasswordEchoOnEdit</enum>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="Line" name="line_6"> <widget class="QLabel" name="label_14">
<property name="orientation"> <property name="text">
<enum>Qt::Horizontal</enum> <string>...twice...</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="passwordEdit2">
<property name="echoMode">
<enum>QLineEdit::PasswordEchoOnEdit</enum>
</property> </property>
</widget> </widget>
</item> </item>
@ -213,23 +214,65 @@
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>8</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>8</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>8</number>
</property> </property>
<property name="horizontalSpacing"> <property name="spacing">
<number>0</number> <number>-1</number>
</property>
<property name="verticalSpacing">
<number>4</number>
</property> </property>
<item row="4" column="0">
<widget class="QCheckBox" name="DSTcheckbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>DST Zone</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_27">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TimeZone</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1" colspan="2">
<widget class="QComboBox" name="timezoneCombo"/>
</item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_25"> <widget class="QLabel" name="label_25">
<property name="sizePolicy"> <property name="sizePolicy">
@ -249,58 +292,6 @@
<item row="1" column="1" colspan="2"> <item row="1" column="1" colspan="2">
<widget class="QComboBox" name="countryCombo"/> <widget class="QComboBox" name="countryCombo"/>
</item> </item>
<item row="2" column="0">
<widget class="QLabel" name="label_27">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TimeZone</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QComboBox" name="timezoneCombo"/>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="0" colspan="3">
<widget class="Line" name="line_4">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QCheckBox" name="DSTcheckbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>DST Zone</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -309,19 +300,19 @@
<widget class="QWidget" name="personalPage"> <widget class="QWidget" name="personalPage">
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>-1</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>4</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="groupBox_6"> <widget class="QGroupBox" name="groupBox_6">
@ -330,22 +321,22 @@
</property> </property>
<layout class="QFormLayout" name="formLayout_6"> <layout class="QFormLayout" name="formLayout_6">
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>4</number> <number>-1</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>4</number> <number>-1</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>4</number> <number>8</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
@ -484,22 +475,22 @@
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>4</number> <number>-1</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>4</number> <number>-1</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>4</number> <number>8</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_9">
@ -559,19 +550,19 @@
<widget class="QWidget" name="cpapPage"> <widget class="QWidget" name="cpapPage">
<layout class="QVBoxLayout" name="verticalLayout_7"> <layout class="QVBoxLayout" name="verticalLayout_7">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>-1</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>4</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="groupBox_4"> <widget class="QGroupBox" name="groupBox_4">
@ -583,22 +574,22 @@
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>4</number> <number>-1</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>4</number> <number>-1</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>8</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_16"> <widget class="QLabel" name="label_16">
@ -676,20 +667,13 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="5" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<widget class="QPlainTextEdit" name="cpapNotes"> <widget class="QPlainTextEdit" name="cpapNotes">
<property name="tabChangesFocus"> <property name="tabChangesFocus">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2">
<widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -698,19 +682,19 @@
<widget class="QWidget" name="doctorPage"> <widget class="QWidget" name="doctorPage">
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_6">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>-1</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>4</number> <number>8</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="groupBox_5"> <widget class="QGroupBox" name="groupBox_5">
@ -722,22 +706,22 @@
<enum>QFormLayout::AllNonFixedFieldsGrow</enum> <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
</property> </property>
<property name="horizontalSpacing"> <property name="horizontalSpacing">
<number>4</number> <number>-1</number>
</property> </property>
<property name="verticalSpacing"> <property name="verticalSpacing">
<number>4</number> <number>-1</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>8</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>4</number> <number>8</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>8</number>
</property> </property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_17"> <widget class="QLabel" name="label_17">
@ -919,6 +903,21 @@
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>16</number>
</property>
<property name="leftMargin">
<number>8</number>
</property>
<property name="topMargin">
<number>8</number>
</property>
<property name="rightMargin">
<number>8</number>
</property>
<property name="bottomMargin">
<number>8</number>
</property>
<item> <item>
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">

4
sleepyhead/profileselect.cpp
View File

@ -73,7 +73,9 @@ ProfileSelect::ProfileSelect(QWidget *parent) :
ui->listView->setModel(proxy); ui->listView->setModel(proxy);
ui->listView->setSelectionBehavior(QAbstractItemView::SelectRows); ui->listView->setSelectionBehavior(QAbstractItemView::SelectRows);
ui->listView->setSelectionMode(QAbstractItemView::SingleSelection); ui->listView->setSelectionMode(QAbstractItemView::SingleSelection);
if (sel >= 0) { ui->listView->setCurrentIndex(model->item(sel)->index()); }
if (sel >= 0) { ui->listView->setCurrentIndex(proxy->index(sel,0)); } //model->item(sel)->index()); }
m_tries = 0; m_tries = 0;

23
sleepyhead/profileselect.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>465</width> <width>418</width>
<height>354</height> <height>272</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -22,6 +22,20 @@
background: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(240, 240, 240, 255), stop:1 rgba(220, 220, 220, 255)); background: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(240, 240, 240, 255), stop:1 rgba(220, 220, 220, 255));
} }
QGroupBox {
background-color: white;
border: 1px solid gray;
border-radius: 5px;
margin-top: 3ex; /* leave space at the top for the title */
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top center; /* position at the top center */
padding: 2px;
background-color: white;
}
QFrame { QFrame {
background: white; background: white;
border: 1px solid gray; border: 1px solid gray;
@ -30,6 +44,7 @@ border-radius: 10px;
QLabel { QLabel {
background: transparent; background: transparent;
border: 0px;
} }
QPushButton { QPushButton {
@ -50,12 +65,10 @@ QPushButton:pressed {
background: gray; background: gray;
} }
QLineEdit { QLineEdit {
border-radius: 5px; border-radius: 5px;
border: 1px solid gray; border: 1px solid gray;
background: #cccccc; background: white;
}</string> }</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">

35
sleepyhead/statistics.cpp
View File

@ -136,6 +136,19 @@ QString htmlHeader()
"<style type='text/css'>" "<style type='text/css'>"
"<!--h1,p,a,td,body { font-family: 'FreeSans', 'Sans Serif' } --/>" "<!--h1,p,a,td,body { font-family: 'FreeSans', 'Sans Serif' } --/>"
"p,a,td,body { font-size: 14px }" "p,a,td,body { font-size: 14px }"
"table.curved {"
"border: 1px solid gray;"
"border-radius:10px;"
"-moz-border-radius:10px;"
"-webkit-border-radius:10px;"
"width: 95%"
"}"
"tr.datarow:nth-child(even) {"
"background-color: #f8f8f8;"
"}"
"</style>" "</style>"
"<link rel='stylesheet' type='text/css' href='qrc:/docs/tooltips.css' />" "<link rel='stylesheet' type='text/css' href='qrc:/docs/tooltips.css' />"
"<script type='text/javascript'>" "<script type='text/javascript'>"
@ -145,7 +158,7 @@ QString htmlHeader()
"</script>" "</script>"
"</head>" "</head>"
"<body leftmargin=0 topmargin=0 rightmargin=0>" "<body leftmargin=0 topmargin=0 rightmargin=0>"
"<div align=center><table cellpadding=3 cellspacing=0 border=0 width=100%>" "<div align=center><table class=curved>" // cellpadding=3 cellspacing=0 border=0
"<td>"+userinfo+"</td>" "<td>"+userinfo+"</td>"
"<td align='right'>" "<td align='right'>"
"<h1>" + STR_TR_SleepyHead + "</h1><br/>" "<h1>" + STR_TR_SleepyHead + "</h1><br/>"
@ -154,7 +167,7 @@ QString htmlHeader()
"<td align='right' width=170px><img src='qrc:/icons/bob-v3.0.png' height=140px><br/>" "<td align='right' width=170px><img src='qrc:/icons/bob-v3.0.png' height=140px><br/>"
"</td></tr></table>" "</td></tr></table>"
"</div>" "</div>"
"<hr/>"); "<br/>");
} }
QString htmlFooter() QString htmlFooter()
{ {
@ -488,7 +501,7 @@ QString Statistics::GenerateHTML()
{ {
QString heading_color="#ffffff"; QString heading_color="#ffffff";
QString subheading_color="#efefef"; QString subheading_color="#e0e0e0";
QString html = htmlHeader(); QString html = htmlHeader();
@ -515,7 +528,7 @@ QString Statistics::GenerateHTML()
if (mach.size() == 0) { if (mach.size() == 0) {
html += "<table cellpadding=2 cellspacing=0 border=0 width=100% height=60%>"; html += "<table class=curved height=60%>"; //cellpadding=2 cellspacing=0 border=0
html += "<tr><td align=center><h1>" + tr("Please Import Some Data") + "</h1><i>" + html += "<tr><td align=center><h1>" + tr("Please Import Some Data") + "</h1><i>" +
tr("SleepyHead is pretty much useless without it.") + "</i><br/><p>" + tr("SleepyHead is pretty much useless without it.") + "</i><br/><p>" +
tr("It might be a good idea to check preferences first,</br>as there are some options that affect import.") tr("It might be a good idea to check preferences first,</br>as there are some options that affect import.")
@ -547,7 +560,7 @@ QString Statistics::GenerateHTML()
int decimals = 2; int decimals = 2;
html += "<div align=center>"; html += "<div align=center>";
html += QString("<table cellpadding=2 cellspacing=0 border=1 width=90%>"); html += QString("<table class=curved>"); //cellpadding=2 cellspacing=0 border=0
int number_periods = 0; int number_periods = 0;
if (p_profile->general->statReportMode() == 1) { if (p_profile->general->statReportMode() == 1) {
@ -655,7 +668,7 @@ QString Statistics::GenerateHTML()
name = calcnames[row.calc].arg(schema::channel[id].fullname()); name = calcnames[row.calc].arg(schema::channel[id].fullname());
} }
QString line; QString line;
line += QString("<tr><td>%1</td>").arg(name); line += QString("<tr class=datarow><td>%1</td>").arg(name);
for (int j=0; j < periods.size(); j++) { for (int j=0; j < periods.size(); j++) {
QString val=row.value(periods.at(j).start,periods.at(j).end); QString val=row.value(periods.at(j).start,periods.at(j).end);
line += QString("<td>%2</td>") line += QString("<td>%2</td>")
@ -1024,7 +1037,7 @@ QString Statistics::GenerateHTML()
RXorder=true; RXorder=true;
qSort(rxchange.begin(),rxchange.end());*/ qSort(rxchange.begin(),rxchange.end());*/
html += "<div align=center><br/>"; html += "<div align=center><br/>";
html += QString("<table cellpadding=2 cellspacing=0 border=1 width=90%>"); html += QString("<table class=curved>"); //cellpadding=2 cellspacing=0 border=1
html += "<tr bgcolor='"+heading_color+"'><td colspan=10 align=center><font size=+3>" + tr("Changes to Prescription Settings") + "</font></td></tr>"; html += "<tr bgcolor='"+heading_color+"'><td colspan=10 align=center><font size=+3>" + tr("Changes to Prescription Settings") + "</font></td></tr>";
QString extratxt; QString extratxt;
@ -1078,7 +1091,7 @@ QString Statistics::GenerateHTML()
} }
mode = rx.mode; mode = rx.mode;
extratxt = "<table cellpadding=0 cellspacing=0 border=0 width=100%><tr>"; extratxt = "<table border=0 width=100%><tr>"; //cellpadding=0 cellspacing=0
// tooltip=QString("%1 %2% ").arg(machstr).arg(percentile*100.0)+STR_TR_EPAP+ // tooltip=QString("%1 %2% ").arg(machstr).arg(percentile*100.0)+STR_TR_EPAP+
// QString("=%1<br/>%2% ").arg(rx.per1,0,'f',decimals).arg(percentile*100.0)+ // QString("=%1<br/>%2% ").arg(rx.per1,0,'f',decimals).arg(percentile*100.0)+
@ -1148,7 +1161,7 @@ QString Statistics::GenerateHTML()
tooltiphide = "tooltip.hide();"; tooltiphide = "tooltip.hide();";
} }
html += QString("<tr bgcolor='%1' onmouseover='ChangeColor(this, \"#eeeeee\"); %2' onmouseout='ChangeColor(this, \"%1\"); %3' onclick='alert(\"overview=%4,%5\");'>") html += QString("<tr class=datarow bgcolor='%1' onmouseover='ChangeColor(this, \"#eeeeee\"); %2' onmouseout='ChangeColor(this, \"%1\"); %3' onclick='alert(\"overview=%4,%5\");'>")
.arg(color) .arg(color)
.arg(tooltipshow) .arg(tooltipshow)
.arg(tooltiphide) .arg(tooltiphide)
@ -1182,7 +1195,7 @@ QString Statistics::GenerateHTML()
if (mach.size() > 0) { if (mach.size() > 0) {
html += "<div align=center><br/>"; html += "<div align=center><br/>";
html += QString("<table cellpadding=2 cellspacing=0 border=1 width=90%>"); html += QString("<table class=curved>"); // cellpadding=2 cellspacing=0 border=1 width=90%>");
html += "<tr bgcolor='"+heading_color+"'><td colspan=5 align=center><font size=+3>" + tr("Machine Information") + "</font></td></tr>"; html += "<tr bgcolor='"+heading_color+"'><td colspan=5 align=center><font size=+3>" + tr("Machine Information") + "</font></td></tr>";
html += QString("<tr><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td></tr>") html += QString("<tr><td><b>%1</b></td><td><b>%2</b></td><td><b>%3</b></td><td><b>%4</b></td><td><b>%5</b></td></tr>")
@ -1200,7 +1213,7 @@ QString Statistics::GenerateHTML()
QString mn = m->properties[STR_PROP_ModelNumber]; QString mn = m->properties[STR_PROP_ModelNumber];
//if (mn.isEmpty()) //if (mn.isEmpty())
html += QString("<tr><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td></tr>") html += QString("<tr class=datarow><td>%1</td><td>%2</td><td>%3</td><td>%4</td><td>%5</td></tr>")
.arg(m->properties[STR_PROP_Brand]) .arg(m->properties[STR_PROP_Brand])
.arg(m->properties[STR_PROP_Model] + " " + m->properties[STR_PROP_SubModel] + .arg(m->properties[STR_PROP_Model] + " " + m->properties[STR_PROP_SubModel] +
(mn.isEmpty() ? "" : QString(" (") + mn + QString(")"))) (mn.isEmpty() ? "" : QString(" (") + mn + QString(")")))