Skip to content

Commit 03cba0a

Browse files
committed
Remove duplicated dome variable in DomePanel.
1 parent 07118ac commit 03cba0a

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

relightlab/domepanel.cpp

+4-3
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ void DomePanel::loadLP(QString path) {
120120
QMessageBox::critical(this, "Loading .lp file failed", error);
121121
return;
122122
}
123-
123+
Dome &dome = qRelightApp->project().dome;
124124
dome.lightConfiguration = Dome::DIRECTIONAL;
125125
dome.directions = directions;
126126
QFileInfo info(path);
@@ -129,7 +129,7 @@ void DomePanel::loadLP(QString path) {
129129

130130
updateDomeList();
131131

132-
emit accept(dome);
132+
emit updated();
133133
}
134134

135135
void DomePanel::loadDome(QString path) {
@@ -143,6 +143,7 @@ void DomePanel::loadDome(QString path) {
143143
QMessageBox::critical(this, "Loading .dome file failed", error);
144144
return;
145145
}
146+
Dome &dome = qRelightApp->project().dome;
146147
dome = new_dome;
147148

148149
QFileInfo info(path);
@@ -152,7 +153,7 @@ void DomePanel::loadDome(QString path) {
152153
if(imageWidth != 0 && qRelightApp->project().measures.size() != 0)
153154
dome.imageWidth = imageWidth;
154155
updateDomeList();
155-
emit accept(dome);
156+
emit updated();
156157
}
157158

158159

relightlab/domepanel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public slots:
2323
void updateDomeList();
2424

2525
signals:
26-
void accept(Dome dome);
26+
void updated();
2727

2828
private:
2929
Dome dome;

relightlab/lightgeometry.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -132,10 +132,6 @@ void LightsGeometry::init() {
132132
directions_view->initFromDome(dome);
133133
}
134134

135-
void LightsGeometry::setDome(Dome dome) {
136-
qRelightApp->project().dome = dome;
137-
init();
138-
}
139135

140136
void LightsGeometry::setFromSpheres() {
141137
//get spheres & lens from project

relightlab/lightgeometry.h

+1-4
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,8 @@ class LightsGeometry: public QFrame {
4040
LightsGeometry(QWidget *parent = nullptr);
4141
~LightsGeometry();
4242

43-
void init();
44-
45-
4643
public slots:
47-
void setDome(Dome dome); //when a dome is selected
44+
void init();
4845
void setFromSpheres(); //when reflective spheres reflections have been processed
4946
void setSpherical(QAbstractButton *button);
5047
void exportDome();

relightlab/lightsframe.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ LightsFrame::LightsFrame() {
3737
content->addStretch();
3838

3939
connect(sphere_panel, SIGNAL(updated()), geometry, SLOT(setFromSpheres()));
40-
connect(dome_panel, SIGNAL(accept(Dome)), geometry, SLOT(setDome(Dome)));
40+
connect(dome_panel, SIGNAL(updated()), geometry, SLOT(init()));
4141
}
4242

4343
void LightsFrame::clear() {

0 commit comments

Comments
 (0)