Release version 1.6

src/abouttypica.cpp

@@ -1,51 +1,26 @@
-/*228:*/
-#line 36 "./abouttypica.w"
+/*231:*/
+#line 33 "./abouttypica.w"
 
 #include "abouttypica.h"
 
-/*229:*/
-#line 45 "./abouttypica.w"
+/*232:*/
+#line 42 "./abouttypica.w"
 
 AboutTypica::AboutTypica():QMainWindow(NULL)
 {
 QFile aboutFile(":/resources/html/about.html");
 aboutFile.open(QIODevice::ReadOnly);
 QByteArray content= aboutFile.readAll();
-QWebView*banner= new QWebView;
+TypicaWebView*banner= new TypicaWebView;
 banner->setHtml(content,QUrl("qrc:/resources/html/about.html"));
 aboutFile.close();
 setCentralWidget(banner);
-QWebPage*page= banner->page();
-page->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
-connect(page,SIGNAL(linkClicked(QUrl)),this,SLOT(linkClicked(QUrl)));
 }
 
-/*:229*//*230:*/
-#line 63 "./abouttypica.w"
+#line 5770 "./typica.w"
 
-void AboutTypica::linkClicked(const QUrl&url)
-{
-if(url.scheme()=="typica")
-{
-QString address(url.toEncoded());
-if(address=="typica://aboutqt")
-{
-QMessageBox::aboutQt(this);
-}
-else
-{
-qDebug()<<"Unexpected link. Got: "<<address;
-}
-}
-else
-{
-QDesktopServices::openUrl(url);
-}
-}
-#line 5697 "./typica.w"
-
-/*:230*/
-#line 39 "./abouttypica.w"
+/*:232*/
+#line 36 "./abouttypica.w"
 
 
-/*:228*/
+/*:231*/

src/abouttypica.h

@@ -1,12 +1,9 @@
-/*227:*/
-#line 12 "./abouttypica.w"
+/*230:*/
+#line 14 "./abouttypica.w"
 
 #include <QMainWindow> 
-#include <QWebView> 
 #include <QFile> 
-#include <QtDebug> 
-#include <QMessageBox> 
-#include <QDesktopServices> 
+#include "webview.h"
 
 #ifndef AboutTypicaHeader
 #define AboutTypicaHeader
@@ -16,10 +13,8 @@ class AboutTypica:public QMainWindow
 Q_OBJECT
 public:
 AboutTypica();
-public slots:
-void linkClicked(const QUrl&url);
 };
 
 #endif
 
-/*:227*/
+/*:230*/

src/draglabel.cpp

@@ -0,0 +1,29 @@
+/*848:*/
+#line 33 "./scales.w"
+
+#include "draglabel.h"
+
+#include <QDrag> 
+#include <QMouseEvent> 
+
+DragLabel::DragLabel(const QString&labelText,QWidget*parent):
+QLabel(labelText,parent)
+{
+QFont labelFont= font();
+labelFont.setPointSize(14);
+setFont(labelFont);
+}
+
+void DragLabel::mousePressEvent(QMouseEvent*event)
+{
+if(event->button()==Qt::LeftButton)
+{
+QDrag*drag= new QDrag(this);
+QMimeData*mimeData= new QMimeData;
+mimeData->setText(text());
+drag->setMimeData(mimeData);
+drag->exec();
+}
+}
+
+/*:848*/

src/draglabel.h

@@ -0,0 +1,20 @@
+/*847:*/
+#line 13 "./scales.w"
+
+#ifndef TypicaDragLabelInclude
+#define TypicaDragLabelInclude
+
+#include <QLabel> 
+
+class DragLabel:public QLabel
+{
+Q_OBJECT
+public:
+explicit DragLabel(const QString&labelText,QWidget*parent= NULL);
+protected:
+void mousePressEvent(QMouseEvent*event);
+};
+
+#endif
+
+/*:847*/

src/helpmenu.cpp

@@ -1,10 +1,10 @@
-/*172:*/
+/*175:*/
 #line 35 "./helpmenu.w"
 
 #include "helpmenu.h"
 #include "abouttypica.h"
 
