Integrate scale measurements to New Batch window. Fixes #55.

config/Windows/newbatch.xml

@@ -55,6 +55,7 @@
         </layout>
     </layout>
 	<layout type="vertical">
+		<label>Connected Scales</label>
 		<layout type="vertical" id="scales" />
 		<stretch />
 	</layout>
@@ -88,12 +89,25 @@
 			if(navigationwindow.loggingWindow.scales.length > 0) {
 				for(var i = 0; i < navigationwindow.loggingWindow.scales.length; i++) {
 					var scale = navigationwindow.loggingWindow.scales[i];
-					var label = new QLabel(" ");
+					var label = new DragLabel();
 					var weighButton = new QPushButton();
 					weighButton.text = "Weigh";
 					weighButton.clicked.connect(scale.weigh);
 					label.updateMeasurement = function(m, u) {
-						this.text = Units.convertWeight(m, u, Units.Pound) + " lb";
+						switch(unitBox.currentIndex) {
+							case 0:
+								this.text = Units.convertWeight(m, u, Units.Gram).toFixed(1);
+								break;
+							case 1:
+								this.text = Units.convertWeight(m, u, Units.Kilogram).toFixed(4);
+								break;
+							case 2:
+								this.text = Units.convertWeight(m, u, Units.Ounce).toFixed(3);
+								break;
+							case 3:
+								this.text = Units.convertWeight(m, u, Units.Pound).toFixed(4);
+								break;
+						}
 					};
 					scalesLayout.addWidget(label);
 					scalesLayout.addWidget(weighButton);
@@ -101,6 +115,7 @@
 						label.updateMeasurement(m, u);
 					});
 					scale.weigh();
+					unitBox['currentIndexChanged(int)'].connect(scale.weigh);
 				}
 			}
 			model.dataChanged.connect(function() {

src/Typica.pro

@@ -22,14 +22,16 @@ HEADERS += moc_typica.cpp \
     units.h \
     webview.h \
     webelement.h \
-    scale.h
+    scale.h \
+    draglabel.h
 SOURCES += typica.cpp \
     helpmenu.cpp \
     abouttypica.cpp \
     units.cpp \
     webview.cpp \
     webelement.cpp \
-    scale.cpp
+    scale.cpp \
+    draglabel.cpp
 
 RESOURCES += \
     resources.qrc

src/scales.w

@@ -56,6 +56,46 @@ void DragLabel::mousePressEvent(QMouseEvent *event)
 	}
 }
 
+@ We require the ability to create these labels from the host environment.
+First we include the appropriate header.
+
+@<Header files to include@>=
+#include "draglabel.h"
+
+@ Next, a pair of function prototypes.
+
+@<Function prototypes for scripting@>=
+QScriptValue constructDragLabel(QScriptContext *context, QScriptEngine *engine);
+void setDragLabelProperties(QScriptValue value, QScriptEngine *engine);
+
+@ These are made known to the host environment as usual.
+
+@<Set up the scripting engine@>=
+constructor = engine->newFunction(constructDragLabel);
+value = engine->newQMetaObject(&DragLabel::staticMetaObject, constructor);
+engine->globalObject().setProperty("DragLabel", value);
+
+@ The implementation is trivial.
+
+@<Functions for scripting@>=
+QScriptValue constructDragLabel(QScriptContext *context, QScriptEngine *engine)
+{
+	QScriptValue object;
+	QString labelText = "";
+	if(context->argumentCount() == 1)
+	{
+		labelText = argument<QString>(0, context);
+	}
+	object = engine->newQObject(new DragLabel(labelText));
+	setDragLabelProperties(object, engine);
+	return object;
+}
+
+void setDragLabelProperties(QScriptValue value, QScriptEngine *engine)
+{
+	setQLabelProperties(value, engine);
+}
+
 @ An object is also required to communicate with a scale. This is responsible
 for setting up a connection over a serial port, sending commands out to the
 scale, buffering and interpreting the response, and signaling new measurements.

src/typica.w

@@ -12130,7 +12130,7 @@ Qt::ItemFlags SaltModel::flags(const QModelIndex &index) const
 	@<Check that the SaltModel index is valid@>@;
 	if(valid)
 	{
-		return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
+		return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemIsDropEnabled;
 	}
 	return 0;
 }