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

- removed "importing 3d mesh file failed but anyway a new entry has been created on the layerdialog" bug

Browse Source
This commit is contained in:
Guido Ranzuglia granzuglia 2013-12-05 09:32:40 +00:00
parent 1e1a876163
commit 275d4e7d55
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/meshlab/glarea.cpp
View File

@ -90,8 +90,8 @@ GLArea::GLArea(MultiViewer_Container *mvcont, RichParameterSet *current)
connect(this->md(), SIGNAL(rasterSetChanged()), this, SLOT(updateRasterSetVisibilities()));
connect(this->md(),SIGNAL(documentUpdated()),this,SLOT(completeUpdateRequested()));
connect(this, SIGNAL(updateLayerTable()), this->mw(), SIGNAL(updateLayerTable()));
connect(md(),SIGNAL(meshAdded(int)),this,SLOT(addNewEntryInRenderModeMap(int)));
connect(md(),SIGNAL(meshRemoved(int)),this,SLOT(removeEntryFromRenderModeMap(int)));
connect(md(),SIGNAL(meshAdded(int)),this,SLOT(meshAdded(int)));
connect(md(),SIGNAL(meshRemoved(int)),this,SLOT(meshRemoved(int)));
foreach(MeshModel* mesh,md()->meshList)
rendermodemap[mesh->id()] = RenderMode();
@ -1214,7 +1214,8 @@ void GLArea::initTexture(bool reloadAllTexture)
for(unsigned int i =0; i< mp->cm.textures.size();++i)
{
QImage img, imgScaled, imgGL;
bool res = img.load(mp->cm.textures[i].c_str());
QFileInfo fi(mp->cm.textures[i].c_str());
bool res = img.load(fi.absoluteFilePath());
sometextfailed = sometextfailed || !res;
if(!res)
{
@ -2082,12 +2083,14 @@ void GLArea::completeUpdateRequested()
// return NULL;
//}
void GLArea::addNewEntryInRenderModeMap( int index )
void GLArea::meshAdded( int index )
{
rendermodemap[index] = RenderMode();
emit updateLayerTable();
}
void GLArea::removeEntryFromRenderModeMap( int index )
void GLArea::meshRemoved( int index )
{
rendermodemap.remove(index);
rendermodemap.remove(index);
emit updateLayerTable();
}

4
src/meshlab/glarea.h
View File

@ -337,8 +337,8 @@ public slots:
void updateRasterSetVisibilities();
private slots:
void addNewEntryInRenderModeMap(int index);
void removeEntryFromRenderModeMap(int index);
void meshAdded(int index);
void meshRemoved(int index);
private:
float cfps;

5
src/meshlab/mainwindow_RunTime.cpp
View File

@ -2379,7 +2379,10 @@ bool MainWindow::importMesh(QString fileName)
showLayerDlg(true);
}
else
{
meshDoc()->delMesh(mm);
GLA()->Logf(0,"Warning: Mesh %s has not been opened",qPrintable(fileName));
}
}// end foreach file of the input list
GLA()->Logf(0,"All files opened in %i msec",allFileTime.elapsed());
@ -2444,6 +2447,7 @@ void MainWindow::reloadAllMesh()
loadMeshWithStandardParams(fileName,mmm);
}
qb->reset();
update();
}
void MainWindow::reload()
@ -2454,6 +2458,7 @@ void MainWindow::reload()
QString fileName = meshDoc()->mm()->fullName();
loadMeshWithStandardParams(fileName,meshDoc()->mm());
qb->reset();
update();
}
bool MainWindow::exportMesh(QString fileName,MeshModel* mod,const bool saveAllPossibleAttributes)