2
0
forked from Ivasoft/DSView

fix: The Scope can't auto calibration success

This commit is contained in:
dreamsourcelabTAI
2023-03-20 19:15:09 +08:00
parent 2a5e4afa8f
commit bacbcbe1d5
4 changed files with 10 additions and 3 deletions

View File

@@ -93,6 +93,11 @@ WaitingDialog::WaitingDialog(QWidget *parent, SigSession *session, int key) :
setTitle(L_S(STR_PAGE_DLG, S_ID(IDS_DLG_AUTO_CALIBRATION), "Auto Calibration"));
}
WaitingDialog::~WaitingDialog()
{
}
void WaitingDialog::accept()
{
using namespace Qt;

View File

@@ -54,6 +54,8 @@ private:
public:
WaitingDialog(QWidget *parent, SigSession *session, int key);
~WaitingDialog();
int start();
protected:

View File

@@ -689,7 +689,7 @@ namespace pv
s_obj["type"] = s->get_type();
s_obj["enabled"] = s->enabled();
s_obj["name"] = s->get_name();
if (s->get_colour().isValid())
s_obj["colour"] = QJsonValue::fromVariant(s->get_colour());
else
@@ -1638,7 +1638,6 @@ namespace pv
break;
case DSV_MSG_END_COLLECT_WORK:
_session->device_event_object()->device_updated();
update_toolbar_view_status();
break;
@@ -1660,6 +1659,7 @@ namespace pv
reset_all_view();
_logo_bar->dsl_connected(_session->get_device()->is_hardware());
update_toolbar_view_status();
_session->device_event_object()->device_updated();
if (_device_agent->is_file())
{

View File

@@ -336,7 +336,7 @@ namespace pv
commit_hori_res();
if (_session->is_working() == false)
_session->start_capture(true);
_session->start_capture(false);
pv::dialogs::WaitingDialog wait(this, _session, SR_CONF_ZERO);
if (wait.start() == QDialog::Rejected)