Add scene sync

DevHub.cpp

@@ -69,9 +69,9 @@ void Device::putData(const QByteArray &data) {
 
 #if !defined(Q_OS_ANDROID)
             if(_parser.id() == ID_TIMESTAMP && _parser.ver() == v1) {
-                int timestamp = _parser.read<U4>();
-                int unix = _parser.read<U4>();
-                core.dataset()->addEvent(timestamp, 0, unix);
+                int t = static_cast<int>(_parser.read<U4>());
+                int u = static_cast<int>(_parser.read<U4>());
+                core.dataset()->addEvent(t, 0, u);
 //                core.consoleInfo(QString("Event time %1.%2").arg(unix).arg(timestamp));
             }
 

IDBinnary.cpp

@@ -4,7 +4,7 @@
 #include <core.h>
 extern Core core;
 
-#if defined(Q_OS_ANDROID)
+#if defined(Q_OS_ANDROID) || (defined Q_OS_LINUX)
 template < typename T, size_t N >
 size_t _countof( T const (&array)[ N ] ) { return N; }
 #endif

KoggerApp.pro

@@ -5,7 +5,7 @@ QT += qml
 
 #CONFIG += FLASHER
 
-windows {
+!android {
     QT += serialport
 }
 
@@ -57,6 +57,7 @@ SOURCES += \
         consolelistmodel.cpp \
         core.cpp \
         filelist.cpp \
+    geometryengine.cpp \
     graphicsscene3drenderer.cpp \
     graphicsscene3dview.cpp \
         logger.cpp \
@@ -68,6 +69,7 @@ SOURCES += \
     ray.cpp \
     raycaster.cpp \
         streamlist.cpp \
+    textrenderer.cpp \
         waterfall.cpp \
 
 FLASHER {
@@ -85,6 +87,7 @@ SOURCES += \
 }
 
 RESOURCES += QML/qml.qrc \
+    resources.qrc \
     shaders.qrc
 
 # Additional import path used to resolve QML modules in Qt Creator's code model
@@ -120,6 +123,7 @@ HEADERS += \
     filelist.h \
     flasher.h \
     core.h \
+    geometryengine.h \
     graphicsscene3drenderer.h \
     graphicsscene3dview.h \
     logger.h \
@@ -129,6 +133,7 @@ HEADERS += \
     ray.h \
     raycaster.h \
     streamlist.h \
+    textrenderer.h \
     waterfall.h \
     waterfallproxy.h \
 
@@ -201,16 +206,22 @@ DISTFILES += \
     qtandroidserialport/src/qtandroidserialport.pri
 }
 
-
-
 windows {
     LIBS += -lopengl32
 }
 
+win32:CONFIG(release, debug|release): LIBS += -L$$PWD/libs/freetype/lib/mingw-x64/ -lfreetype
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/libs/freetype/lib/mingw-x64/ -lfreetype
+else:unix:!macx: LIBS += -L$$PWD/libs/freetype/lib/gcc/ -lfreetype
+
+INCLUDEPATH += $$PWD/libs/freetype/include
+DEPENDPATH += $$PWD/libs/freetype/include
+
 include ($$PWD/core/core.pri)
 include ($$PWD/processors/processors.pri)
 include ($$PWD/domain/domain.pri)
 include ($$PWD/controllers/controllers.pri)
+include ($$PWD/events/events.pri)
 
 
 android {

Plot2D.cpp

@@ -1,4 +1,5 @@
 #include "Plot2D.h"
+#include <epochevent.h>
 
 Plot2D::Plot2D() {
     _echogram.setVisible(true);

QML/BottomTrackControlMenu.qml

@@ -29,18 +29,36 @@ Item {
                 text:             "Show"
                 checkState:       Qt.Checked
                 onCheckedChanged: root.controller.onVisibilityCheckBoxCheckedChanged(checked)
+
                 Component.onCompleted: {
-                    if(controller.bottomTrack)
-                        checkState = controller.bottomTrack.visible ? Qt.Checked : Qt.Unchecked
+                    if(root.controller.bottomTrack)
+                        visibilityCheckBox.checkState = controller.bottomTrack.visible ? Qt.Checked : Qt.Unchecked
                 }
             }
 
-            KButton {
-                id:               restoreBottomTrack
-                Layout.fillWidth: true
-                text:             qsTr("Restore")
-                onClicked:        root.controller.onRestoreBottomTrackButtonClicked()
+            KParamSetup {
+                paramName: "Visible channel: "
+
+                KCombo {
+                    id:                    visibleChannelCombo
+                    objectName:            "visibleChannelCombo"
+                    Layout.preferredWidth: 250
+                    model:                 root.controller.channelList
+                    onActivated:           root.controller.onVisibleChannelComboBoxIndexChanged(currentIndex)
+
+                    Component.onCompleted: {
+                        visibleChannelCombo.currentIndex = controller.visibleChannelIndex
+                    }
+                }
             }
         }
     }
+
+    Connections {
+        target: root.controller
+        function onChannelListUpdated() {
+            visibleChannelCombo.currentIndex = controller.visibleChannelIndex
+            visibleChannelCombo.model = controller.channelList
+        }
+    }
 }

assets.qrc

@@ -0,0 +1,3 @@
+<RCC>
+    <qresource prefix="/"/>
+</RCC>

controllers/bottomtrackcontrolmenucontroller.cpp

@@ -0,0 +1,91 @@
+#include "bottomtrackcontrolmenucontroller.h"
+#include <graphicsscene3dview.h>
+#include <bottomtrack.h>
+#include <maxpointsfilter.h>
+#include <nearestpointfilter.h>
+#include <QmlObjectNames.h>
+#include <plotcash.h>
+
+BottomTrackControlMenuController::BottomTrackControlMenuController(QObject* parent)
+    : QmlComponentController(parent)
+{}
+
+BottomTrackControlMenuController::~BottomTrackControlMenuController()
+{}
+
+void BottomTrackControlMenuController::onVisibilityCheckBoxCheckedChanged(bool checked)
+{
+    if(!m_graphicsSceneView)
+        return;
+
+    auto bottomTrack = m_graphicsSceneView->bottomTrack();
+
+    QMetaObject::invokeMethod(reinterpret_cast <QObject*>(bottomTrack.get()), "setVisible", Q_ARG(bool, checked));
+}
+
+void BottomTrackControlMenuController::onVisibleChannelComboBoxIndexChanged(int index)
+{
+    if(!m_graphicsSceneView)
+        return;
+
+    if(m_channelList.isEmpty())
+        return;
+
+    auto channelId = QString(m_channelList.at(index)).toInt();
+
+    m_graphicsSceneView->bottomTrack()->setVisibleChannel(channelId);
+}
+
+void BottomTrackControlMenuController::setGraphicsSceneView(GraphicsScene3dView *sceneView)
+{
+    m_graphicsSceneView = sceneView;
+
+    if(!m_graphicsSceneView)
+        return;
+
+    QObject::connect(m_graphicsSceneView->bottomTrack().get(), &BottomTrack::epochListChanged,
+                     this,                                     &BottomTrackControlMenuController::updateChannelList);
+}
+
+BottomTrack *BottomTrackControlMenuController::bottomTrack() const
+{
+    if(!m_graphicsSceneView)
+        return nullptr;
+
+    return m_graphicsSceneView->bottomTrack().get();
+}
+
+QStringList BottomTrackControlMenuController::channelList() const
+{
+    return m_channelList;
+}
+
+int BottomTrackControlMenuController::visibleChannelIndex() const
+{
+    if(!m_graphicsSceneView)
+        return -1;
+
+    auto ch = m_graphicsSceneView->bottomTrack()->visibleChannel();
+
+    return m_channelList.indexOf(QString::number(ch.channel));
+}
+
+void BottomTrackControlMenuController::updateChannelList()
+{
+    m_channelList.clear();
+
+    if(!m_graphicsSceneView)
+        return;
+
+    auto channels = m_graphicsSceneView->bottomTrack()->channels();
+
+    for(const auto& channel : qAsConst(channels))
+        m_channelList << QString("%1").arg(channel.channel);
+
+    Q_EMIT channelListUpdated();
+}
+
+void BottomTrackControlMenuController::findComponent()
+{
+    m_component = m_engine->findChild<QObject*>(QmlObjectNames::bottomTrackControlMenu);
+}

Controllers/bottomtrackcontrolmenucontroller.h → controllers/bottomtrackcontrolmenucontroller.h

@@ -1,24 +1,26 @@
 #ifndef BOTTOMTRACKCONTROLMENUCONTROLLER_H
 #define BOTTOMTRACKCONTROLMENUCONTROLLER_H
 
-#include <memory>
-
 #include <qmlcomponentcontroller.h>
 
+#include <memory>
+
 class BottomTrack;
 class GraphicsScene3dView;
 class BottomTrackControlMenuController : public QmlComponentController
 {
     Q_OBJECT
     Q_PROPERTY(BottomTrack* bottomTrack READ bottomTrack CONSTANT)
+    Q_PROPERTY(QStringList channelList READ channelList CONSTANT)
+    Q_PROPERTY(int visibleChannelIndex READ visibleChannelIndex CONSTANT)
 
 public:
     BottomTrackControlMenuController(QObject* parent = nullptr);
 
     virtual ~BottomTrackControlMenuController();
 
     Q_INVOKABLE void onVisibilityCheckBoxCheckedChanged(bool checked);
-    Q_INVOKABLE void onRestoreBottomTrackButtonClicked();
+    Q_INVOKABLE void onVisibleChannelComboBoxIndexChanged(int index);
 
     void setGraphicsSceneView(GraphicsScene3dView* sceneView);
 
@@ -27,9 +29,19 @@ class BottomTrackControlMenuController : public QmlComponentController
 
 private:
     BottomTrack* bottomTrack() const;
+    QStringList channelList() const;
+    int visibleChannelIndex() const;
+
+private Q_SLOTS:
+    void updateChannelList();
+
+Q_SIGNALS:
+    void channelListUpdated();
 
 private:
     GraphicsScene3dView* m_graphicsSceneView = nullptr;
+    QStringList m_channelList;
+
 };
 
 #endif // BOTTOMTRACKCONTROLMENUCONTROLLER_H

core.cpp

@@ -765,6 +765,8 @@ void Core::UILoad(QObject *object, const QUrl &url) {
     for(int i = 0; i < _plots2d.size(); i++) {
         if(_plots2d.at(i) != NULL) {
             _plots2d.at(i)->setPlot(_dataset);
+            m_scene3dView->bottomTrack()->installEventFilter(_plots2d.at(i));
+            _plots2d.at(i)->installEventFilter( m_scene3dView->bottomTrack().get());
         }
     }
 

Core/core.pri → core/core.pri

@@ -4,8 +4,8 @@ DEPENDPATH *= $$PWD
 HEADERS += \
     $$PWD/QmlObjectNames.h \\
     $$PWD/drawutils.h \
+    $$PWD/koggerglobal.h \
     $$PWD/sceneobject.h \
 
 SOURCES += \
-    $$PWD/drawutils.cpp \
     $$PWD/sceneobject.cpp