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

Remove toolbar checked status

Browse Source
This commit is contained in:
dreamsourcelabTAI 2023-03-14 17:01:59 +08:00
parent 0133c8a964
commit 4fc8adf5ad
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
DSView/pv/mainwindow.cpp
View File

@ -202,12 +202,11 @@ namespace pv
_search_dock->setWidget(_search_widget); _search_dock->setWidget(_search_widget);
addDockWidget(Qt::RightDockWidgetArea, _protocol_dock); addDockWidget(Qt::RightDockWidgetArea, _protocol_dock);
addDockWidget(Qt::RightDockWidgetArea, _trigger_dock); addDockWidget(Qt::RightDockWidgetArea, _trigger_dock);
addDockWidget(Qt::RightDockWidgetArea, _dso_trigger_dock); addDockWidget(Qt::RightDockWidgetArea, _dso_trigger_dock);
addDockWidget(Qt::RightDockWidgetArea, _measure_dock); addDockWidget(Qt::RightDockWidgetArea, _measure_dock);
addDockWidget(Qt::BottomDockWidgetArea, _search_dock); addDockWidget(Qt::BottomDockWidgetArea, _search_dock);
// Set the title // Set the title
QString title = QApplication::applicationName() + " v" + QApplication::applicationVersion(); QString title = QApplication::applicationName() + " v" + QApplication::applicationVersion();
setWindowTitle(QApplication::translate("MainWindow", title.toLocal8Bit().data(), 0)); setWindowTitle(QApplication::translate("MainWindow", title.toLocal8Bit().data(), 0));
@ -785,22 +784,18 @@ namespace pv
GVariant *gvar = NULL; GVariant *gvar = NULL;
int id = 0; int id = 0;
//dsv_info("read key:'%s'", info->name);
if (info->datatype == SR_T_BOOL){ if (info->datatype == SR_T_BOOL){
gvar = g_variant_new_boolean(sessionObj[info->name].toInt()); gvar = g_variant_new_boolean(sessionObj[info->name].toInt());
} }
else if (info->datatype == SR_T_UINT64){ else if (info->datatype == SR_T_UINT64){
//from string text. //from string text.
gvar = g_variant_new_uint64(sessionObj[info->name].toString().toULongLong()); gvar = g_variant_new_uint64(sessionObj[info->name].toString().toULongLong());
//dsv_info("uint64:'%s',%llu", info->name, g_variant_get_uint64(gvar));
} }
else if (info->datatype == SR_T_UINT8){ else if (info->datatype == SR_T_UINT8){
if (sessionObj[info->name].toString() != "") if (sessionObj[info->name].toString() != "")
gvar = g_variant_new_byte(sessionObj[info->name].toString().toUInt()); gvar = g_variant_new_byte(sessionObj[info->name].toString().toUInt());
else else
gvar = g_variant_new_byte(sessionObj[info->name].toInt()); gvar = g_variant_new_byte(sessionObj[info->name].toInt());
//dsv_info("uint8:'%s',%d", info->name,g_variant_get_byte(gvar));
} }
else if (info->datatype == SR_T_INT16){ else if (info->datatype == SR_T_INT16){
gvar = g_variant_new_int16(sessionObj[info->name].toInt()); gvar = g_variant_new_int16(sessionObj[info->name].toInt());
@ -809,8 +804,7 @@ namespace pv
if (sessionObj[info->name].toString() != "") if (sessionObj[info->name].toString() != "")
gvar = g_variant_new_double(sessionObj[info->name].toString().toDouble()); gvar = g_variant_new_double(sessionObj[info->name].toString().toDouble());
else else
gvar = g_variant_new_double(sessionObj[info->name].toDouble()); gvar = g_variant_new_double(sessionObj[info->name].toDouble());
//dsv_info("float:'%s',%f", info->name,g_variant_get_double(gvar));
} }
else if (info->datatype == SR_T_CHAR){ else if (info->datatype == SR_T_CHAR){
gvar = g_variant_new_string(sessionObj[info->name].toString().toLocal8Bit().data()); gvar = g_variant_new_string(sessionObj[info->name].toString().toLocal8Bit().data());
@ -1070,7 +1064,7 @@ namespace pv
} }
void MainWindow::restore_dock() void MainWindow::restore_dock()
{ {
// default dockwidget size // default dockwidget size
AppConfig &app = AppConfig::Instance(); AppConfig &app = AppConfig::Instance();
QByteArray st = app._frameOptions.windowState; QByteArray st = app._frameOptions.windowState;
@ -1085,6 +1079,10 @@ namespace pv
MsgBox::Show(NULL, L_S(STR_PAGE_MSG, S_ID(IDS_MSG_RE_WIN_ST_ER), "restore window status error!")); MsgBox::Show(NULL, L_S(STR_PAGE_MSG, S_ID(IDS_MSG_RE_WIN_ST_ER), "restore window status error!"));
} }
} }
// Resotre the dock pannel.
if (_device_agent->have_instance())
_trig_bar->reload();
} }
bool MainWindow::eventFilter(QObject *object, QEvent *event) bool MainWindow::eventFilter(QObject *object, QEvent *event)

2
DSView/pv/toolbars/trigbar.cpp
View File

@ -223,7 +223,7 @@ void TrigBar::search_clicked()
} }
void TrigBar::reload() void TrigBar::reload()
{ {
int mode = _session->get_device()->get_work_mode(); int mode = _session->get_device()->get_work_mode();
if (mode == LOGIC) { if (mode == LOGIC) {