Update generated files.

src/abouttypica.cpp

@@ -17,7 +17,7 @@ aboutFile.close();
 setCentralWidget(banner);
 }
 
-#line 5640 "./typica.w"
+#line 5641 "./typica.w"
 
 /*:223*/
 #line 36 "./abouttypica.w"

src/clock.cpp

@@ -0,0 +1,43 @@
+/*244:*/
+#line 52 "./clock.w"
+
+#include "clock.h"
+
+/*245:*/
+#line 61 "./clock.w"
+
+Clock::Clock():QObject(NULL)
+{
+reference.start();
+}
+
+Clock::~Clock()
+{
+
+}
+
+/*:245*//*246:*/
+#line 79 "./clock.w"
+
+qint64 Clock::timestamp()
+{
+guard.lock();
+qint64 retval= reference.elapsed();
+guard.unlock();
+emit newTime(retval);
+return retval;
+}
+
+void Clock::setEpoch()
+{
+guard.lock();
+reference.restart();
+guard.unlock();
+emit newTime(0);
+}
+
+/*:246*/
+#line 55 "./clock.w"
+
+
+/*:244*/

src/clock.h

@@ -0,0 +1,29 @@
+/*243:*/
+#line 24 "./clock.w"
+
+#include <QElapsedTimer> 
+#include <QMutex> 
+#include <QObject> 
+
+#ifndef ClockHeader
+#define ClockHeader
+
+class Clock:public QObject
+{
+Q_OBJECT
+public:
+Clock();
+~Clock();
+qint64 timestamp();
+public slots:
+void setEpoch();
+signals:
+void newTime(qint64 time);
+private:
+QElapsedTimer reference;
+QMutex guard;
+};
+
+#endif
+
+/*:243*/

src/daterangeselector.cpp