-/*173:*/
+/*176:*/
 #line 47 "./helpmenu.w"
 
 HelpMenu::HelpMenu():QMenu()
@@ -17,7 +17,7 @@ addAction(aboutTypicaAction);
 connect(aboutTypicaAction,SIGNAL(triggered()),this,SLOT(displayAboutTypica()));
 }
 
-/*:173*//*174:*/
+/*:176*//*177:*/
 #line 61 "./helpmenu.w"
 
 void HelpMenu::displayAboutTypica()
@@ -26,10 +26,10 @@ AboutTypica*aboutBox= new AboutTypica;
 aboutBox->show();
 }
 
-#line 4074 "./typica.w"
+#line 4138 "./typica.w"
 
-/*:174*/
+/*:177*/
 #line 39 "./helpmenu.w"
 
 
-/*:172*/
+/*:175*/

src/helpmenu.h

@@ -1,4 +1,4 @@
-/*171:*/
+/*174:*/
 #line 16 "./helpmenu.w"
 
 #include <QMenu> 
@@ -17,4 +17,4 @@ void displayAboutTypica();
 
 #endif
 
-/*:171*/
+/*:174*/

src/scale.cpp

@@ -0,0 +1,77 @@
+/*854:*/
+#line 131 "./scales.w"
+
+#include "scale.h"
+#include <QStringList> 
+
+SerialScale::SerialScale(const QString&port):
+QextSerialPort(port,QextSerialPort::EventDriven)
+{
+connect(this,SIGNAL(readyRead()),this,SLOT(dataAvailable()));
+}
+
+/*:854*//*855:*/
+#line 149 "./scales.w"
+
+void SerialScale::dataAvailable()
+{
+responseBuffer.append(readAll());
+if(responseBuffer.contains("\x0D"))
+{
+if(responseBuffer.contains("!"))
+{
+responseBuffer.clear();
+}
+else
+{
+/*856:*/
+#line 189 "./scales.w"
+
+QStringList responseParts= QString(responseBuffer.simplified()).split(' ');
+if(responseParts.size()> 2)
+{
+responseParts.removeFirst();
+responseParts.replace(0,QString("-%1").arg(responseParts[0]));
+}
+double weight= responseParts[0].toDouble();
+Units::Unit unit= Units::Unitless;
+if(responseParts[1]=="lb")
+{
+unit= Units::Pound;
+}
+else if(responseParts[1]=="kg")
+{
+unit= Units::Kilogram;
+}
+else if(responseParts[1]=="g")
+{
+unit= Units::Gram;
+}
+else if(responseParts[1]=="oz")
+{
+unit= Units::Ounce;
+}
+emit newMeasurement(weight,unit);
+
+/*:856*/
+#line 161 "./scales.w"
+
+responseBuffer.clear();
+}
+}
+}
+
+/*:855*//*857:*/
+#line 220 "./scales.w"
+
+void SerialScale::tare()
+{
+write("!KT\x0D");
+}
+
+void SerialScale::weigh()
+{
+write("!KP\x0D");
+}
+
+/*:857*/

src/scale.h

@@ -0,0 +1,28 @@
+/*853:*/
+#line 103 "./scales.w"
+
+#ifndef TypicaScaleInclude
+#define TypicaScaleInclude
+
+#include "3rdparty/qextserialport/src/qextserialport.h"
+#include "units.h"
+
+class SerialScale:public QextSerialPort
+{
+Q_OBJECT
+public:
+SerialScale(const QString&port);
+public slots:
+void tare();
+void weigh();
+signals:
+void newMeasurement(double weight,Units::Unit unit);
+private slots:
+void dataAvailable();
+private:
+QByteArray responseBuffer;
+};
+
+#endif
+
+/*:853*/

src/units.cpp

