Skip to content

Commit af2e434

Browse files
KangLinKangLin
committed
FIX: DockDebugLog core dump
1 parent c79973f commit af2e434

39 files changed

+629
-965
lines changed

‎Src/Log/DockDebugLog.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,15 @@ CDockDebugLog::CDockDebugLog(QWidget *parent) :
1616
ui->setupUi(this);
1717
this->hide();
1818

19-
connect(this, &QDockWidget::visibilityChanged, this, [=](bool visible) {
19+
bool check = connect(this, &QDockWidget::visibilityChanged, this, [=](bool visible) {
2020
if (visible) {
2121
ui->txtDebugLog->horizontalScrollBar()->setValue(0);
2222
}
2323
});
24+
Q_ASSERT(check);
25+
check = connect(this, SIGNAL(sigAddLog(QString)),
26+
this, SLOT(slotAddLog(QString)));
27+
Q_ASSERT(check);
2428

2529
QSettings set(RabbitCommon::CDir::Instance()->GetFileUserConfigure(),
2630
QSettings::IniFormat);
@@ -98,7 +102,7 @@ CDockDebugLog::~CDockDebugLog()
98102
delete ui;
99103
}
100104

101-
int CDockDebugLog::AddLog(const QString &szLog)
105+
int CDockDebugLog::slotAddLog(const QString &szLog)
102106
{
103107
ui->txtDebugLog->appendPlainText(szLog);
104108
return 0;

‎Src/Log/DockDebugLog.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,12 @@ class CDockDebugLog : public QDockWidget
1919
public:
2020
explicit CDockDebugLog(QWidget *parent = nullptr);
2121
virtual ~CDockDebugLog();
22+
23+
Q_SIGNALS:
24+
void sigAddLog(const QString& szLog);
2225

23-
int AddLog(const QString& szLog);
26+
private Q_SLOTS:
27+
int slotAddLog(const QString& szLog);
2428

2529
private:
2630
Ui::CDockDebugLog *ui;

‎Src/Log/Log.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,7 @@ int CLog::Print(const char *pszFile, int nLine, const char* pszFunction, int nLe
495495
//std::cout << szTemp;
496496
#ifdef HAVE_RABBITCOMMON_GUI
497497
if(g_pDcokDebugLog)
498-
g_pDcokDebugLog->AddLog(szTemp.c_str());
498+
emit g_pDcokDebugLog->sigAddLog(szTemp.c_str());
499499
#endif
500500
qDebug() << szTemp.c_str();
501501

@@ -537,7 +537,7 @@ void CLog::myMessageOutput(QtMsgType type,
537537

538538
#ifdef HAVE_RABBITCOMMON_GUI
539539
if(g_pDcokDebugLog)
540-
g_pDcokDebugLog->AddLog(szMsg);
540+
emit g_pDcokDebugLog->sigAddLog(szMsg);
541541
#endif
542542

543543
/*

‎Src/Resource/Translations/RabbitCommon_ar.ts

+17-27
Original file line numberDiff line numberDiff line change
@@ -162,31 +162,31 @@
162162
<context>
163163
<name>CDockDebugLog</name>
164164
<message>
165-
<location filename="../../Log/DockDebugLog.cpp" line="34"/>
165+
<location filename="../../Log/DockDebugLog.cpp" line="38"/>
166166
<source>Tools</source>
167167
<translation type="unfinished"></translation>
168168
</message>
169169
<message>
170-
<location filename="../../Log/DockDebugLog.cpp" line="37"/>
171-
<location filename="../../Log/DockDebugLog.cpp" line="50"/>
172-
<location filename="../../Log/DockDebugLog.cpp" line="56"/>
173-
<location filename="../../Log/DockDebugLog.cpp" line="73"/>
170+
<location filename="../../Log/DockDebugLog.cpp" line="41"/>
171+
<location filename="../../Log/DockDebugLog.cpp" line="54"/>
172+
<location filename="../../Log/DockDebugLog.cpp" line="60"/>
173+
<location filename="../../Log/DockDebugLog.cpp" line="77"/>
174174
<source>Wrap</source>
175175
<translation type="unfinished"></translation>
176176
</message>
177177
<message>
178-
<location filename="../../Log/DockDebugLog.cpp" line="45"/>
178+
<location filename="../../Log/DockDebugLog.cpp" line="49"/>
179179
<source>Clear</source>
180180
<translation type="unfinished"></translation>
181181
</message>
182182
<message>
183-
<location filename="../../Log/DockDebugLog.cpp" line="59"/>
184-
<location filename="../../Log/DockDebugLog.cpp" line="68"/>
183+
<location filename="../../Log/DockDebugLog.cpp" line="63"/>
184+
<location filename="../../Log/DockDebugLog.cpp" line="72"/>
185185
<source>No wrap</source>
186186
<translation type="unfinished"></translation>
187187
</message>
188188
<message>
189-
<location filename="../../Log/DockDebugLog.cpp" line="85"/>
189+
<location filename="../../Log/DockDebugLog.cpp" line="89"/>
190190
<source>Open log folder</source>
191191
<translation type="unfinished"></translation>
192192
</message>
@@ -920,47 +920,37 @@
920920
<translation type="unfinished"></translation>
921921
</message>
922922
<message>
923-
<location filename="../../RabbitCommonTools.cpp" line="431"/>
924-
<location filename="../../RabbitCommonTools.cpp" line="441"/>
923+
<location filename="../../RabbitCommonTools.cpp" line="438"/>
924+
<location filename="../../RabbitCommonTools.cpp" line="448"/>
925925
<source>Style</source>
926926
<translation type="unfinished"></translation>
927927
</message>
928928
<message>
929-
<location filename="../../RabbitCommonTools.cpp" line="451"/>
929+
<location filename="../../RabbitCommonTools.cpp" line="458"/>
930930
<source>Log</source>
931931
<translation type="unfinished"></translation>
932932
</message>
933933
<message>
934-
<location filename="../../RabbitCommonTools.cpp" line="455"/>
935-
<location filename="../../Log/DockDebugLog.cpp" line="82"/>
934+
<location filename="../../RabbitCommonTools.cpp" line="462"/>
935+
<location filename="../../Log/DockDebugLog.cpp" line="86"/>
936936
<source>Open Log configure file</source>
937937
<translation type="unfinished"></translation>
938938
</message>
939939
<message>
940-
<location filename="../../RabbitCommonTools.cpp" line="458"/>
940+
<location filename="../../RabbitCommonTools.cpp" line="465"/>
941941
<source>Open Log file</source>
942942
<translation type="unfinished"></translation>
943943
</message>
944944
<message>
945-
<location filename="../../RabbitCommonTools.cpp" line="461"/>
945+
<location filename="../../RabbitCommonTools.cpp" line="468"/>
946946
<source>Open log folder</source>
947947
<translation type="unfinished"></translation>
948948
</message>
949949
<message>
950-
<location filename="../../RabbitCommonTools.cpp" line="479"/>
950+
<location filename="../../RabbitCommonTools.cpp" line="486"/>
951951
<source>Log dock</source>
952952
<translation type="unfinished"></translation>
953953
</message>
954-
<message>
955-
<location filename="../../CoreDump/QMiniDumper.cpp" line="55"/>
956-
<source>Application Error</source>
957-
<translation type="unfinished"></translation>
958-
</message>
959-
<message>
960-
<location filename="../../CoreDump/QMiniDumper.cpp" line="56"/>
961-
<source>I&apos;m Sorry, Application is Crash! The path: </source>
962-
<translation type="unfinished"></translation>
963-
</message>
964954
</context>
965955
<context>
966956
<name>RabbitCommon::CDownloadFile</name>

‎Src/Resource/Translations/RabbitCommon_ca.ts

+17-27
Original file line numberDiff line numberDiff line change
@@ -162,31 +162,31 @@
162162
<context>
163163
<name>CDockDebugLog</name>
164164
<message>
165-
<location filename="../../Log/DockDebugLog.cpp" line="34"/>
165+
<location filename="../../Log/DockDebugLog.cpp" line="38"/>
166166
<source>Tools</source>
167167
<translation type="unfinished"></translation>
168168
</message>
169169
<message>
170-
<location filename="../../Log/DockDebugLog.cpp" line="37"/>
171-
<location filename="../../Log/DockDebugLog.cpp" line="50"/>
172-
<location filename="../../Log/DockDebugLog.cpp" line="56"/>
173-
<location filename="../../Log/DockDebugLog.cpp" line="73"/>
170+
<location filename="../../Log/DockDebugLog.cpp" line="41"/>
171+
<location filename="../../Log/DockDebugLog.cpp" line="54"/>
172+
<location filename="../../Log/DockDebugLog.cpp" line="60"/>
173+
<location filename="../../Log/DockDebugLog.cpp" line="77"/>
174174
<source>Wrap</source>
175175
<translation type="unfinished"></translation>
176176
</message>
177177
<message>
178-
<location filename="../../Log/DockDebugLog.cpp" line="45"/>
178+
<location filename="../../Log/DockDebugLog.cpp" line="49"/>
179179
<source>Clear</source>
180180
<translation type="unfinished"></translation>
181181
</message>
182182
<message>
183-
<location filename="../../Log/DockDebugLog.cpp" line="59"/>
184-
<location filename="../../Log/DockDebugLog.cpp" line="68"/>
183+
<location filename="../../Log/DockDebugLog.cpp" line="63"/>
184+
<location filename="../../Log/DockDebugLog.cpp" line="72"/>
185185
<source>No wrap</source>
186186
<translation type="unfinished"></translation>
187187
</message>
188188
<message>
189-
<location filename="../../Log/DockDebugLog.cpp" line="85"/>
189+
<location filename="../../Log/DockDebugLog.cpp" line="89"/>
190190
<source>Open log folder</source>
191191
<translation type="unfinished"></translation>
192192
</message>
@@ -920,47 +920,37 @@
920920
<translation type="unfinished"></translation>
921921
</message>
922922
<message>
923-
<location filename="../../RabbitCommonTools.cpp" line="431"/>
924-
<location filename="../../RabbitCommonTools.cpp" line="441"/>
923+
<location filename="../../RabbitCommonTools.cpp" line="438"/>
924+
<location filename="../../RabbitCommonTools.cpp" line="448"/>
925925
<source>Style</source>
926926
<translation type="unfinished"></translation>
927927
</message>
928928
<message>
929-
<location filename="../../RabbitCommonTools.cpp" line="451"/>
929+
<location filename="../../RabbitCommonTools.cpp" line="458"/>
930930
<source>Log</source>
931931
<translation type="unfinished"></translation>
932932
</message>
933933
<message>
934-
<location filename="../../RabbitCommonTools.cpp" line="455"/>
935-
<location filename="../../Log/DockDebugLog.cpp" line="82"/>
934+
<location filename="../../RabbitCommonTools.cpp" line="462"/>
935+
<location filename="../../Log/DockDebugLog.cpp" line="86"/>
936936
<source>Open Log configure file</source>
937937
<translation type="unfinished"></translation>
938938
</message>
939939
<message>
940-
<location filename="../../RabbitCommonTools.cpp" line="458"/>
940+
<location filename="../../RabbitCommonTools.cpp" line="465"/>
941941
<source>Open Log file</source>
942942
<translation type="unfinished"></translation>
943943
</message>
944944
<message>
945-
<location filename="../../RabbitCommonTools.cpp" line="461"/>
945+
<location filename="../../RabbitCommonTools.cpp" line="468"/>
946946
<source>Open log folder</source>
947947
<translation type="unfinished"></translation>
948948
</message>
949949
<message>
950-
<location filename="../../RabbitCommonTools.cpp" line="479"/>
950+
<location filename="../../RabbitCommonTools.cpp" line="486"/>
951951
<source>Log dock</source>
952952
<translation type="unfinished"></translation>
953953
</message>
954-
<message>
955-
<location filename="../../CoreDump/QMiniDumper.cpp" line="55"/>
956-
<source>Application Error</source>
957-
<translation type="unfinished"></translation>
958-
</message>
959-
<message>
960-
<location filename="../../CoreDump/QMiniDumper.cpp" line="56"/>
961-
<source>I&apos;m Sorry, Application is Crash! The path: </source>
962-
<translation type="unfinished"></translation>
963-
</message>
964954
</context>
965955
<context>
966956
<name>RabbitCommon::CDownloadFile</name>

‎Src/Resource/Translations/RabbitCommon_cs.ts

+17-27
Original file line numberDiff line numberDiff line change
@@ -162,31 +162,31 @@
162162
<context>
163163
<name>CDockDebugLog</name>
164164
<message>
165-
<location filename="../../Log/DockDebugLog.cpp" line="34"/>
165+
<location filename="../../Log/DockDebugLog.cpp" line="38"/>
166166
<source>Tools</source>
167167
<translation type="unfinished"></translation>
168168
</message>
169169
<message>
170-
<location filename="../../Log/DockDebugLog.cpp" line="37"/>
171-
<location filename="../../Log/DockDebugLog.cpp" line="50"/>
172-
<location filename="../../Log/DockDebugLog.cpp" line="56"/>
173-
<location filename="../../Log/DockDebugLog.cpp" line="73"/>
170+
<location filename="../../Log/DockDebugLog.cpp" line="41"/>
171+
<location filename="../../Log/DockDebugLog.cpp" line="54"/>
172+
<location filename="../../Log/DockDebugLog.cpp" line="60"/>
173+
<location filename="../../Log/DockDebugLog.cpp" line="77"/>
174174
<source>Wrap</source>
175175
<translation type="unfinished"></translation>
176176
</message>
177177
<message>
178-
<location filename="../../Log/DockDebugLog.cpp" line="45"/>
178+
<location filename="../../Log/DockDebugLog.cpp" line="49"/>
179179
<source>Clear</source>
180180
<translation type="unfinished"></translation>
181181
</message>
182182
<message>
183-
<location filename="../../Log/DockDebugLog.cpp" line="59"/>
184-
<location filename="../../Log/DockDebugLog.cpp" line="68"/>
183+
<location filename="../../Log/DockDebugLog.cpp" line="63"/>
184+
<location filename="../../Log/DockDebugLog.cpp" line="72"/>
185185
<source>No wrap</source>
186186
<translation type="unfinished"></translation>
187187
</message>
188188
<message>
189-
<location filename="../../Log/DockDebugLog.cpp" line="85"/>
189+
<location filename="../../Log/DockDebugLog.cpp" line="89"/>
190190
<source>Open log folder</source>
191191
<translation type="unfinished"></translation>
192192
</message>
@@ -920,47 +920,37 @@
920920
<translation type="unfinished"></translation>
921921
</message>
922922
<message>
923-
<location filename="../../RabbitCommonTools.cpp" line="431"/>
924-
<location filename="../../RabbitCommonTools.cpp" line="441"/>
923+
<location filename="../../RabbitCommonTools.cpp" line="438"/>
924+
<location filename="../../RabbitCommonTools.cpp" line="448"/>
925925
<source>Style</source>
926926
<translation type="unfinished"></translation>
927927
</message>
928928
<message>
929-
<location filename="../../RabbitCommonTools.cpp" line="451"/>
929+
<location filename="../../RabbitCommonTools.cpp" line="458"/>
930930
<source>Log</source>
931931
<translation type="unfinished"></translation>
932932
</message>
933933
<message>
934-
<location filename="../../RabbitCommonTools.cpp" line="455"/>
935-
<location filename="../../Log/DockDebugLog.cpp" line="82"/>
934+
<location filename="../../RabbitCommonTools.cpp" line="462"/>
935+
<location filename="../../Log/DockDebugLog.cpp" line="86"/>
936936
<source>Open Log configure file</source>
937937
<translation type="unfinished"></translation>
938938
</message>
939939
<message>
940-
<location filename="../../RabbitCommonTools.cpp" line="458"/>
940+
<location filename="../../RabbitCommonTools.cpp" line="465"/>
941941
<source>Open Log file</source>
942942
<translation type="unfinished"></translation>
943943
</message>
944944
<message>
945-
<location filename="../../RabbitCommonTools.cpp" line="461"/>
945+
<location filename="../../RabbitCommonTools.cpp" line="468"/>
946946
<source>Open log folder</source>
947947
<translation type="unfinished"></translation>
948948
</message>
949949
<message>
950-
<location filename="../../RabbitCommonTools.cpp" line="479"/>
950+
<location filename="../../RabbitCommonTools.cpp" line="486"/>
951951
<source>Log dock</source>
952952
<translation type="unfinished"></translation>
953953
</message>
954-
<message>
955-
<location filename="../../CoreDump/QMiniDumper.cpp" line="55"/>
956-
<source>Application Error</source>
957-
<translation type="unfinished"></translation>
958-
</message>
959-
<message>
960-
<location filename="../../CoreDump/QMiniDumper.cpp" line="56"/>
961-
<source>I&apos;m Sorry, Application is Crash! The path: </source>
962-
<translation type="unfinished"></translation>
963-
</message>
964954
</context>
965955
<context>
966956
<name>RabbitCommon::CDownloadFile</name>

0 commit comments

Comments
 (0)