Merge pull request #2 from szrbdk/master

scale, reverse, center point changes
dreampowder · Oct 16, 2020 · 30b7f55 · 30b7f55
2 parents d4e8558 + 90bed36
commit 30b7f55
Show file tree

Hide file tree

Showing 6 changed files with 316 additions and 224 deletions.
diff --git a/example/ios/Flutter/flutter_export_environment.sh b/example/ios/Flutter/flutter_export_environment.sh
@@ -1,13 +1,15 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/Users/serdarcoskun/Development/flutter"
-export "FLUTTER_APPLICATION_PATH=/Users/serdarcoskun/Projects/dakik/oscilloscope/example"
-export "FLUTTER_TARGET=/Users/serdarcoskun/Projects/dakik/oscilloscope/example/lib/main.dart"
+export "FLUTTER_ROOT=/home/sezerbudak/flutter"
+export "FLUTTER_APPLICATION_PATH=/home/sezerbudak/apps/sb_oscilloscope/oscilloscope/example"
+export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "SYMROOT=${SOURCE_ROOT}/../build/ios"
 export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
-export "FLUTTER_FRAMEWORK_DIR=/Users/serdarcoskun/Development/flutter/bin/cache/artifacts/engine/ios"
+export "FLUTTER_FRAMEWORK_DIR=/home/sezerbudak/flutter/bin/cache/artifacts/engine/ios"
 export "FLUTTER_BUILD_NAME=1.0.0"
 export "FLUTTER_BUILD_NUMBER=1"
-export "TRACK_WIDGET_CREATION=true"
-export "DART_DEFINES=flutter.inspector.structuredErrors=true"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.packages"
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -189,15 +189,16 @@ class _ShellState extends State<Shell> {
           children: <Widget>[
             Expanded(
               child: Oscilloscope(
-                showYAxis: false,
-                yAxisColor: Colors.lightBlue,
+                // showYAxis: false,
+                // yAxisColor: Colors.lightBlue,
                 padding: 0.0,
                 backgroundColor: Colors.white60,
                 traceColor: Colors.black,
                 yAxisMax: ecgMax,
                 yAxisMin: ecgMin,
                 xScale: 1,
                 dataSet: ecgBuffer,
+                centerPoint: ecgBuffer.isNotEmpty ? ecgBuffer.first : null,
                 isZoomable: true,
                 isScrollable: false,
                 strokeWidth: 1,
@@ -224,15 +225,16 @@ class _ShellState extends State<Shell> {
                 SizedBox(
                   height: 44,
                   child: Oscilloscope(
-                    showYAxis: false,
-                    yAxisColor: Colors.lightBlue,
+                    // showYAxis: false,
+                    // yAxisColor: Colors.lightBlue,
                     padding: 0.0,
                     backgroundColor: Colors.white60,
                     traceColor: Colors.black.withAlpha(100),
                     yAxisMax: ecgMax,
                     yAxisMin: ecgMin,
                     xScale: 1,
                     dataSet: ecgPreviewData,
+                    centerPoint: ecgPreviewData.isNotEmpty ? ecgPreviewData.first : null,
                     isZoomable: false,
                     isScrollable: true,
                     strokeWidth: 0.5,

diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -8,6 +8,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
+  characters:
+    dependency: transitive
+    description:
+      name: characters
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0-nullsafety.3"
   charcode:
     dependency: transitive
     description:
@@ -21,7 +28,7 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.14.12"
+    version: "1.15.0-nullsafety.3"
   cupertino_icons:
     dependency: "direct main"
     description:
@@ -61,14 +68,14 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.8"
+    version: "1.3.0-nullsafety.3"
   oscilloscope:
     dependency: "direct dev"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.0.3"
+    version: "0.4.0"
   path:
     dependency: transitive
     description:
@@ -122,14 +129,14 @@ packages:
       name: typed_data
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.6"
+    version: "1.3.0-nullsafety.3"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.8"
+    version: "2.1.0-nullsafety.3"
   xml_parser:
     dependency: "direct main"
     description:
@@ -138,5 +145,5 @@ packages:
     source: hosted
     version: "0.1.2"
 sdks:
-  dart: ">=2.6.0 <3.0.0"
+  dart: ">=2.10.0-110 <2.11.0"
   flutter: ">=0.1.4 <2.0.0"