Update generated files and make ThresholdDetector operate in a more generally correct fashion

src/abouttypica.cpp

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

src/daterangeselector.cpp

@@ -12,7 +12,7 @@
 #include "daterangeselector.h"
 
 /*668:*/
-#line 115 "./daterangeselector.w"
+#line 117 "./daterangeselector.w"
 
 CustomDateRangePopup::CustomDateRangePopup(QWidget*parent):
 QWidget(parent,Qt::Popup),startDateSelector(new QCalendarWidget),
@@ -56,7 +56,7 @@ setLayout(outerLayout);
 }
 
 /*:668*//*669:*/
-#line 163 "./daterangeselector.w"
+#line 165 "./daterangeselector.w"
 
 void CustomDateRangePopup::hideEvent(QHideEvent*)
 {
@@ -64,7 +64,7 @@ emit hidingPopup();
 }
 
 /*:669*//*670:*/
-#line 172 "./daterangeselector.w"
+#line 174 "./daterangeselector.w"
 
 void CustomDateRangePopup::applyRange()
 {
@@ -79,7 +79,7 @@ hide();
 }
 
 /*:670*//*671:*/
-#line 189 "./daterangeselector.w"
+#line 191 "./daterangeselector.w"
 
 void CustomDateRangePopup::validateRange()
 {
@@ -97,7 +97,7 @@ applyButton->setEnabled(true);
 #line 81 "./daterangeselector.w"
 
 /*672:*/
-#line 207 "./daterangeselector.w"
+#line 209 "./daterangeselector.w"
 
 DateRangeSelector::DateRangeSelector(QWidget*parent):
 QWidget(parent),quickSelector(new QComboBox(this)),
@@ -109,7 +109,7 @@ QDate currentDate= QDate::currentDate();
 
 QHBoxLayout*layout= new QHBoxLayout;
 /*673:*/
-#line 236 "./daterangeselector.w"
+#line 238 "./daterangeselector.w"
 
 quickSelector->addItem("Yesterday",QVariant(QStringList()<<
 currentDate.addDays(-1).toString(Qt::ISODate)));
@@ -189,7 +189,7 @@ quickSelector->addItem("Lifetime");
 quickSelector->addItem("Custom");
 
 /*:673*/
-#line 217 "./daterangeselector.w"
+#line 219 "./daterangeselector.w"
 
 QToolButton*customButton= new QToolButton;
 customButton->setIcon(QIcon::fromTheme("office-calendar",
@@ -202,7 +202,7 @@ connect(customButton,SIGNAL(clicked()),this,SLOT(toggleCustom()));
 }
 
 /*:672*//*674:*/
-#line 319 "./daterangeselector.w"
+#line 321 "./daterangeselector.w"
 
 void DateRangeSelector::updateRange(int index)
 {
@@ -218,7 +218,7 @@ emit rangeUpdated(quickSelector->itemData(quickSelector->currentIndex()));
 }
 
 /*:674*//*675:*/
-#line 336 "./daterangeselector.w"
+#line 338 "./daterangeselector.w"
 
 void DateRangeSelector::popupHidden()
 {
@@ -228,7 +228,7 @@ quickSelector->setCurrentIndex(lastIndex);
 }
 
 /*:675*//*676:*/
-#line 347 "./daterangeselector.w"
+#line 349 "./daterangeselector.w"
 
 void DateRangeSelector::setCustomRange(QVariant range)
 {
@@ -239,7 +239,7 @@ quickSelector->setCurrentIndex(lastIndex);
 }
 
 /*:676*//*677:*/
-#line 362 "./daterangeselector.w"
+#line 364 "./daterangeselector.w"
 
 void DateRangeSelector::toggleCustom()
 {
@@ -280,7 +280,7 @@ customRangeSelector= NULL;
 }
 
 /*:677*//*678:*/
-#line 404 "./daterangeselector.w"
+#line 406 "./daterangeselector.w"
 
 QVariant DateRangeSelector::currentRange()
 {
@@ -288,7 +288,7 @@ return quickSelector->itemData(lastIndex);
 }
 
 /*:678*//*679:*/
-#line 412 "./daterangeselector.w"
+#line 414 "./daterangeselector.w"
 
 void DateRangeSelector::setCurrentIndex(int index)
 {
@@ -301,7 +301,7 @@ return quickSelector->currentIndex();
 }
 
 /*:679*//*680:*/
-#line 432 "./daterangeselector.w"
+#line 434 "./daterangeselector.w"
 
 void DateRangeSelector::setLifetimeRange(QString startDate,QString endDate)
 {
@@ -310,7 +310,7 @@ QVariant(QStringList()<<startDate<<endDate));
 }
 
 /*:680*//*681:*/
-#line 442 "./daterangeselector.w"
+#line 444 "./daterangeselector.w"
 
 void DateRangeSelector::removeIndex(int index)
 {
@@ -322,7 +322,9 @@ quickSelector->removeItem(index);
 
 
 #ifdef __unix__
+#ifndef __linux__
 #include "moc_daterangeselector.cpp"
 #endif
+#endif
 
 /*:666*/

src/daterangeselector.h

@@ -10,7 +10,7 @@
 #define TypicaDateRangeSelectorHeader
 
 /*667:*/
-#line 91 "./daterangeselector.w"
+#line 93 "./daterangeselector.w"
 
 class CustomDateRangePopup:public QWidget
 {

src/draglabel.cpp

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

src/draglabel.h

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

src/helpmenu.cpp

@@ -42,7 +42,7 @@ LicenseWindow*window= new LicenseWindow;
 window->show();
 }
 
-#line 4772 "./typica.w"
+#line 4775 "./typica.w"
 
 #line 1 "./licensewindow.w"
 /*:207*/

src/licensewindow.cpp

@@ -11,7 +11,7 @@
 #include <QVariant> 
 #include <QUrl> 
 
-#line 4774 "./typica.w"
+#line 4777 "./typica.w"
 
 /*:213*/
 #line 37 "./licensewindow.w"

src/scale.cpp

@@ -1,4 +1,4 @@
-/*1008:*/
+/*1020:*/
 #line 135 "./scales.w"
 
 #include "scale.h"
@@ -10,7 +10,7 @@ QextSerialPort(port,QextSerialPort::EventDriven)
 connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
 }
 
-/*:1008*//*1009:*/
+/*:1020*//*1021:*/
 #line 153 "./scales.w"
 
 void SerialScale::dataAvailable()
@@ -24,7 +24,7 @@ responseBuffer.clear();
 }
 else
 {
-/*1010:*/
+/*1022:*/
 #line 193 "./scales.w"
 
 QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
@@ -53,7 +53,7 @@ unit= Units::Ounce;
 }
 emit newMeasurement(weight,unit);
 
