Skip to content

Commit 13cc666

Browse files
committed
refactoring
1 parent 2fd3189 commit 13cc666

File tree

2 files changed

+14
-24
lines changed

2 files changed

+14
-24
lines changed

QtPMbrowser/DlgSelectParameters.cpp

+5-24
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,11 @@ DlgSelectParameters::DlgSelectParameters(QWidget *parent)
2525
ui = new Ui::DlgSelectParameters();
2626
ui->setupUi(this);
2727

28-
auto w = new QWidget;
29-
w->setLayout(createGrid(v_root, hkLib::parametersRoot));
30-
w->setBackgroundRole(QPalette::Base);
31-
ui->scrollAreaRoot->setWidget(w); // this transfers ownership, doesn't it?
32-
33-
w = new QWidget;
34-
w->setLayout(createGrid(v_grp, hkLib::parametersGroup));
35-
w->setBackgroundRole(QPalette::Base);
36-
ui->scrollAreaGrp->setWidget(w);
37-
38-
w = new QWidget;
39-
w->setLayout(createGrid(v_ser, hkLib::parametersSeries));
40-
w->setBackgroundRole(QPalette::Base);
41-
ui->scrollAreaSer->setWidget(w);
42-
43-
w = new QWidget;
44-
w->setLayout(createGrid(v_swp, hkLib::parametersSweep));
45-
w->setBackgroundRole(QPalette::Base);
46-
ui->scrollAreaSwp->setWidget(w);
47-
48-
w = new QWidget;
49-
w->setLayout(createGrid(v_tr, hkLib::parametersTrace));
50-
w->setBackgroundRole(QPalette::Base);
51-
ui->scrollAreaTr->setWidget(w);
28+
setScrollArea(ui->scrollAreaRoot, v_root, hkLib::parametersRoot);
29+
setScrollArea(ui->scrollAreaGrp, v_grp, hkLib::parametersGroup);
30+
setScrollArea(ui->scrollAreaSer, v_ser, hkLib::parametersSeries);
31+
setScrollArea(ui->scrollAreaSwp, v_swp, hkLib::parametersSweep);
32+
setScrollArea(ui->scrollAreaTr, v_tr, hkLib::parametersTrace);
5233
}
5334

5435
DlgSelectParameters::~DlgSelectParameters()

QtPMbrowser/DlgSelectParameters.h

+9
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,15 @@ class DlgSelectParameters : public QDialog
7777
return grid;
7878
}
7979

80+
template<std::size_t Nrows> void setScrollArea(QScrollArea* area,
81+
std::vector<chk_row>& v,
82+
const std::array<hkLib::PMparameter, Nrows>& ar) {
83+
auto w = new QWidget;
84+
w->setLayout(createGrid(v, ar));
85+
w->setBackgroundRole(QPalette::Base);
86+
area->setWidget(w);
87+
}
88+
8089
template<std::size_t Nrows> void readSelections(const std::vector<chk_row>& v,
8190
std::array<hkLib::PMparameter, Nrows>& ar)
8291
{

0 commit comments

Comments
 (0)