SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Enable the toolbar when it capturing on DSO mode

Browse Source
This commit is contained in:
dreamsourcelabTAI
2023-03-27 18:57:29 +08:00
parent 1bf5e50f32
commit 42dd9cfd58
5 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DSView/pv/mainwindow.cpp
View File

@@ -1696,7 +1696,7 @@ namespace pv
case DSV_MSG_DEVICE_OPTIONS_UPDATED:
_trigger_widget->device_updated();
_measure_widget->reload();
_view->check_calibration();
_view->check_calibration();
break;
case DSV_MSG_DEVICE_DURATION_UPDATED:

6
DSView/pv/sigsession.h
View File

@@ -175,6 +175,12 @@ public:
double cur_snap_sampletime();
double cur_view_time();
inline bool re_start(){
if (_is_working)
stop_capture();
start_capture(_is_instant);
}
inline void set_session_time(QDateTime time){
_session_time = time;
}

9
DSView/pv/toolbars/samplingbar.cpp
View File

@@ -1173,10 +1173,6 @@ namespace pv
int mode = _session->get_device()->get_work_mode();
_device_type.setEnabled(bEnable);
_configure_button.setEnabled(bEnable);
_mode_button.setEnabled(bEnable);
_device_type.setEnabled(bEnable);
_mode_button.setEnabled(bEnable);
_configure_button.setEnabled(bEnable);
_device_selector.setEnabled(bEnable);
@@ -1188,6 +1184,11 @@ namespace pv
else if (mode == DSO){
_sample_rate.setEnabled(false);
_sample_count.setEnabled(bEnable);
if (_session->is_working() && _session->is_instant() == false)
{
_sample_count.setEnabled(true);
}
}
else{
_sample_rate.setEnabled(bEnable);

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

@@ -331,6 +331,15 @@ void TrigBar::on_actionLissajous_triggered()
_search_button.setEnabled(bEnable);
_function_button.setEnabled(bEnable);
_setting_button.setEnabled(bEnable);
if (_session->is_working() && _session->get_device()->get_work_mode() == DSO){
if (_session->is_instant() == false){
_trig_button.setEnabled(true);
_measure_button.setEnabled(true);
_function_button.setEnabled(true);
_setting_button.setEnabled(true);
}
}
}
} // namespace toolbars

2
DSView/pv/view/dsosignal.cpp
View File

@@ -1156,7 +1156,7 @@ void DsoSignal::paint_type_options(QPainter &p, int right, const QPoint pt, QCol
}
bool DsoSignal::mouse_press(int right, const QPoint pt)
{
{
int y = get_y();
const QRectF vDial_rect = get_rect(DSO_VDIAL, y, right);
const QRectF chEn_rect = get_rect(DSO_CHEN, y, right);