-/*:1010*/
+/*:1022*/
 #line 165 "./scales.w"
 
 responseBuffer.clear();
@@ -61,7 +61,7 @@ responseBuffer.clear();
 }
 }
 
-/*:1009*//*1011:*/
+/*:1021*//*1023:*/
 #line 224 "./scales.w"
 
 void SerialScale::tare()
@@ -96,4 +96,4 @@ commandTerminator= "\x0A";
 }
 }
 
-/*:1011*/
+/*:1023*/

src/scale.h

@@ -1,4 +1,4 @@
-/*1007:*/
+/*1019:*/
 #line 103 "./scales.w"
 
 #ifndef TypicaScaleInclude
@@ -15,14 +15,18 @@ SerialScale(const QString&port);
 public slots:
 void tare();
 void weigh();
+void setWeighCommand(const QString&command);
+void setCommandTerminator(const QString&terminator);
 signals:
 void newMeasurement(double weight,Units::Unit unit);
 private slots:
 void dataAvailable();
 private:
 QByteArray responseBuffer;
+QByteArray weighCommand;
+QByteArray commandTerminator;
 };
 
 #endif
 
-/*:1007*/
+/*:1019*/

src/thresholdannotation.w

@@ -39,23 +39,8 @@ ThresholdAnnotationConfWidget::ThresholdAnnotationConfWidget(DeviceTreeModel *mo
     QLineEdit *source = new QLineEdit;
     layout->addRow(tr("Source column name:"), source);
     QDoubleSpinBox *value = new QDoubleSpinBox;
-
-@ A |QDoubleSpinBox| is used for entering the value. By default this allows for
-entering data in a range from 0 to 99.99, however this range is inadequate for
-many coffee roasting applications. Instead, we allow the full range of the
-underlying data type, but as this might be different on different platforms,
-another header is required.
-
-@<Header files to include@>=
-#include <limits>
-
-@ The number of decimal places is limited to 2, however this is an arbitrary
-decision which can be raised later if needed.
-
-@<ThresholdAnnotationConfWidget implementation@>=
-
-    value->setMinimum(std::numeric_limits<double>::min());
-    value->setMaximum(std::numeric_limits<double>::max());
+    value->setMinimum(-9999.99);
+    value->setMaximum(9999.99);
     value->setDecimals(2);
     layout->addRow(tr("Threshold value:"), value);
     QComboBox *direction = new QComboBox;

src/typica.w

@@ -8222,6 +8222,7 @@ class ThresholdDetector : public QObject@/
     signals:@/
         void timeForValue(double);
     private:@/
+        bool previousValueValid;
         double previousValue;
         double threshold;
         EdgeDirection currentDirection;
@@ -8230,12 +8231,19 @@ class ThresholdDetector : public QObject@/
 @ This class emits the time in seconds when a given measurement crosses the
 threshold value in the appropriate direction.
 
+This was previously written with |previousValue| initialized negative and a
+check that |previousValue| was non-negative. When the |ThresholdDetector| is
+connected to a data source representing temperature measurements this is a
+reasonable choice, however it breaks when connected to a rate of change series.
+To make this more generally correct, a boolean is checked to determine if a
+previous value has been set.
+
 @<ThresholdDetector Implementation@>=
 void ThresholdDetector::newMeasurement(Measurement measure)
 {
     if((currentDirection == Ascending && previousValue < threshold &&
-       previousValue >= 0) || (currentDirection == Descending &&
-       previousValue > threshold && previousValue >= 0))
+       previousValueValid) || (currentDirection == Descending &&
+       previousValue > threshold && previousValueValid))
     {
         if((currentDirection == Ascending && measure.temperature() >= threshold) ||
            (currentDirection == Descending && measure.temperature() <= threshold))
@@ -8248,9 +8256,11 @@ void ThresholdDetector::newMeasurement(Measurement measure)
         }
     }
     previousValue = measure.temperature();
+    previousValueValid = true;
 }
 
 ThresholdDetector::ThresholdDetector(double value) : QObject(NULL),
+    previousValueValid(false),
     previousValue(-1), threshold(value), currentDirection(Ascending)
 {
     /* Nothing needs to be done here. */