src:fix hexviewer

Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>
QQxiaoming · Oct 18, 2023 · 3b1e115 · 3b1e115
1 parent 1cd7446
commit 3b1e115
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/hexviewwindow.cpp b/src/hexviewwindow.cpp
@@ -19,6 +19,7 @@
  */
 #include <QMessageBox>
 #include <QScrollBar>
+#include <QMutexLocker>
 #include "hexviewwindow.h"
 #include "ui_hexviewwindow.h"
 
@@ -71,6 +72,7 @@ HexViewWindow::~HexViewWindow()
 void HexViewWindow::setFont(const QFont &font)
 {
     ui->textEditHEX->setFont(font);
+    ui->textEditASCII->setFont(font);
 }
 
 void HexViewWindow::buttonBoxAccepted(void)
@@ -94,6 +96,7 @@ void HexViewWindow::buttonBoxRejected(void)
 
 void HexViewWindow::recvData(const char *data,int size)
 {
+    QMutexLocker locker(&m_mutex);
     auto insertPlainText = [&](const char *data,int size){
         if(size > 0) {
             QByteArray ba(data,size);

diff --git a/src/hexviewwindow.h b/src/hexviewwindow.h
@@ -23,6 +23,7 @@
 #include <QDialog>
 #include <QHideEvent>
 #include <QFont>
+#include <QMutex>
 
 namespace Ui {
 class HexViewWindow;
@@ -60,6 +61,7 @@ private slots:
 private:
     Ui::HexViewWindow *ui;
     int m_type;
+    QMutex m_mutex;
 };
 
 #endif // HEXVIEWWINDOWS_H
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -389,6 +389,11 @@ MainWidgetGroup* MainWindow::findCurrentFocusGroup(void) {
             return mainWidgetGroup;
         }
     }
+    foreach(MainWidgetGroup *mainWidgetGroup, mainWidgetGroupList) {
+        if(mainWidgetGroup->sessionTab->count() != 0) {
+            return mainWidgetGroup;
+        }
+    }
     return mainWidgetGroupList[0];
 }
 
@@ -1056,8 +1061,19 @@ void MainWindow::menuAndToolBarConnectSignals(void) {
         }
     );
     connect(hexViewAction,&QAction::triggered,this,[=](){
-        if(hexViewAction->isChecked())
+        if(hexViewAction->isChecked()) {
             hexViewWindow->show();
+            QTermWidget *termWidget = findCurrentFocusTermWidget();
+            if(termWidget == nullptr) return;
+            foreach(SessionsWindow *sessionsWindow, sessionList) {
+                disconnect(sessionsWindow,SIGNAL(hexDataDup(const char*,int)),
+                            hexViewWindow,SLOT(recvData(const char*,int)));
+                if(sessionsWindow->getTermWidget() == termWidget) {
+                    connect(sessionsWindow,SIGNAL(hexDataDup(const char*,int)),
+                            hexViewWindow,SLOT(recvData(const char*,int)));
+                }
+            }
+        }
         else
             hexViewWindow->hide();
     });