fix wb

DowJhob · Jan 20, 2022 · d4147e2 · d4147e2
1 parent 75a7cc9
commit d4147e2
Show file tree

Hide file tree

Showing 18 changed files with 140 additions and 293 deletions.
diff --git a/livemap.pro b/livemap.pro
@@ -84,7 +84,6 @@ SOURCES += src/main.cpp\
     src/wideband/serialwb.cpp \
     src/wideband/wb-manager.cpp \
     src/wideband/wb-proto.cpp \
-    src/wblogger.cpp \
     src/widgets/hexEditor/qhexedit/chunks.cpp \
     src/widgets/hexEditor/qhexedit/commands.cpp \
     src/widgets/hexEditor/qhexedit/qhexedit.cpp \
@@ -139,7 +138,6 @@ HEADERS  += src/mainwindow.h \
     src/wideband/serialwb.h \
     src/wideband/wb-manager.h \
     src/wideband/wb-proto.h \
-    src/wblogger.h \
     src/widgets/commParamWidget.h \
     src/widgets/gauge_widget.h \
     src/widgets/hexEditor/qhexedit/chunks.h \

diff --git a/livemap_resource.rc b/livemap_resource.rc
@@ -1,8 +1,8 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-	FILEVERSION 1,010,1,0
-	PRODUCTVERSION 1,010,1,0
+	FILEVERSION 1,010,3,0
+	PRODUCTVERSION 1,010,3,0
 	FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 	FILEFLAGS VS_FF_DEBUG
@@ -19,11 +19,11 @@ VS_VERSION_INFO VERSIONINFO
 			BEGIN
 				VALUE "CompanyName", "\0"
 				VALUE "FileDescription", "\0"
-				VALUE "FileVersion", "1.010.1.0\0"
+				VALUE "FileVersion", "1.010.3.0\0"
 				VALUE "LegalCopyright", "\0"
 				VALUE "OriginalFilename", "livemap.exe\0"
 				VALUE "ProductName", "livemap\0"
-				VALUE "ProductVersion", "1.010.1.0\0"
+				VALUE "ProductVersion", "1.010.3.0\0"
 			END
 		END
 		BLOCK "VarFileInfo"

diff --git a/mainwindow.ui b/mainwindow.ui
@@ -124,7 +124,7 @@
        <bool>false</bool>
       </property>
       <property name="currentIndex">
-       <number>2</number>
+       <number>0</number>
       </property>
       <property name="elideMode">
        <enum>Qt::ElideRight</enum>

