From a8640e9a7fc519c0a9d978fdf1b79685f01a00fb Mon Sep 17 00:00:00 2001 From: Sudharsan Sukumar Date: Tue, 8 Nov 2016 22:19:09 +0000 Subject: [PATCH] Limit console logs for speed and add force trigger error message --- src/components/chart/chart.component.ts | 1 - src/components/trigger/trigger.component.ts | 10 ++++++++-- src/pages/test-chart-ctrls/test-chart-ctrls.ts | 9 ++------- src/services/settings/settings.service.ts | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/chart/chart.component.ts b/src/components/chart/chart.component.ts index 3896d156..e5336783 100644 --- a/src/components/chart/chart.component.ts +++ b/src/components/chart/chart.component.ts @@ -1190,7 +1190,6 @@ export class SilverNeedleChart { } openMathModal() { - console.log(this.currentBufferArray); if (this.currentBufferArray.length === 0) { return; } let modal = this.modalCtrl.create(MathModalPage, { chartComponent: this diff --git a/src/components/trigger/trigger.component.ts b/src/components/trigger/trigger.component.ts index 84ed5c18..d05dfbed 100644 --- a/src/components/trigger/trigger.component.ts +++ b/src/components/trigger/trigger.component.ts @@ -64,7 +64,7 @@ export class TriggerComponent { } forceTrigger() { - this.activeDevice.instruments.trigger.forceTrigger([1]).subscribe( + /*this.activeDevice.instruments.trigger.forceTrigger([1]).subscribe( (data) => { console.log(data); }, @@ -72,7 +72,13 @@ export class TriggerComponent { console.log(err); }, () => { } - ); + );*/ + let toast = this.toastCtrl.create({ + message: 'Force Trigger Not Yet Implemented', + showCloseButton: true, + position: 'bottom' + }); + toast.present(); } setupLevel() { diff --git a/src/pages/test-chart-ctrls/test-chart-ctrls.ts b/src/pages/test-chart-ctrls/test-chart-ctrls.ts index f524f3a5..6c154878 100644 --- a/src/pages/test-chart-ctrls/test-chart-ctrls.ts +++ b/src/pages/test-chart-ctrls/test-chart-ctrls.ts @@ -220,12 +220,9 @@ export class TestChartCtrlsPage { ]; } singleCommand['trigger']['single'] = [[1]]; - if (this.triggerComponent.edgeDirection === 'off') { + /*if (this.triggerComponent.edgeDirection === 'off') { singleCommand['trigger']['forceTrigger'] = [[1]]; - console.log(singleCommand); - } - - console.log(singleCommand); + }*/ this.activeDevice.multiCommand(singleCommand).subscribe( (data) => { @@ -274,7 +271,6 @@ export class TestChartCtrlsPage { } this.activeDevice.instruments.osc.read(readArray).subscribe( (data) => { - console.log(data); this.readAttemptCount = 0; let numSeries = []; @@ -308,7 +304,6 @@ export class TestChartCtrlsPage { } } } - console.log(this.chart1.currentBufferArray); this.triggerStatus = 'Idle'; }, (err) => { diff --git a/src/services/settings/settings.service.ts b/src/services/settings/settings.service.ts index ec6c6b7a..a1e0588b 100644 --- a/src/services/settings/settings.service.ts +++ b/src/services/settings/settings.service.ts @@ -9,7 +9,7 @@ export class SettingsService { public storageService: StorageService; public defaultConsoleLog; public logArguments; - public logLength: number = 100; + public logLength: number = 50; constructor(_storageService: StorageService) { console.log('settings service constructor');