@@ -0,0 +1,314 @@
+/*235:*/
+#line 42 "./units.w"
+
+#include "units.h"
+
+/*:235*//*236:*/
+#line 52 "./units.w"
+
+bool Units::isTemperatureUnit(Unit unit)
+{
+if(unit==Fahrenheit||
+unit==Celsius||
+unit==Kelvin||
+unit==Rankine)
+{
+return true;
+}
+return false;
+}
+
+/*:236*//*237:*/
+#line 74 "./units.w"
+
+double Units::convertTemperature(double value,Unit fromUnit,Unit toUnit)
+{
+if(isTemperatureUnit(fromUnit)&&isTemperatureUnit(toUnit)==false)
+{
+return 0;
+}
+switch(fromUnit)
+{
+case Fahrenheit:
+switch(toUnit)
+{
+case Fahrenheit:
+return value;
+break;
+case Celsius:
+return(value-32.0)*5.0/9.0;
+break;
+case Kelvin:
+return(value+459.67)*5.0/9.0;
+break;
+case Rankine:
+return value+459.67;
+break;
+}
+break;
+case Celsius:
+switch(toUnit)
+{
+case Fahrenheit:
+return value*9.0/5.0+32.0;
+break;
+case Celsius:
+return value;
+break;
+case Kelvin:
+return value+273.15;
+break;
+case Rankine:
+return(value+273.15)*9.0/5.0;
+break;
+}
+break;
+case Kelvin:
+switch(toUnit)
+{
+case Fahrenheit:
+return value*5.0/9.0-459.67;
+break;
+case Celsius:
+return value-273.15;
+break;
+case Kelvin:
+return value;
+break;
+case Rankine:
+return value*9.0/5.0;
+break;
+}
+break;
+case Rankine:
+switch(toUnit)
+{
+case Fahrenheit:
+return value-457.67;
+break;
+case Celsius:
+return(value-491.67)*5.0/9.0;
+break;
+case Kelvin:
+return value*5.0/9.0;
+break;
+case Rankine:
+return value;
+break;
+}
+break;
+default:
+return 0;
+break;
+}
+return 0;
+}
+
+/*:237*//*238:*/
+#line 160 "./units.w"
+
+double Units::convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit)
+{
+if(isTemperatureUnit(fromUnit)&&isTemperatureUnit(toUnit)==false)
+{
+return 0;
+}
+switch(fromUnit)
+{
+case Fahrenheit:
+switch(toUnit)
+{
+case Fahrenheit:
+return value;
+break;
+case Celsius:
+return value*(5.0/9.0);
+break;
+case Kelvin:
+return value*(5.0/9.0);
+break;
+case Rankine:
+return value;
+break;
+default:
+return 0;
+break;
+}
+break;
+case Celsius:
+switch(toUnit)
+{
+case Fahrenheit:
+return value*(9.0/5.0);
+break;
+case Celsius:
+return value;
+break;
+case Kelvin:
+return value;
+break;
+case Rankine:
+return value*(9.0/5.0);
+break;
+default:
+return 0;
+break;
+}
+break;
+case Kelvin:
+switch(toUnit)
+{
+case Fahrenheit:
+return value*(5.0/9.0);
+break;
+case Celsius:
+return value;
+break;
+case Kelvin:
+return value;
+break;
+case Rankine:
+return value*(9.0/5.0);
+break;
+default:
+return 0;
+break;
+}
+break;
+case Rankine:
+switch(toUnit)
+{
+case Fahrenheit:
+return value;
+break;
+case Celsius:
+return value*(5.0/9.0);
+break;
+case Kelvin:
+return value*(5.0/9.0);
+break;
+case Rankine:
+return value;
+break;
+default:
+return 0;
+break;
+}
+break;
+default:
+return 0;
+break;
+}
+return 0;
+}
+
+/*:238*//*239:*/
+#line 258 "./units.w"
+
+double Units::convertWeight(double value,Unit fromUnit,Unit toUnit)
+{
+if(isWeightUnit(fromUnit)&&isWeightUnit(toUnit))
+{
+switch(fromUnit)
+{
+case Pound:
+switch(toUnit)
+{
+case Pound:
+return value;
+break;
+case Kilogram:
+return value/2.2;
+break;
+case Ounce:
+return value*16.0;
+break;
+case Gram:
+return value/0.0022;
+break;
+default:
+return 0;
+break;
+}
+break;
+case Kilogram:
+switch(toUnit)
+{
+case Pound:
+return value*2.2;
+break;
+case Kilogram:
+return value;
+break;
+case Ounce:
+return value*35.2;
+break;
+case Gram:
+return value*1000.0;
+break;
+default:
+return 0;
+break;
+}
+break;
+case Ounce:
+switch(toUnit)
+{
+case Pound:
+return value/16.0;
+break;
+case Kilogram:
+return value/35.2;
+break;
+case Ounce:
+return value;
+break;
+case Gram:
+return value/0.0352;
+break;
+default:
+return 0;
+break;
+}
+break;
+case Gram:
+switch(toUnit)
+{
+case Pound:
+return value*0.0022;
+break;
+case Kilogram:
+return value/1000.0;
+break;
+case Ounce:
+return value*0.0352;
+break;
+case Gram:
+return value;
+break;
+default:
+return 0;
+break;
+}
+break;
+default:
+return 0;
+break;
+}
+}
+return 0;
+}
+
+bool Units::isWeightUnit(Unit unit)
+{
+if(unit==Pound||
+unit==Kilogram||
+unit==Ounce||
+unit==Gram)
+{
+return true;
+}
+return false;
+}
+
+/*:239*/