diff --git a/src/controller.cpp b/src/controller.cpp
@@ -40,7 +40,7 @@ void controller::start()
 
 void controller::setCommDevice(comm_device_interface *dev)
 {
-    qDebug() << "=========== controller::setCommDevice ================" << dev;
+    qDebug() << "=========== controller::setCommDevice ================" << dev << this->ECUproto;
     devComm = dev;
     //connect((pollHelper*)devComm, &pollHelper::readyRead, this, &controller::poll);
     this->ECUproto->setCommDev(&devComm);
@@ -58,9 +58,10 @@ void controller::setCommDevice(comm_device_interface *dev)
 
 void controller::setProto(DMA_proto *ECUproto)
 {
-    qDebug() << "=========== controller::setProto ================" << ECUproto;
+    qDebug() << "=========== controller::setProto ================"// << ECUproto
+                ;
     this->ECUproto = ECUproto;
-    //connect(ECUproto, &DMA_proto::logReady, this, &controller::logReady);
+    connect(ECUproto, &DMA_proto::logReady, this, &controller::logReady);
     //this->ECUproto->setCommDev(&devComm);
 }
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -5,11 +5,10 @@
 #include "deviceNativeFilter.h"
 #include "comm-device-interface/devicemanager.h"
 #include "DMA-proto/proto-manager.h"
-#include "wideband/wb-manager.h"
 #include "mainwindow.h"
 #include "controller.h"
-#include "wblogger.h"
-#include "widgets/gauge_widget.h"
+//#include "wblogger.h"
+#include "widgets/commParamWidget.h"
 
 #include <QElapsedTimer>
 
@@ -23,33 +22,19 @@ int main(int argc, char *argv[])
     qDebug() << QString("Version: %1").arg(GIT_VERSION);
 
     deviceNativeFilter usbFilter;
-    deviceManager devManager;
-    protoManager protoManager;
-    wbManager wbManager;
+    //========================================================================================
+    commParamWidget cpW;
+    //========================================================================================
     MainWindow mainWindow;
     controller controller;
-    //wbLogger wbLogger;
-    gaugeWidget wbWgt("         = Wideband =         ", 4);
-
-    QObject::connect(&devManager,   &deviceManager::tactrixArrived,   &wbManager,  &wbManager::addTactrix);
-
-    //QObject::connect(&wbManager,   &wbManager::wbSelected,            &wbLogger,   &wbLogger::setWB);
-    //QObject::connect(&wbManager,   &wbManager::protoSelected,         &wbLogger,   &wbLogger::setProto);
-    //QObject::connect(&wbManager,   &wbManager::wbStart,               &wbLogger,   &wbLogger::start_stop);
-    QObject::connect(&wbManager,   &wbManager::logReady,                &wbWgt,      &gaugeWidget::display);
-
-
-    //QObject::connect(&wbLogger,   &wbLogger::logReady,                &wbWgt,      &gaugeWidget::display);
-
+    //========================================================================================
+    QObject::connect(&cpW._protoManager, &protoManager::protoSelected,     &controller,     &controller::setProto);
+    QObject::connect(&cpW.devManager,    &deviceManager::deviceSelected,   &controller,     &controller::setCommDevice);
+    QObject::connect(&cpW._protoManager, &protoManager::logRateChanged,    &controller,     &controller::setLogRate);
+    QObject::connect(&usbFilter,         &deviceNativeFilter::deviceEvent, &cpW.devManager, &deviceManager::deviceEvent);
 
+cpW._protoManager.addProtos();   // костыль пока
 
-    //========================================================================================
-    QObject::connect(&usbFilter,    &deviceNativeFilter::deviceEvent, &devManager, &deviceManager::deviceEvent);
-    //========================================================================================
-    QObject::connect(&devManager,   &deviceManager::deviceSelected,   &controller, &controller::setCommDevice);
-    QObject::connect(&protoManager, &protoManager::protoSelected,     &controller, &controller::setProto);
-    QObject::connect(&protoManager, &protoManager::logRateChanged,    &controller, &controller::setLogRate);
-    //========================================================================================
     //========================================================================================
     QObject::connect(&mainWindow,   &MainWindow::connectECU,          &controller, &controller::connectECU);
     QObject::connect(&mainWindow,   &MainWindow::disConnectECU,       &controller, &controller::disConnectECU);
@@ -60,21 +45,11 @@ int main(int argc, char *argv[])
     QObject::connect(&mainWindow,   &MainWindow::resetRAM,            &controller, &controller::RAMreset);
     QObject::connect(&mainWindow,   &MainWindow::updateRAM,           &controller, &controller::updateRAM);
     //========================= logger ===============================================================
-    QObject::connect(&controller,   &controller::logReady,            &mainWindow, &MainWindow::dataLog//, Qt::DirectConnection
-                     );
+    QObject::connect(&controller,   &controller::logReady,            &mainWindow, &MainWindow::dataLog);
     //========================================================================================
     QObject::connect(&controller,   &controller::Log,                 &mainWindow, &MainWindow::Log);
 
-
-    wbManager.fillSerial();
-    wbManager.fillProto();
-
-    mainWindow.setProtoManager(&protoManager);
-
-    mainWindow.setDeviceManager(&devManager);
-
-    mainWindow.setWBManager(&wbManager);
-    mainWindow.setWidebandWidge(&wbWgt);
+    mainWindow.setCPW(&cpW);
 
     //Подписываемся на события
     usbFilter.notifyRegister((HWND)mainWindow.winId());

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -10,8 +10,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
     connect(_mainToolBar, &mainToolBar::s_ramReset, this, &MainWindow::resetRAM);
 
     //=============================================================================
-    cpW = new commParamWidget(this, 62500, 10);
-    ui->Settings->layout()->addWidget(cpW);
+    _mainToolBar->addWidget(&wbWgt);
+    _mainToolBar->addSeparator();
     //=============================================================================
     hexEdit = new hexEditor(this);
     ui->directHex->layout()->addWidget(hexEdit);
@@ -36,28 +36,18 @@ void MainWindow::closeEvent(QCloseEvent *event)
     emit _exit();
 }
 
