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

fix: Cannot add measure cursor again after removed.

Browse Source
This commit is contained in:
dreamsourcelabTAI
2023-06-07 11:24:55 +08:00
parent b53ae35da2
commit 8dd2fcb0d3
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
DSView/pv/dock/measuredock.cpp
View File

@@ -325,7 +325,8 @@ void MeasureDock::goto_cursor()
void MeasureDock::add_dist_measure() void MeasureDock::add_dist_measure()
{ {
if (_dist_row_widget_vec.size() > Max_Measure_Limits) int num = _dist_row_widget_vec.size();
if (num > Max_Measure_Limits)
return; return;
QWidget *row_widget = new QWidget(_widget); QWidget *row_widget = new QWidget(_widget);
@@ -384,7 +385,7 @@ void MeasureDock::del_dist_measure()
_dist_s_btn_vec.remove(del_index); _dist_s_btn_vec.remove(del_index);
_dist_e_btn_vec.remove(del_index); _dist_e_btn_vec.remove(del_index);
_dist_r_label_vec.remove(del_index); _dist_r_label_vec.remove(del_index);
_dist_row_widget_vec.remove(del_index); _dist_row_widget_vec.erase(_dist_row_widget_vec.begin() + del_index);
break; break;
} }
@@ -394,7 +395,8 @@ void MeasureDock::del_dist_measure()
void MeasureDock::add_edge_measure() void MeasureDock::add_edge_measure()
{ {
if (_edge_row_widget_vec.size() > Max_Measure_Limits) int num = _edge_row_widget_vec.size();
if (num > Max_Measure_Limits)
return; return;
QWidget *row_widget = new QWidget(_widget); QWidget *row_widget = new QWidget(_widget);
@@ -445,7 +447,6 @@ void MeasureDock::add_edge_measure()
row_layout->addWidget(r_label, 100); row_layout->addWidget(r_label, 100);
_edge_layout->addWidget(row_widget, _edge_row_widget_vec.size(), 0, 1, 7); _edge_layout->addWidget(row_widget, _edge_row_widget_vec.size(), 0, 1, 7);
} }
void MeasureDock::del_edge_measure() void MeasureDock::del_edge_measure()
@@ -462,7 +463,7 @@ void MeasureDock::del_edge_measure()
_edge_e_btn_vec.remove(del_index); _edge_e_btn_vec.remove(del_index);
_edge_r_label_vec.remove(del_index); _edge_r_label_vec.remove(del_index);
_edge_ch_cmb_vec.remove(del_index); _edge_ch_cmb_vec.remove(del_index);
_edge_row_widget_vec.remove(del_index); _edge_row_widget_vec.erase(_edge_row_widget_vec.begin() + del_index);
break; break;
} }

4
DSView/pv/dock/measuredock.h
View File

@@ -116,7 +116,7 @@ private:
QGridLayout *_dist_layout; QGridLayout *_dist_layout;
QGroupBox *_dist_groupBox; QGroupBox *_dist_groupBox;
QToolButton *_dist_add_btn; QToolButton *_dist_add_btn;
QVector<QWidget *> _dist_row_widget_vec; std::vector<QWidget *> _dist_row_widget_vec;
QVector<QToolButton *> _dist_del_btn_vec; QVector<QToolButton *> _dist_del_btn_vec;
QVector<QPushButton *> _dist_s_btn_vec; QVector<QPushButton *> _dist_s_btn_vec;
QVector<QPushButton *> _dist_e_btn_vec; QVector<QPushButton *> _dist_e_btn_vec;
@@ -125,7 +125,7 @@ private:
QGridLayout *_edge_layout; QGridLayout *_edge_layout;
QGroupBox *_edge_groupBox; QGroupBox *_edge_groupBox;
QToolButton *_edge_add_btn; QToolButton *_edge_add_btn;
QVector<QWidget *> _edge_row_widget_vec; std::vector<QWidget *> _edge_row_widget_vec;
QVector<QToolButton *> _edge_del_btn_vec; QVector<QToolButton *> _edge_del_btn_vec;
QVector<QPushButton *> _edge_s_btn_vec; QVector<QPushButton *> _edge_s_btn_vec;
QVector<QPushButton *> _edge_e_btn_vec; QVector<QPushButton *> _edge_e_btn_vec;