|
@@ -937,38 +937,39 @@
|
937
|
937
|
QSettings.setValue("liveColumn", 1);
|
938
|
938
|
var lc = 1;
|
939
|
939
|
stop.clicked.connect(function() {
|
940
|
|
- stop.enabled = false;
|
941
|
|
- for(var i = 0; i < adapters.length; i++)
|
942
|
|
- {
|
943
|
|
- adapters[i].measurement.disconnect(log.newMeasurement);
|
944
|
|
- adapters[i].measurement.disconnect(graph.newMeasurement);
|
945
|
|
- }
|
946
|
|
- for(var i = 0; i < rateadapters.length; i++)
|
947
|
|
- {
|
948
|
|
- rateadapters[i].measurement.disconnect(graph.newMeasurement);
|
949
|
|
- }
|
|
940
|
+ stop.enabled = false;
|
|
941
|
+ for(var i = 0; i < adapters.length; i++)
|
|
942
|
+ {
|
|
943
|
+ adapters[i].measurement.disconnect(log.newMeasurement);
|
|
944
|
+ adapters[i].measurement.disconnect(graph.newMeasurement);
|
|
945
|
+ }
|
|
946
|
+ for(var i = 0; i < rateadapters.length; i++)
|
|
947
|
+ {
|
|
948
|
+ rateadapters[i].measurement.disconnect(graph.newMeasurement);
|
|
949
|
+ }
|
950
|
950
|
if(typeof(currentBatchInfo) == 'undefined') { } else {
|
951
|
951
|
lc = Number(QSettings.value("liveColumn"));
|
952
|
952
|
var duration = log.lastTime(lc);
|
953
|
953
|
var durfield = findChildObject(currentBatchInfo, 'duration');
|
954
|
954
|
durfield.text = duration;
|
955
|
955
|
log.clearOutputColumns();
|
956
|
|
- channelSkip = 0;
|
957
|
|
- for(var i = 0; i < channels.length; i++) {
|
958
|
|
- if(channelVisibility[i]) {
|
959
|
|
- if(channelType[i] == "T") {
|
960
|
|
- log.addOutputTemperatureColumn(lc + i - channelSkip);
|
961
|
|
- }
|
962
|
|
- else {
|
963
|
|
- log.addOutputControlColumn(lc + i - channelSkip);
|
964
|
|
- }
|
965
|
|
- } else {
|
966
|
|
- channelSkip++;
|
967
|
|
- }
|
968
|
|
- }
|
969
|
|
- log.addOutputAnnotationColumn(lc + channels.length - channelSkip);
|
|
956
|
+ channelSkip = 0;
|
|
957
|
+ for(var i = 0; i < channels.length; i++) {
|
|
958
|
+ if(channelVisibility[i]) {
|
|
959
|
+ if(channelType[i] == "T") {
|
|
960
|
+ log.addOutputTemperatureColumn(lc + i - channelSkip);
|
|
961
|
+ }
|
|
962
|
+ else {
|
|
963
|
+ log.addOutputControlColumn(lc + i - channelSkip);
|
|
964
|
+ }
|
|
965
|
+ } else {
|
|
966
|
+ channelSkip++;
|
|
967
|
+ }
|
|
968
|
+ }
|
|
969
|
+ log.addOutputAnnotationColumn(lc + channels.length - channelSkip);
|
970
|
970
|
var filename = log.saveTemporary();
|
971
|
971
|
currentBatchInfo.tempData = filename;
|
|
972
|
+ currentBatchInfo.endBatch();
|
972
|
973
|
var notes = findChildObject(currentBatchInfo, 'annotation');
|
973
|
974
|
for(var i = 0; i < rangetimers.length; i++)
|
974
|
975
|
{
|
|
@@ -977,20 +978,20 @@
|
977
|
978
|
currentBatchInfo.raise();
|
978
|
979
|
currentBatchInfo.activateWindow();
|
979
|
980
|
}
|
980
|
|
- if(translationChannel >= 0)
|
981
|
|
- {
|
982
|
|
- offsets[offsetForChannel(translationChannel)].measurement.disconnect(currentDetector.newMeasurement);
|
983
|
|
- }
|
984
|
|
- start.enabled = true;
|
985
|
|
- window.windowModified = false;
|
986
|
|
- graph.setTimeIndicatorEnabled(false);
|
|
981
|
+ if(translationChannel >= 0)
|
|
982
|
+ {
|
|
983
|
+ offsets[offsetForChannel(translationChannel)].measurement.disconnect(currentDetector.newMeasurement);
|
|
984
|
+ }
|
|
985
|
+ start.enabled = true;
|
|
986
|
+ window.windowModified = false;
|
|
987
|
+ graph.setTimeIndicatorEnabled(false);
|
987
|
988
|
});
|
988
|
|
- stop.annotation.connect(function(note, tcol, ncol) {
|
989
|
|
- for(var i = tcol; i < ncol; i++) {
|
990
|
|
- log.newAnnotation(note, i, ncol);
|
991
|
|
- }
|
992
|
|
- });
|
993
|
|
- var quitMenu = findChildObject(this, 'quit');
|
|
989
|
+ stop.annotation.connect(function(note, tcol, ncol) {
|
|
990
|
+ for(var i = tcol; i < ncol; i++) {
|
|
991
|
+ log.newAnnotation(note, i, ncol);
|
|
992
|
+ }
|
|
993
|
+ });
|
|
994
|
+ var quitMenu = findChildObject(this, 'quit');
|
994
|
995
|
quitMenu.triggered.connect(function() {
|
995
|
996
|
window.close();
|
996
|
997
|
Application.quit();
|