Embedded/DSView
1
0
Fork 0
mirror of https://github.com/DreamSourceLab/DSView.git synced 2025-01-23 13:42:55 +08:00
Code Issues Projects Releases Wiki Activity

Print the init log info

Browse Source
This commit is contained in:
dreamsourcelabTAI 2023-02-23 10:47:32 +08:00
parent cff9b43e68
commit 1aba1a4e4b
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
DSView/main.cpp
View File

@ -38,8 +38,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif #endif
void usage() void usage()
{ {
@ -53,7 +52,7 @@ void usage()
" -s, --storelog Save log to locale file\n" " -s, --storelog Save log to locale file\n"
" -h, -?, --help Show help option\n" " -h, -?, --help Show help option\n"
"\n", DS_BIN_NAME, DS_DESCRIPTION); "\n", DS_BIN_NAME, DS_DESCRIPTION);
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -213,8 +212,7 @@ bool bHighScale = true;
//init core //init core
if (!control->Init()){ if (!control->Init()){
dsv_err("%s", "init error!"); dsv_err("%s", "init error!");
dsv_err("%s", control->GetLastError());
return 1; return 1;
} }
@ -231,6 +229,8 @@ bool bHighScale = true;
w.show_doc(); //to show the dailog for open help document w.show_doc(); //to show the dailog for open help document
ret = a.exec(); //Run the application ret = a.exec(); //Run the application
control->Stop(); control->Stop();
dsv_info("Main window closed.");
} }
catch (const std::exception &e) catch (const std::exception &e)
{ {
@ -242,7 +242,9 @@ bool bHighScale = true;
control->UnInit(); //uninit control->UnInit(); //uninit
control->Destroy(); control->Destroy();
dsv_log_uninit(); dsv_info("Uninit log.");
dsv_log_uninit();
return ret; return ret;
} }

11
DSView/pv/appcontrol.cpp
View File

@ -91,15 +91,15 @@ bool AppControl::Init()
// Initialise libsigrokdecode // Initialise libsigrokdecode
if (srd_init(path) != SRD_OK) if (srd_init(path) != SRD_OK)
{ {
m_error = "ERROR: libsigrokdecode init failed."; dsv_err("%s", "ERROR: libsigrokdecode init failed.");
return false; return false;
} }
// Load the protocol decoders // Load the protocol decoders
if (srd_decoder_load_all() != SRD_OK) if (srd_decoder_load_all() != SRD_OK)
{ {
m_error = "ERROR: load the protocol decoders failed."; dsv_err("ERROR: load the protocol decoders failed.");
return false; return false;
} }
@ -125,11 +125,6 @@ void AppControl::UnInit()
_session->uninit(); _session->uninit();
} }
const char *AppControl::GetLastError()
{
return m_error.c_str();
}
bool AppControl::TopWindowIsMaximized() bool AppControl::TopWindowIsMaximized()
{ {
if (_topWindow != NULL){ if (_topWindow != NULL){

7
DSView/pv/appcontrol.h
View File

@ -48,9 +48,7 @@ public:
void Stop(); void Stop();
void UnInit(); void UnInit();
const char* GetLastError();
inline pv::SigSession* GetSession(){ inline pv::SigSession* GetSession(){
return _session; return _session;
@ -69,8 +67,7 @@ public:
public: public:
std::string _open_file_name; std::string _open_file_name;
private: private:
std::string m_error;
pv::SigSession *_session; pv::SigSession *_session;
QWidget *_topWindow; QWidget *_topWindow;
}; };