@@ -0,0 +1,346 @@
+/*603:*/
+#line 66 "./daterangeselector.w"
+
+#include <QCalendarWidget> 
+#include <QPushButton> 
+#include <QBoxLayout> 
+#include <QLabel> 
+#include <QToolButton> 
+#include <QApplication> 
+#include <QDesktopWidget> 
+
+#include "daterangeselector.h"
+
+/*604:*/
+#line 86 "./daterangeselector.w"
+
+class CustomDateRangePopup:public QWidget
+{
+Q_OBJECT
+public:
+CustomDateRangePopup(QWidget*parent= NULL);
+public slots:
+void applyRange();
+signals:
+void hidingPopup();
+protected:
+virtual void hideEvent(QHideEvent*event);
+private slots:
+void validateRange();
+private:
+QCalendarWidget*startDateSelector;
+QCalendarWidget*endDateSelector;
+QPushButton*applyButton;
+};
+
+/*:604*/
+#line 77 "./daterangeselector.w"
+
+/*605:*/
+#line 110 "./daterangeselector.w"
+
+CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
+QWidget(parent,Qt::Popup),startDateSelector(new QCalendarWidget),
+endDateSelector(new QCalendarWidget),applyButton(new QPushButton(tr("Apply")))
+{
+setAttribute(Qt::WA_WindowPropagation);
+
+QVBoxLayout*outerLayout= new QVBoxLayout;
+QHBoxLayout*calendarsLayout= new QHBoxLayout;
+QVBoxLayout*startDateLayout= new QVBoxLayout;
+QVBoxLayout*endDateLayout= new QVBoxLayout;
+QHBoxLayout*buttonLayout= new QHBoxLayout;
+QLabel*startDateLabel= new QLabel(tr("From"));
+QLabel*endDateLabel= new QLabel(tr("To"));
+startDateSelector->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+endDateSelector->setVerticalHeaderFormat(QCalendarWidget::NoVerticalHeader);
+DateRangeSelector*selector= qobject_cast<DateRangeSelector*> (parent);
+if(parent){
+QStringList range= selector->currentRange().toStringList();
+startDateSelector->setSelectedDate(QDate::fromString(range.first(),Qt::ISODate));
+endDateSelector->setSelectedDate(QDate::fromString(range.last(),Qt::ISODate));
+}
+connect(startDateSelector,SIGNAL(selectionChanged()),this,SLOT(validateRange()));
+connect(endDateSelector,SIGNAL(selectionChanged()),this,SLOT(validateRange()));
+
+startDateLayout->addWidget(startDateLabel);
+startDateLayout->addWidget(startDateSelector);
+endDateLayout->addWidget(endDateLabel);
+endDateLayout->addWidget(endDateSelector);
+
+connect(applyButton,SIGNAL(clicked()),this,SLOT(applyRange()));
+
+buttonLayout->addStretch();
+buttonLayout->addWidget(applyButton);
+
+calendarsLayout->addLayout(startDateLayout);
+calendarsLayout->addLayout(endDateLayout);
+outerLayout->addLayout(calendarsLayout);
+outerLayout->addLayout(buttonLayout);
+setLayout(outerLayout);
+}
+
+/*:605*//*606:*/
+#line 158 "./daterangeselector.w"
+
+void CustomDateRangePopup::hideEvent(QHideEvent*)
+{
+emit hidingPopup();
+}
+
+/*:606*//*607:*/
+#line 167 "./daterangeselector.w"
+
+void CustomDateRangePopup::applyRange()
+{
+DateRangeSelector*selector= qobject_cast<DateRangeSelector*> (parentWidget());
+if(selector)
+{
+selector->setCustomRange(QVariant(QStringList()<<
+startDateSelector->selectedDate().toString(Qt::ISODate)<<
+endDateSelector->selectedDate().toString(Qt::ISODate)));
+}
+hide();
+}
+
+/*:607*//*608:*/
+#line 184 "./daterangeselector.w"
+
+void CustomDateRangePopup::validateRange()
+{
+if(startDateSelector->selectedDate()> endDateSelector->selectedDate())
+{
+applyButton->setEnabled(false);
+}
+else
+{
+applyButton->setEnabled(true);
+}
+}
+
+/*:608*/
+#line 78 "./daterangeselector.w"
+
+/*609:*/
+#line 202 "./daterangeselector.w"
+
+DateRangeSelector::DateRangeSelector(QWidget*parent):
+QWidget(parent),quickSelector(new QComboBox(this)),
+customRangeSelector(NULL),lastIndex(0)
+{
+connect(quickSelector,SIGNAL(currentIndexChanged(int)),this,SLOT(updateRange(int)));
+
+QDate currentDate= QDate::currentDate();
+
+QHBoxLayout*layout= new QHBoxLayout;
+/*610:*/
+#line 231 "./daterangeselector.w"
+
+quickSelector->addItem("Yesterday",QVariant(QStringList()<<
+currentDate.addDays(-1).toString(Qt::ISODate)));
+quickSelector->addItem("Today",QVariant(QStringList()<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Week",QVariant(QStringList()<<
+(currentDate.dayOfWeek()%7?
+currentDate.addDays(-currentDate.dayOfWeek()).toString(Qt::ISODate):
+currentDate.toString(Qt::ISODate))<<
+currentDate.addDays(6-(currentDate.dayOfWeek()%7)).toString(Qt::ISODate)));
+quickSelector->addItem("This Week to Date",currentDate.dayOfWeek()%7?
+QVariant(QStringList()<<
+currentDate.addDays(-currentDate.dayOfWeek()).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)):
+QVariant(QStringList()<<currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last Week",QVariant(QStringList()<<
+currentDate.addDays(-(currentDate.dayOfWeek()%7)-7).toString(Qt::ISODate)<<
+currentDate.addDays(-(currentDate.dayOfWeek()%7)-1).toString(Qt::ISODate)));
+quickSelector->addItem("Last 7 Days",QVariant(QStringList()<<
+currentDate.addDays(-6).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Month",QVariant(QStringList()<<
+QDate(currentDate.year(),currentDate.month(),1).toString(Qt::ISODate)<<
+QDate(currentDate.year(),currentDate.month(),
+currentDate.daysInMonth()).toString(Qt::ISODate)));
+quickSelector->addItem("This Month to Date",(currentDate.day()==1?
+(QVariant(QStringList()<<currentDate.toString(Qt::ISODate))):
+(QVariant(QStringList()<<
+QDate(currentDate.year(),currentDate.month(),1).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)))));
+quickSelector->addItem("Last Four Weeks",QVariant(QStringList()<<
+currentDate.addDays(-27).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last 30 Days",QVariant(QStringList()<<
+currentDate.addDays(-29).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Quarter",QVariant(QStringList()<<
+QDate(currentDate.year(),currentDate.month()-((currentDate.month()-1)%3),1).toString(Qt::ISODate)<<
+(currentDate.month()> 9?
+QDate(currentDate.year(),12,31).toString(Qt::ISODate):
+QDate(currentDate.year(),currentDate.month()-((currentDate.month()-1)%3)+3,1).addDays(-1).toString(Qt::ISODate))));
+quickSelector->addItem("This Quarter to Date",
+(currentDate.day()==1&&(currentDate.month()-1)%3==0)?
+QVariant(QStringList()<<currentDate.toString(Qt::ISODate)):
+QVariant(QStringList()<<
+QDate(currentDate.year(),currentDate.month()-((currentDate.month()-1)%3),1).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last Quarter",currentDate.month()<4?
+QVariant(QStringList()<<
+QDate(currentDate.year()-1,10,1).toString(Qt::ISODate)<<
+QDate(currentDate.year()-1,12,31).toString(Qt::ISODate)):
+QVariant(QStringList()<<
+QDate(currentDate.year(),currentDate.month()-((currentDate.month()-1)%3)-3,1).toString(Qt::ISODate)<<
+QDate(currentDate.year(),currentDate.month()-((currentDate.month()-1)%3),1).addDays(-1).toString(Qt::ISODate)));
+quickSelector->addItem("Last 90 Days",QVariant(QStringList()<<
+currentDate.addDays(-89).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("This Year",QVariant(QStringList()<<
+QDate(currentDate.year(),1,1).toString(Qt::ISODate)<<
+QDate(currentDate.year(),12,31).toString(Qt::ISODate)));
+quickSelector->addItem("This Year to Date",(currentDate.dayOfYear()==1)?
+QVariant(QStringList()<<currentDate.toString(Qt::ISODate)):
+QVariant(QStringList()<<QDate(currentDate.year(),1,1).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->addItem("Last Year",QVariant(QStringList()<<
+QDate(currentDate.year()-1,1,1).toString(Qt::ISODate)<<
+QDate(currentDate.year()-1,12,31).toString(Qt::ISODate)));
+quickSelector->addItem("Last 365 Days",QVariant(QStringList()<<
+currentDate.addDays(-364).toString(Qt::ISODate)<<
+currentDate.toString(Qt::ISODate)));
+quickSelector->insertSeparator(quickSelector->count());
+quickSelector->addItem("Lifetime");
+quickSelector->addItem("Custom");
+
+/*:610*/
+#line 212 "./daterangeselector.w"
+
+QToolButton*customButton= new QToolButton;
+customButton->setIcon(QIcon::fromTheme("office-calendar",
+QIcon(":/resources/icons/tango/scalable/apps/office-calendar.svg")));
+layout->addWidget(quickSelector);
+layout->addWidget(customButton);
+setLayout(layout);
+
+connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
+}
+
+/*:609*//*611:*/
+#line 314 "./daterangeselector.w"
+
+void DateRangeSelector::updateRange(int index)
+{
+if(index!=lastIndex&&index==quickSelector->count()-1)
+{
+toggleCustom();
+}
+else
+{
+lastIndex= index;
+emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
+}
+}
+
+/*:611*//*612:*/
+#line 331 "./daterangeselector.w"
+
+void DateRangeSelector::popupHidden()
+{
+customRangeSelector->deleteLater();
+customRangeSelector= NULL;
+quickSelector->setCurrentIndex(lastIndex);
+}
+
+/*:612*//*613:*/
+#line 342 "./daterangeselector.w"
+
+void DateRangeSelector::setCustomRange(QVariant range)
+{
+quickSelector->setItemData(quickSelector->count()-1,range);
+emit rangeUpdated(range);
+lastIndex= quickSelector->count()-1;
+quickSelector->setCurrentIndex(lastIndex);
+}
+
+/*:613*//*614:*/
+#line 357 "./daterangeselector.w"
+
+void DateRangeSelector::toggleCustom()
+{
+if(!customRangeSelector){
+customRangeSelector= new CustomDateRangePopup(this);
+QPoint pos= rect().bottomLeft();
+QPoint pos2= rect().topLeft();
+pos= mapToGlobal(pos);
+pos2= mapToGlobal(pos2);
+QSize size= customRangeSelector->sizeHint();
+QRect screen= QApplication::desktop()->availableGeometry(pos);
+if(pos.x()+size.width()> screen.right()){
+pos.setX(screen.right()-size.width());
+}
+pos.setX(qMax(pos.x(),screen.left()));
+if(pos.y()+size.height()> screen.bottom()){
+pos.setY(pos2.y()-size.height());
+}else if(pos.y()<screen.top()){
+pos.setY(screen.top());
+}
+if(pos.y()<screen.top()){
+pos.setY(screen.top());
+}
+if(pos.y()+size.height()> screen.bottom()){
+pos.setY(screen.bottom()-size.height());
+}
+customRangeSelector->move(pos);
+customRangeSelector->show();
+connect(customRangeSelector,SIGNAL(hidingPopup()),
+this,SLOT(popupHidden()));
+}
+else
+{
+customRangeSelector->close();
+customRangeSelector->deleteLater();
+customRangeSelector= NULL;
+}
+}
+
+/*:614*//*615:*/
+#line 399 "./daterangeselector.w"
+
+QVariant DateRangeSelector::currentRange()
+{
+return quickSelector->itemData(lastIndex);
+}
+
+/*:615*//*616:*/
+#line 407 "./daterangeselector.w"
+
+void DateRangeSelector::setCurrentIndex(int index)
+{
+quickSelector->setCurrentIndex(index);
+}
+
+/*:616*//*617:*/
+#line 422 "./daterangeselector.w"
+
+void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
+{
+quickSelector->setItemData(quickSelector->count()-2,
+QVariant(QStringList()<<startDate<<endDate));
+}
+
+/*:617*//*618:*/
+#line 432 "./daterangeselector.w"
+
+void DateRangeSelector::removeIndex(int index)
+{
+quickSelector->removeItem(index);
+}
+
+/*:618*/
+#line 79 "./daterangeselector.w"
+
+
+#include "moc_daterangeselector.cpp"
+
+/*:603*/

src/daterangeselector.h

@@ -0,0 +1,37 @@
+/*602:*/
+#line 30 "./daterangeselector.w"
+
+
+#include <QComboBox> 
+
+#ifndef TypicaDateRangeSelectorHeader
+#define TypicaDateRangeSelectorHeader
+
+class CustomDateRangePopup;
+
+class DateRangeSelector:public QWidget
+{
+Q_OBJECT
+public:
+DateRangeSelector(QWidget*parent= NULL);
+void setCustomRange(QVariant range);
+Q_INVOKABLE QVariant currentRange();
+public slots:
+void setCurrentIndex(int index);
+void setLifetimeRange(QString startDate,QString endDate);
+void removeIndex(int index);
+signals:
+void rangeUpdated(QVariant);
+private slots:
+void toggleCustom();
+void popupHidden();
+void updateRange(int index);
+private:
+QComboBox*quickSelector;
+CustomDateRangePopup*customRangeSelector;
+int lastIndex;
+};
+
+#endif
+
+/*:602*/

src/draglabel.cpp

@@ -1,4 +1,4 @@
-/*842:*/
+/*863:*/
 #line 33 "./scales.w"
 
 #include "draglabel.h"
@@ -26,4 +26,4 @@ drag->exec();
 }
 }
 
-/*:842*/
+/*:863*/

src/draglabel.h

@@ -1,4 +1,4 @@
-/*841:*/
+/*862:*/
 #line 13 "./scales.w"
 
 #ifndef TypicaDragLabelInclude
@@ -17,4 +17,4 @@ void mousePressEvent(QMouseEvent*event);
 
 #endif
 
-/*:841*/
+/*:862*/

src/scale.cpp

@@ -1,4 +1,4 @@
-/*848:*/
+/*869:*/
 #line 131 "./scales.w"
 
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:848*//*849:*/
+/*:869*//*870:*/
 #line 149 "./scales.w"
 
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
 }
 else
 {
-/*850:*/
+/*871:*/
 #line 189 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
 }
 emit newMeasurement(weight,unit);
 
-/*:850*/
+/*:871*/
 #line 161 "./scales.w"
 
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
 }
 }
 
-/*:849*//*851:*/
+/*:870*//*872:*/
 #line 220 "./scales.w"
 
 void SerialScale::tare()
@@ -74,4 +74,4 @@ void SerialScale::weigh()
 write("!KP\x0D");
 }
 
-/*:851*/
+/*:872*/

src/scale.h

@@ -1,4 +1,4 @@
-/*847:*/
+/*868:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
@@ -25,4 +25,4 @@ QByteArray responseBuffer;
 
 #endif
 
-/*:847*/
+/*:868*/