Skip to content

Commit 30b7f55

Browse files
authored
Merge pull request #2 from szrbdk/master
scale, reverse, center point changes
2 parents d4e8558 + 90bed36 commit 30b7f55

File tree

6 files changed

+316
-224
lines changed

6 files changed

+316
-224
lines changed
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
#!/bin/sh
22
# This is a generated file; do not edit or check into version control.
3-
export "FLUTTER_ROOT=/Users/serdarcoskun/Development/flutter"
4-
export "FLUTTER_APPLICATION_PATH=/Users/serdarcoskun/Projects/dakik/oscilloscope/example"
5-
export "FLUTTER_TARGET=/Users/serdarcoskun/Projects/dakik/oscilloscope/example/lib/main.dart"
3+
export "FLUTTER_ROOT=/home/sezerbudak/flutter"
4+
export "FLUTTER_APPLICATION_PATH=/home/sezerbudak/apps/sb_oscilloscope/oscilloscope/example"
5+
export "FLUTTER_TARGET=lib/main.dart"
66
export "FLUTTER_BUILD_DIR=build"
77
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
88
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
9-
export "FLUTTER_FRAMEWORK_DIR=/Users/serdarcoskun/Development/flutter/bin/cache/artifacts/engine/ios"
9+
export "FLUTTER_FRAMEWORK_DIR=/home/sezerbudak/flutter/bin/cache/artifacts/engine/ios"
1010
export "FLUTTER_BUILD_NAME=1.0.0"
1111
export "FLUTTER_BUILD_NUMBER=1"
12-
export "TRACK_WIDGET_CREATION=true"
13-
export "DART_DEFINES=flutter.inspector.structuredErrors=true"
12+
export "DART_OBFUSCATION=false"
13+
export "TRACK_WIDGET_CREATION=false"
14+
export "TREE_SHAKE_ICONS=false"
15+
export "PACKAGE_CONFIG=.packages"

example/lib/main.dart

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,16 @@ class _ShellState extends State<Shell> {
189189
children: <Widget>[
190190
Expanded(
191191
child: Oscilloscope(
192-
showYAxis: false,
193-
yAxisColor: Colors.lightBlue,
192+
// showYAxis: false,
193+
// yAxisColor: Colors.lightBlue,
194194
padding: 0.0,
195195
backgroundColor: Colors.white60,
196196
traceColor: Colors.black,
197197
yAxisMax: ecgMax,
198198
yAxisMin: ecgMin,
199199
xScale: 1,
200200
dataSet: ecgBuffer,
201+
centerPoint: ecgBuffer.isNotEmpty ? ecgBuffer.first : null,
201202
isZoomable: true,
202203
isScrollable: false,
203204
strokeWidth: 1,
@@ -224,15 +225,16 @@ class _ShellState extends State<Shell> {
224225
SizedBox(
225226
height: 44,
226227
child: Oscilloscope(
227-
showYAxis: false,
228-
yAxisColor: Colors.lightBlue,
228+
// showYAxis: false,
229+
// yAxisColor: Colors.lightBlue,
229230
padding: 0.0,
230231
backgroundColor: Colors.white60,
231232
traceColor: Colors.black.withAlpha(100),
232233
yAxisMax: ecgMax,
233234
yAxisMin: ecgMin,
234235
xScale: 1,
235236
dataSet: ecgPreviewData,
237+
centerPoint: ecgPreviewData.isNotEmpty ? ecgPreviewData.first : null,
236238
isZoomable: false,
237239
isScrollable: true,
238240
strokeWidth: 0.5,

example/pubspec.lock

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@ packages:
88
url: "https://pub.dartlang.org"
99
source: hosted
1010
version: "2.0.0"
11+
characters:
12+
dependency: transitive
13+
description:
14+
name: characters
15+
url: "https://pub.dartlang.org"
16+
source: hosted
17+
version: "1.1.0-nullsafety.3"
1118
charcode:
1219
dependency: transitive
1320
description:
@@ -21,7 +28,7 @@ packages:
2128
name: collection
2229
url: "https://pub.dartlang.org"
2330
source: hosted
24-
version: "1.14.12"
31+
version: "1.15.0-nullsafety.3"
2532
cupertino_icons:
2633
dependency: "direct main"
2734
description:
@@ -61,14 +68,14 @@ packages:
6168
name: meta
6269
url: "https://pub.dartlang.org"
6370
source: hosted
64-
version: "1.1.8"
71+
version: "1.3.0-nullsafety.3"
6572
oscilloscope:
6673
dependency: "direct dev"
6774
description:
6875
path: ".."
6976
relative: true
7077
source: path
71-
version: "0.0.3"
78+
version: "0.4.0"
7279
path:
7380
dependency: transitive
7481
description:
@@ -122,14 +129,14 @@ packages:
122129
name: typed_data
123130
url: "https://pub.dartlang.org"
124131
source: hosted
125-
version: "1.1.6"
132+
version: "1.3.0-nullsafety.3"
126133
vector_math:
127134
dependency: transitive
128135
description:
129136
name: vector_math
130137
url: "https://pub.dartlang.org"
131138
source: hosted
132-
version: "2.0.8"
139+
version: "2.1.0-nullsafety.3"
133140
xml_parser:
134141
dependency: "direct main"
135142
description:
@@ -138,5 +145,5 @@ packages:
138145
source: hosted
139146
version: "0.1.2"
140147
sdks:
141-
dart: ">=2.6.0 <3.0.0"
148+
dart: ">=2.10.0-110 <2.11.0"
142149
flutter: ">=0.1.4 <2.0.0"

0 commit comments

Comments
 (0)