src/units.h

@@ -0,0 +1,35 @@
+/*234:*/
+#line 8 "./units.w"
+
+#include <QObject> 
+
+#ifndef TypicaUnitsIncluded
+#define TypicaUnitsIncluded
+
+class Units:public QObject
+{
+Q_OBJECT
+Q_ENUMS(Unit)
+public:
+enum Unit
+{
+Unitless= 0,
+Fahrenheit= 10144,
+Celsius= 10143,
+Kelvin= 10325,
+Rankine= 10145,
+Pound= 15876,
+Kilogram= 15877,
+Ounce= 1,
+Gram= 2
+};
+static double convertTemperature(double value,Unit fromUnit,Unit toUnit);
+static double convertRelativeTemperature(double value,Unit fromUnit,Unit toUnit);
+static bool isTemperatureUnit(Unit unit);
+static double convertWeight(double value,Unit fromUnit,Unit toUnit);
+static bool isWeightUnit(Unit unit);
+};
+
+#endif
+
+/*:234*/

src/webelement.cpp

@@ -0,0 +1,66 @@
+/*522:*/
+#line 363 "./webview.w"
+
+#include "webelement.h"
+
+/*520:*/
+#line 306 "./webview.w"
+
+TypicaWebElement::TypicaWebElement(QWebElement element):e(element)
+{
+
+}
+
+/*:520*//*521:*/
+#line 315 "./webview.w"
+
+void TypicaWebElement::appendInside(const QString&markup)
+{
+e.appendInside(markup);
+}
+
+void TypicaWebElement::appendOutside(const QString&markup)
+{
+e.appendOutside(markup);
+}
+
+void TypicaWebElement::prependInside(const QString&markup)
+{
+e.prependInside(markup);
+}
+
+void TypicaWebElement::prependOutside(const QString&markup)
+{
+e.prependOutside(markup);
+}
+
+void TypicaWebElement::removeFromDocument()
+{
+e.removeFromDocument();
+}
+
+void TypicaWebElement::replace(const QString&markup)
+{
+e.replace(markup);
+}
+
+void TypicaWebElement::setInnerXml(const QString&markup)
+{
+e.setInnerXml(markup);
+}
+
+void TypicaWebElement::setOuterXml(const QString&markup)
+{
+e.setOuterXml(markup);
+}
+
+void TypicaWebElement::setPlainText(const QString&text)
+{
+e.setPlainText(text);
+}
+
+/*:521*/
+#line 366 "./webview.w"
+
+
+/*:522*/

src/webelement.h

@@ -0,0 +1,30 @@
+/*515:*/
+#line 243 "./webview.w"
+
+#include <QWebElement> 
+#include <QObject> 
+
+#ifndef TypicaWebElementHeader
+#define TypicaWebElementHeader
+
+class TypicaWebElement:public QObject
+{
+Q_OBJECT
+public:
+TypicaWebElement(QWebElement element);
+Q_INVOKABLE void appendInside(const QString&markup);
+Q_INVOKABLE void appendOutside(const QString&markup);
+Q_INVOKABLE void prependInside(const QString&markup);
+Q_INVOKABLE void prependOutside(const QString&markup);
+Q_INVOKABLE void removeFromDocument();
+Q_INVOKABLE void replace(const QString&markup);
+Q_INVOKABLE void setInnerXml(const QString&markup);
+Q_INVOKABLE void setOuterXml(const QString&markup);
+Q_INVOKABLE void setPlainText(const QString&text);
+private:
+QWebElement e;
+};
+
+#endif
+
+/*:515*/