-void MainWindow::setDeviceManager(deviceManager *devManager)
+void MainWindow::setCPW(commParamWidget *cpW)
 {
-    cpW->setDeviceManager(devManager);
-    connect(devManager, &deviceManager::deviceSelected, this, &MainWindow::deviceEvent);
-}
+    this->cpW = cpW;
+    ui->Settings->layout()->addWidget(cpW);
+    connect(&cpW->devManager, &deviceManager::deviceSelected, this, &MainWindow::deviceEvent);
 
-void MainWindow::setProtoManager(protoManager *protoManager)
-{
-    cpW->setProtoManager(protoManager);
-    //connect(protoManager, &deviceManager::deviceSelected, this, &MainWindow::deviceEvent);
-}
+    QObject::connect(&cpW->_wbManager,    &wbManager::logReady,             &wbWgt,          &gaugeWidget::display);
 
-void MainWindow::setWBManager(wbManager *wbManager)
-{
-    cpW->setWBManager(wbManager);
-    //connect(wbManager, &wbManager::deviceSelected, this, &MainWindow::deviceEvent);
-}
 
-void MainWindow::setWidebandWidge(gaugeWidget *wbWgt)
-{
-    _mainToolBar->addWidget(wbWgt);
-    _mainToolBar->addSeparator();
+
+    cpW->_wbManager.fillSerial();
+    cpW->_wbManager.fillProto();
 }
 
 void MainWindow::deviceEvent(comm_device_interface *devComm)
@@ -77,7 +67,7 @@ void MainWindow::StartButton_slot()
 {
     if (start_action == "Start")
     {
-        qDebug() << "MainWindow::StartButton_slot Start";
+        qDebug() << "MainWindow::StartButton_slot Start" << cpW;
 
         emit connectECU(cpW->baudRate);
     }

diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -25,15 +25,15 @@
 #include "widgets/maintoolbar.h"
 #include "widgets/gauge_widget.h"
 #include "widgets/commParamWidget.h"
+#include "widgets/mapWidget/mapwidget.h"
+#include "widgets/hexEditor/qhexedit/qhexedit.h"
+#include "widgets/hexEditor/hexeditor.h"
 
 
 #include "comm-device-interface/devicemanager.h"
 #include "DMA-proto/proto-manager.h"
 #include "wideband/wb-manager.h"
 
-#include "widgets/mapWidget/mapwidget.h"
-#include "widgets/hexEditor/qhexedit/qhexedit.h"
-#include "widgets/hexEditor/hexeditor.h"
 
 namespace Ui {
 class MainWindow;
@@ -53,13 +53,7 @@ class MainWindow : public QMainWindow
     void closeEvent(QCloseEvent *event);
 
 public slots:
-    void setDeviceManager(deviceManager *devManager);
-
-    void setProtoManager(protoManager *protoManager);
-
-    void setWBManager(wbManager *wbManager);
-
-    void setWidebandWidge(gaugeWidget *wbWgt);
+    void setCPW(commParamWidget *cpW);
 
     void deviceEvent(comm_device_interface *devComm);
 
@@ -87,7 +81,7 @@ private slots:
 
     //======================== widget's =================================
     hexEditor *hexEdit;
-    gaugeWidget *tactrix_afr_lcd = nullptr;
+    gaugeWidget wbWgt{"           = Wideband =           ", 4};
     //======================== widget lists =================================
     QSet<gaugeWidget*> gauge_widget_set;
 

diff --git a/src/wblogger.cpp b/src/wblogger.cpp
diff --git a/src/wblogger.h b/src/wblogger.h
diff --git a/src/wideband/aemProto.cpp b/src/wideband/aemProto.cpp
@@ -9,5 +9,6 @@ QString aemProto::handleWB(QByteArray a)
 {
     a.chop(2);
     emit logReady(a);
+    //emit logReady("test\n\n");
     return a;
 }