From 048654d6e1fbd9441ec0376279dd4d3ebf1a7ef4 Mon Sep 17 00:00:00 2001 From: Paolo Cignoni cignoni Date: Fri, 18 Mar 2011 10:50:21 +0000 Subject: [PATCH] Corrected mismatched connect between signal and slot when getting shot from current trackball --- src/meshlab/stdpardialog.cpp | 4 ++-- src/meshlab/stdpardialog.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/meshlab/stdpardialog.cpp b/src/meshlab/stdpardialog.cpp index b3accb504..2c10bb547 100644 --- a/src/meshlab/stdpardialog.cpp +++ b/src/meshlab/stdpardialog.cpp @@ -614,7 +614,7 @@ ShotfWidget::ShotfWidget(QWidget *p, RichShotf* rpf, QWidget *gla_curr): MeshLab QHBoxLayout* lay = new QHBoxLayout(p); - this->setValue(paramName,rp->val->getShotf()); + this->setShotValue(paramName,rp->val->getShotf()); if(gla_curr) // if we have a connection to the current glarea we can setup the additional button for getting the current view direction. { getShotButton = new QPushButton("Get shot",p); @@ -677,7 +677,7 @@ void ShotfWidget::getShot() ShotfWidget::~ShotfWidget() {} -void ShotfWidget::setValue(QString name,Shotf newVal) +void ShotfWidget::setShotValue(QString name,Shotf newVal) { if(name==paramName) { diff --git a/src/meshlab/stdpardialog.h b/src/meshlab/stdpardialog.h index 519d671a3..29e109d79 100644 --- a/src/meshlab/stdpardialog.h +++ b/src/meshlab/stdpardialog.h @@ -284,7 +284,7 @@ public: public slots: void getShot(); - void setValue(QString name, vcg::Shotf val); + void setShotValue(QString name, vcg::Shotf val); signals: void askRasterShot(QString); void askMeshShot(QString);