Browse Source

Update example configuration to integrate new feature.

Neal Wilson 11 years ago
parent
commit
1054432e0d
1 changed files with 1 additions and 18 deletions
  1. 1
    18
      config/Windows/productionroaster.xml

+ 1
- 18
config/Windows/productionroaster.xml View File

@@ -425,7 +425,7 @@
425 425
 							indicatorPanel.addWidget(decorator);
426 426
 							rate.newData.connect(indicator.setValue);
427 427
 							temperatureDisplays.push(indicator);
428
-							rateCalculators.push(rate);
428
+							channels.push(rate);
429 429
 						}
430 430
 					}
431 431
 				}
@@ -491,18 +491,6 @@
491 491
 			emitter.measurement.connect(log.newMeasurement);
492 492
 			emitter.measurement.connect(graph.newMeasurement);
493 493
 		}
494
-		for(var i = channels.length; i < channels.length + rateCalculators.length; i++) {
495
-			var offset = new MeasurementTimeOffset(epoch);
496
-			rateoffsets.push(offset);
497
-			rateCalculators[i - channels.length].newData.connect(offset.newMeasurement);
498
-			var adapter = new MeasurementAdapter(i + 1);
499
-			rateadapters.push(adapter);
500
-			offset.measurement.connect(adapter.newMeasurement);
501
-			var emitter = new ZeroEmitter(i + 1);
502
-			ratezeros.push(emitter);
503
-			rateCalculators[i - channels.length].newData.connect(emitter.newMeasurement);
504
-			emitter.measurement.connect(graph.newMeasurement);
505
-		}
506 494
         start.clicked.connect(function() {
507 495
 			start.enabled = false;
508 496
 			hasTranslated = false;
@@ -713,11 +701,6 @@
713 701
 				zeroemitters[i].setColumn(c + i + 1);
714 702
 				log.setHeaderData(c + i + 1, columnNames[i]);
715 703
 			}
716
-			for(var i = 0; i < rateadapters.length; i++)
717
-			{
718
-				rateadapters[i].setColumn(c + i + 1 + adapters.length);
719
-				ratezeros[i].setColumn(c + i + 1 + adapters.length);
720
-			}
721 704
 			log.setHeaderData(c + columnNames.length + 1, "Note");
722 705
             stop.setTemperatureColumn(c + 1);
723 706
 			stop.setAnnotationColumn(c + columnNames.length + 1);

Loading…
Cancel
Save