Prepare SoftClipChart

mincequi · Dec 20, 2019 · 79d1954 · 79d1954
1 parent 6f3f61c
commit 79d1954
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 6 deletions.
diff --git a/ble/ble.pro b/ble/ble.pro
@@ -1,6 +1,6 @@
 TEMPLATE = lib
 QT     -= gui
-CONFIG += staticlib c++11 create_prl
+CONFIG += staticlib create_prl
 
 include(../cornrow.pri)
 

diff --git a/common/common.pro b/common/common.pro
@@ -1,8 +1,8 @@
 TEMPLATE = lib
 QT     -= gui
-CONFIG += staticlib c++11 create_prl
+CONFIG += staticlib create_prl
 
-QMAKE_CXXFLAGS += -Werror
+include(../cornrow.pri)
 
 SOURCES += \
     src/Util.cpp \

diff --git a/cornrow.pri b/cornrow.pri
@@ -1,5 +1,8 @@
 QMAKE_CXXFLAGS += -Werror -Wno-shorten-64-to-32
 
+#QMAKE_CXXFLAGS += -lstdc++
+#CONFIG += c++11
+
 INCLUDEPATH += \
     ../ble/include \
     ../common/include
diff --git a/corocomo/corocomo.pro b/corocomo/corocomo.pro
@@ -29,25 +29,27 @@ SOURCES += \
     src/BleCentralAdapter.cpp \
     src/BodePlotModel.cpp \
     src/BusyIndicatorModel.cpp \
+    src/Config.cpp \
     src/EqChart.cpp \
     src/IoModel.cpp \
     src/Model.cpp \
     src/PhaseChart.cpp \
     src/Plot.cpp \
     src/PresetModel.cpp \
-    src/main.cpp \
-    src/Config.cpp
+    src/SoftClipChart.cpp \
+    src/main.cpp
 
 HEADERS += \
     src/BleCentralAdapter.h \
     src/BodePlotModel.h \
     src/BusyIndicatorModel.h \
+    src/Config.h \
     src/EqChart.h \
     src/IoModel.h \
     src/Model.h \
     src/PhaseChart.h \
     src/PresetModel.h \
-    src/Config.h
+    src/SoftClipChart.h
 
 RESOURCES += qml.qrc
 

diff --git a/corocomo/src/Plot.h b/corocomo/src/Plot.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <QList>
 #include <QPolygonF>
 
 #include <common/Types.h>

diff --git a/corocomo/src/main.cpp b/corocomo/src/main.cpp
@@ -10,6 +10,7 @@
 #include "Model.h"
 #include "PhaseChart.h"
 #include "PresetModel.h"
+#include "SoftClipChart.h"
 
 int main(int argc, char *argv[])
 {
@@ -30,6 +31,7 @@ int main(int argc, char *argv[])
     qmlRegisterType<BusyIndicatorModel>("Cornrow.BusyIndicatorModel", 1, 0, "CornrowBusyIndicatorModel");
     qmlRegisterType<EqChart>("Cornrow.EqChart", 1, 0, "CornrowEqChart");
     qmlRegisterType<PhaseChart>("Cornrow.PhaseChart", 1, 0, "CornrowPhaseChart");
+    qmlRegisterType<SoftClipChart>("Cornrow.SoftClipChart", 1, 0, "CornrowSoftClipChart");
     qmlRegisterSingletonType<Config>("Cornrow.Configuration", 1, 0, "CornrowConfiguration", [](QQmlEngine*, QJSEngine*) -> QObject* {
         return Config::instance();
     });

diff --git a/corocomo/src/main.qml b/corocomo/src/main.qml
@@ -11,6 +11,7 @@ import Cornrow.EqChart 1.0
 import Cornrow.IoModel 1.0
 import Cornrow.Model 1.0
 import Cornrow.PhaseChart 1.0
+import Cornrow.SoftClipChart 1.0
 
 ApplicationWindow {
     id: appWindow
@@ -169,6 +170,17 @@ ApplicationWindow {
                     }
                 }
             }
+
+            /*
+            CornrowSoftClipChart {
+                id: softClipChart
+                currentFilter: CornrowModel.currentBand
+                currentPlotColor: Material.accent
+                plotColor: Material.foreground
+                sumPlotColor: Material.accent
+                criticalColor: Material.color(Material.Pink)
+            }
+            */
         }
 
         PageIndicator {