src/webview.cpp

@@ -0,0 +1,106 @@
+/*500:*/
+#line 47 "./webview.w"
+
+#include "webview.h"
+
+/*501:*/
+#line 54 "./webview.w"
+
+TypicaWebView::TypicaWebView():QWebView()
+{
+page()->setLinkDelegationPolicy(QWebPage::DelegateExternalLinks);
+connect(page(),SIGNAL(linkClicked(QUrl)),this,SLOT(linkDelegate(QUrl)));
+}
+
+/*:501*//*502:*/
+#line 70 "./webview.w"
+
+void TypicaWebView::linkDelegate(const QUrl&url)
+{
+if(url.scheme()=="typica")
+{
+QString address(url.toEncoded());
+/*503:*/
+#line 88 "./webview.w"
+
+if(address=="typica://aboutqt")
+{
+QMessageBox::aboutQt(this);
+return;
+}
+
+/*:503*/
+#line 76 "./webview.w"
+
+/*504:*/
+#line 97 "./webview.w"
+
+if(address.startsWith("typica://script/"))
+{
+emit scriptLinkClicked(address.remove(0,16));
+return;
+}
+
+/*:504*/
+#line 77 "./webview.w"
+
+}
+else
+{
+QDesktopServices::openUrl(url);
+}
+}
+
+/*:502*//*505:*/
+#line 109 "./webview.w"
+
+void TypicaWebView::load(const QString&url)
+{
+QWebView::load(QUrl(url));
+}
+
+void TypicaWebView::print()
+{
+QPrinter*printer= new QPrinter(QPrinter::HighResolution);
+QPrintDialog printDialog(printer,NULL);
+if(printDialog.exec()==QDialog::Accepted)
+{
+QWebView::print(printer);
+}
+}
+
+void TypicaWebView::setHtml(const QString&html,const QUrl&baseUrl)
+{
+QWebView::setHtml(html,baseUrl);
+}
+
+void TypicaWebView::setContent(QIODevice*device)
+{
+device->reset();
+QByteArray content= device->readAll();
+QWebView::setContent(content,"application/xhtml+xml");
+}
+
+QString TypicaWebView::saveXml()
+{
+return page()->currentFrame()->documentElement().toOuterXml();
+}
+
+/*:505*//*511:*/
+#line 200 "./webview.w"
+
+QWebElement TypicaWebView::documentElement()
+{
+return page()->mainFrame()->documentElement();
+}
+
+QWebElement TypicaWebView::findFirstElement(const QString&selector)
+{
+return page()->mainFrame()->findFirstElement(selector);
+}
+
+/*:511*/
+#line 50 "./webview.w"
+
+
+/*:500*/

src/webview.h

@@ -0,0 +1,36 @@
+/*499:*/
+#line 12 "./webview.w"
+
+#include <QWebView> 
+#include <QFile> 
+#include <QMessageBox> 
+#include <QDesktopServices> 
+#include <QPrinter> 
+#include <QPrintDialog> 
+#include <QWebFrame> 
+#include <QWebElement> 
+
+#ifndef TypicaWebViewHeader
+#define TypicaWebViewHeader
+
+class TypicaWebView:public QWebView
+{
+Q_OBJECT
+public:
+TypicaWebView();
+Q_INVOKABLE void load(const QString&url);
+Q_INVOKABLE void print();
+Q_INVOKABLE void setHtml(const QString&html,const QUrl&baseUrl= QUrl());
+Q_INVOKABLE void setContent(QIODevice*device);
+Q_INVOKABLE QString saveXml();
+Q_INVOKABLE QWebElement documentElement();
+Q_INVOKABLE QWebElement findFirstElement(const QString&selector);
+signals:
+void scriptLinkClicked(const QString&link);
+private slots:
+void linkDelegate(const QUrl&url);
+};
+
+#endif
+
+/*:499*/