Merge pull request #45 from ChrisHal/bugfix_dialog_selectparameters

bugfix: select parameters dialog wrong parameters

Author: ChrisHal

QtPMbrowser/DlgSelectParameters.cpp

@@ -25,36 +25,11 @@ DlgSelectParameters::DlgSelectParameters(QWidget *parent)
 	ui = new Ui::DlgSelectParameters();
 	ui->setupUi(this);
 
-	//populateGrid(gridLayoutRoot, hkLib::parametersRoot);
-	//populateGrid(gridLayoutGrp, hkLib::parametersGroup);
-	//populateGrid(gridLayoutSer, hkLib::parametersSeries);
-	//populateGrid(gridLayoutSwp, hkLib::parametersSweep);
-	//populateGrid(gridLayoutTr, hkLib::parametersTrace);
-
-	auto w = new QWidget;
-	w->setLayout(createGrid(v_root, hkLib::parametersRoot));
-	w->setBackgroundRole(QPalette::Base);
-	ui->scrollAreaGrp->setWidget(w); // this transfers ownership, doesn't it?
-	
-	w = new QWidget;
-	w->setLayout(createGrid(v_grp, hkLib::parametersGroup));
-	w->setBackgroundRole(QPalette::Base);
-	ui->scrollAreaRoot->setWidget(w);
-
-	w = new QWidget;
-	w->setLayout(createGrid(v_ser, hkLib::parametersSeries));
-	w->setBackgroundRole(QPalette::Base);
-	ui->scrollAreaSer->setWidget(w);
-	
-	w = new QWidget;
-	w->setLayout(createGrid(v_swp, hkLib::parametersSweep));
-	w->setBackgroundRole(QPalette::Base); 
-	ui->scrollAreaSwp->setWidget(w);
-	
-	w = new QWidget;
-	w->setLayout(createGrid(v_tr, hkLib::parametersTrace));
-	w->setBackgroundRole(QPalette::Base); 
-	ui->scrollAreaTr->setWidget(w);
+	setScrollArea(ui->scrollAreaRoot, v_root, hkLib::parametersRoot);
+	setScrollArea(ui->scrollAreaGrp, v_grp, hkLib::parametersGroup);
+	setScrollArea(ui->scrollAreaSer, v_ser, hkLib::parametersSeries);
+	setScrollArea(ui->scrollAreaSwp, v_swp, hkLib::parametersSweep);
+	setScrollArea(ui->scrollAreaTr, v_tr, hkLib::parametersTrace);
 }
 
 DlgSelectParameters::~DlgSelectParameters()

QtPMbrowser/DlgSelectParameters.h

@@ -77,6 +77,15 @@ class DlgSelectParameters : public QDialog
 		return grid;
 	}
 
+	template<std::size_t Nrows> void setScrollArea(QScrollArea* area,
+		std::vector<chk_row>& v,
+		const std::array<hkLib::PMparameter, Nrows>& ar) {
+		auto w = new QWidget;
+		w->setLayout(createGrid(v, ar));
+		w->setBackgroundRole(QPalette::Base);
+		area->setWidget(w);
+	}
+
 	template<std::size_t Nrows> void readSelections(const std::vector<chk_row>& v,
 		std::array<hkLib::PMparameter, Nrows>& ar)
 	{