lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-20 03:16:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

- fixed missing signal-slot connection bug on Matrix44fWidget

Browse Source
This commit is contained in:
Guido Ranzuglia granzuglia 2016-07-08 15:38:11 +00:00
parent 3ee8cafe49
commit 304b7a8dd3
4 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/meshlab/glarea.cpp
View File

@ -777,7 +777,8 @@ void GLArea::displayInfo(QPainter *painter)
else
{
QLocale engLocale(QLocale::English, QLocale::UnitedStates);
col1Text += QString("Current Mesh: %1\n").arg(mm()->label());
QFileInfo inf = mm()->label();
col1Text += QString("Current Mesh: %1\n").arg(inf.completeBaseName());
col1Text += "Vertices: " + engLocale.toString(mm()->cm.vn) + " (" + engLocale.toString(this->md()->vn()) + ") \n";
col1Text += "Faces: " + engLocale.toString(mm()->cm.fn) + " (" + engLocale.toString(this->md()->fn()) + ") \n";
}

3
src/meshlab/layerDialog.cpp
View File

@ -850,7 +850,8 @@ MeshTreeWidgetItem::MeshTreeWidgetItem(MeshModel* meshmodel,QTreeWidget* tree,ML
updateVisibilityIcon(meshmodel->visible);
setText(1, QString::number(meshmodel->id()));
QString meshName = meshmodel->label();
QFileInfo inf = meshmodel->label();
QString meshName = inf.completeBaseName();
if (meshmodel->meshModified())
meshName += " *";
if (_rendertoolbar != NULL)

16
src/meshlab/stdpardialog.cpp
View File

@ -696,7 +696,7 @@ Matrix44fWidget::Matrix44fWidget(QWidget *p, RichMatrix44f* rpf, QWidget *gla_c
//gridLay->addLayout(vlay,row,1,Qt::AlignTop);
connect(gla_curr,SIGNAL(transmitMatrix(QString,vcg::Matrix44f)),this,SLOT(setValue(QString,vcg::Matrix44f)));
connect(gla_curr,SIGNAL(transmitMatrix(QString,Matrix44m)),this,SLOT(setValue(QString,Matrix44m)));
connect(getMatrixButton,SIGNAL(clicked()),this,SLOT(getMatrix()));
connect(pasteMatrixButton,SIGNAL(clicked()),this,SLOT(pasteMatrix()));
connect(this,SIGNAL(askMeshMatrix(QString)), gla_curr,SLOT(sendMeshMatrix(QString)));
@ -706,7 +706,7 @@ Matrix44fWidget::Matrix44fWidget(QWidget *p, RichMatrix44f* rpf, QWidget *gla_c
Matrix44fWidget::~Matrix44fWidget() {}
void Matrix44fWidget::setValue(QString name,Matrix44f newVal)
void Matrix44fWidget::setValue(QString name,Matrix44m newVal)
{
if(name==paramName)
{
@ -724,16 +724,18 @@ vcg::Matrix44f Matrix44fWidget::getValue()
return Matrix44f(val);
}
void Matrix44fWidget::getMatrix(){
void Matrix44fWidget::getMatrix()
{
emit askMeshMatrix(QString("TransformMatrix"));
}
void Matrix44fWidget::pasteMatrix(){
void Matrix44fWidget::pasteMatrix()
{
QClipboard *clipboard = QApplication::clipboard();
QString shotString = clipboard->text();
QString shotString = clipboard->text().trimmed();
QStringList list1 = shotString.split(" ");
if(list1.size() != 16) return;
if(list1.size() != 16)
return;
int id = 0;
for(QStringList::iterator i = list1.begin(); i != list1.end(); ++i,++id){
bool ok = true;

10
src/meshlab/stdpardialog.h
View File

@ -289,8 +289,8 @@ class Matrix44fWidget : public MeshLabWidget
Q_OBJECT
public:
Matrix44fWidget(QWidget *p, RichMatrix44f* rpf, QWidget *gla_curr);
~Matrix44fWidget();
Matrix44fWidget(QWidget *p, RichMatrix44f* rpf, QWidget *gla_curr);
~Matrix44fWidget();
QString paramName;
vcg::Matrix44f getValue();
@ -299,11 +299,11 @@ public:
void resetWidgetValue();
void setWidgetValue(const Value& nv);
public slots:
void setValue(QString name, vcg::Matrix44f val);
public slots:
void setValue(QString name, Matrix44m val);
void getMatrix();
void pasteMatrix();
signals:
signals:
void askMeshMatrix(QString);