Remove duplicated dome variable in DomePanel.

cnr-isti-vclab · Jan 9, 2025 · 03cba0a · 03cba0a
1 parent 07118ac
commit 03cba0a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/relightlab/domepanel.cpp b/relightlab/domepanel.cpp
@@ -120,7 +120,7 @@ void DomePanel::loadLP(QString path) {
 		QMessageBox::critical(this, "Loading .lp file failed", error);
 		return;
 	}
-
+	Dome &dome = qRelightApp->project().dome;
 	dome.lightConfiguration = Dome::DIRECTIONAL;
 	dome.directions = directions;
 	QFileInfo info(path);
@@ -129,7 +129,7 @@ void DomePanel::loadLP(QString path) {
 
 	updateDomeList();
 
-	emit accept(dome);
+	emit updated();
 }
 
 void DomePanel::loadDome(QString path) {
@@ -143,6 +143,7 @@ void DomePanel::loadDome(QString path) {
 		QMessageBox::critical(this, "Loading .dome file failed", error);
 		return;
 	}
+	Dome &dome = qRelightApp->project().dome;
 	dome = new_dome;
 
 	QFileInfo info(path);
@@ -152,7 +153,7 @@ void DomePanel::loadDome(QString path) {
 	if(imageWidth != 0 && qRelightApp->project().measures.size() != 0)
 		dome.imageWidth = imageWidth;
 	updateDomeList();
-	emit accept(dome);
+	emit updated();
 }
 
 

diff --git a/relightlab/domepanel.h b/relightlab/domepanel.h
@@ -23,7 +23,7 @@ public slots:
 	void updateDomeList();
 
 signals:
-	void accept(Dome dome);
+	void updated();
 
 private:
 	Dome dome;

diff --git a/relightlab/lightgeometry.cpp b/relightlab/lightgeometry.cpp
@@ -132,10 +132,6 @@ void LightsGeometry::init() {
 	directions_view->initFromDome(dome);
 }
 
-void LightsGeometry::setDome(Dome dome) {
-	qRelightApp->project().dome = dome;
-	init();
-}
 
 void LightsGeometry::setFromSpheres() {
 	//get spheres & lens from project

diff --git a/relightlab/lightgeometry.h b/relightlab/lightgeometry.h
@@ -40,11 +40,8 @@ class LightsGeometry: public QFrame {
 	LightsGeometry(QWidget *parent = nullptr);
 	~LightsGeometry();
 
-	void init();
-
-
 public slots:
-	void setDome(Dome dome);        //when a dome is selected
+	void init();
 	void setFromSpheres();              //when reflective spheres reflections have been processed
 	void setSpherical(QAbstractButton *button);
 	void exportDome();

diff --git a/relightlab/lightsframe.cpp b/relightlab/lightsframe.cpp
@@ -37,7 +37,7 @@ LightsFrame::LightsFrame() {
 	content->addStretch();
 
 	connect(sphere_panel, SIGNAL(updated()), geometry, SLOT(setFromSpheres()));
-	connect(dome_panel, SIGNAL(accept(Dome)), geometry, SLOT(setDome(Dome)));
+	connect(dome_panel, SIGNAL(updated()), geometry, SLOT(init()));
 }
 
 void LightsFrame::clear() {