DATAQ SDK integration

config/Windows/productionroaster.xml

@@ -66,6 +66,7 @@
 		var channels = new Array();
 		var annotationButtons = new Array();
 		var nidevices = new Array();
+		var dataqsdkdevices = new Array();
 		var temperatureDisplays = new Array();
 		var columnNames = new Array();
 		var modbusdevices = new Array();
@@ -223,6 +224,47 @@
 						}
 					}
 				}
+				else if(driverReference.driver == "dataqsdk")
+				{
+					var device = new DataqSdkDevice(driverReference.autoSelect ? driverReference.deviceNumber : driverReference.port);
+					var sampleRate = 6;
+					if(configModel.hasChildren(driverIndex)
+					{
+						for(var j = 0; j < configModel.rowCount(driverIndex); j++)
+						{
+							var channelIndex = configModel.index(j, 0, driverIndex);
+							var channelReference = configModel.referenceElement(configModel.data(channelIndex, 32));
+							var unit;
+							if(channelReference.type == "Temperature") {
+								unit = Units.Fahrenheit;
+							}
+							else {
+								unit = Units.Unitless;
+							}
+							var channel = device.newChannel(unit);
+							var calibrator = new LinearCalibrator;
+							calibrator.measuredLower = channelReference.calibrationMeasuredLower;
+							calibrator.measuredUpper = channelReference.calibrationMeasuredUpper;
+							calibrator.mappedLower = channelReference.calibrationMappedLower;
+							calibrator.mappedUpper = channelReference.calibrationMappedUpper;
+							calibrator.sensitivity = channelReference.calibrationSensitivity;
+							calibrator.closedRange = channelReference.calibrationClosedInterval;
+							// device.setSmoothingEnabled(j) = channelReference.smoothing;
+							channel.newData.connect(calibrator.newMeasurement)
+							channels.push(calibrator);
+							columnNames.push(channelReference.column);
+							var indicator = new TemperatureDisplay;
+							temperatureDisplays.push(indicator);
+							var decorator = new WidgetDecorator(indicator, configModel.data(channelIndex, 0), 2);
+							calibrator.newData.connect(indicator.setValue);
+							indicatorPanel.addWidget(decorator);
+						}
+						sampleRate /= configModel.rowCount(driverIndex);
+					}
+					device.setSampleRate(sampleRate);
+					device.start();
+					dataqsdkdevices.push(device);
+				}
 				else if(driverReference.driver == "modbusrtu")
 				{
 					var device = new ModbusRTUDevice(configModel, driverIndex);
@@ -462,8 +504,13 @@
 			{
 				modbusdevices[i].deleteLater();
 			}
+			for(var i = 0; i < dataqsdkdevices.length; i++)
+			{
+				dataqsdkdevices[i].deleteLater();
+			}
 			delete nidevices;
 			delete modbusdevices;
+			delete dataqsdkdevices;
             window.saveSizeAndPosition("window");
             vsplit.saveState("script/mainSplitter");
             isplit.saveState("script/instrumentSplitter");

src/typica.w

@@ -6659,6 +6659,10 @@ the range $\lbrack L_1, U_1 \rbrack$.
 Some use cases require a closed range but others require that this constraint
 is loosened to allow extrapolation. Both are provided by this class.
 
+Starting in \pn{} 1.6 this class has both the |measurement| and the
+|newData| signals. This allows a |LinearCalibrator| to be treated like a
+|Channel| when used with a |DataqSdkDevice|.
+
 @<Class declarations@>=
 class LinearCalibrator : public QObject@/
 {@/
@@ -6689,6 +6693,7 @@ class LinearCalibrator : public QObject@/
 		Measurement newMeasurement(Measurement measure);
 	@t\4@>@[signals:@]@;
 		void measurement(Measurement measure);
+		void newData(Measurement measure);
 	private:@/
 		double Lo1;
 		double Lo2;
@@ -6706,7 +6711,7 @@ constructed |LinearCalibrator| which should quickly be changed.
 LinearCalibrator::LinearCalibrator(QObject *parent) :
 	QObject(parent), Lo1(0), Lo2(0), Up1(1), Up2(1), sensitivitySetting(0.0), clamp(false)@/
 {
-	/* Nothing needs to be done here. */
+	connect(this, SIGNAL(measurement(Measurement)), this, SIGNAL(newData(Measurement)));
 }
 
 @ The functional portion of the class is in the |newMeasurement()| slot. This
@@ -11707,7 +11712,7 @@ setOrganizationDomain("wilsonscoffee.com");
 setApplicationName(PROGRAM_NAME);
 
 @ Much of the user visible text in \pn{} is wrapped in a call to |tr()|. Such
-text can be replaced with translated text based on the user's locale. For more
+text can be replaced with translated text based on the user'@q'@>s locale. For more
 details, see the Qt Linguist manual.
 
 @<Load translation objects@>=
@@ -11723,7 +11728,7 @@ if(app.load(QString("%1_%2").arg("Typica").arg(QLocale::system().name())))
 }
 
 @ We also want to be able to access the application instance from within the
-scripting engine. We don't need to be able to create new instances, just access
+scripting engine. We don'@q'@>t need to be able to create new instances, just access
 the one that already exists.
 
 @<Set up the scripting engine@>=