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

- removed decorator crash

Browse Source
This commit is contained in:
Guido Ranzuglia granzuglia 2016-07-22 12:43:40 +00:00
parent 6037502524
commit d41da93cf4
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/meshlab/ml_default_decorators.cpp
View File

@ -35,13 +35,12 @@ bool MLDefaultMeshDecorators::updateMeshDecorationData( MeshModel& mesh,const ML
if ((!oldvalid) || (!currentvalid))
return false;
if ((currentopts._peredge_edgeboundary_enabled && !oldopts._peredge_edgeboundary_enabled) ||
(currentopts._peredge_faceboundary_enabled && !oldopts._peredge_faceboundary_enabled))
initBoundaryDecoratorData(mesh,currentopts._peredge_edgeboundary_enabled,currentopts._peredge_faceboundary_enabled);
else
if ((!currentopts._peredge_edgeboundary_enabled && oldopts._peredge_edgeboundary_enabled) ||
(!currentopts._peredge_faceboundary_enabled && oldopts._peredge_faceboundary_enabled))
cleanBoundaryDecoratorData(mesh,!currentopts._peredge_edgeboundary_enabled,!currentopts._peredge_faceboundary_enabled);
/*the boolean conditions should make the following code lines mutually exclusive.....hopefully*/
initBoundaryDecoratorData(mesh,currentopts._peredge_edgeboundary_enabled && !oldopts._peredge_edgeboundary_enabled,
currentopts._peredge_faceboundary_enabled && !oldopts._peredge_faceboundary_enabled);
cleanBoundaryDecoratorData(mesh,!currentopts._peredge_edgeboundary_enabled && oldopts._peredge_edgeboundary_enabled,
!currentopts._peredge_faceboundary_enabled && oldopts._peredge_faceboundary_enabled);
if (currentopts._peredge_edgemanifold_enabled && !oldopts._peredge_edgemanifold_enabled)
initNonManifEdgeDecoratorData(mesh);
@ -58,8 +57,7 @@ bool MLDefaultMeshDecorators::initMeshDecorationData( MeshModel& m,const MLRende
if (!valid)
return false;
if (opts._peredge_edgeboundary_enabled || opts._peredge_faceboundary_enabled)
initBoundaryDecoratorData(m,opts._peredge_edgeboundary_enabled,opts._peredge_faceboundary_enabled);
initBoundaryDecoratorData(m,opts._peredge_edgeboundary_enabled,opts._peredge_faceboundary_enabled);
if (opts._peredge_edgemanifold_enabled)
initNonManifEdgeDecoratorData(m);

1
src/meshlab/ml_render_gui.cpp
View File

@ -125,7 +125,6 @@ void MLRenderingToolbar::getCurrentRenderingDataAccordingToGUI( MLRenderingData&
}
}
MLRenderingSideToolbar::MLRenderingSideToolbar(QWidget* parent /*= NULL*/ )
:MLRenderingToolbar(parent)
{

4
src/meshlab/ml_render_gui.h
View File

@ -129,6 +129,8 @@ protected slots:
virtual void toggle(QAction* act);
void extraUpdateRequired(int,MLRenderingAction*);
//private:
// void initGui();
signals:
void updateRenderingDataAccordingToActions(int,const QList<MLRenderingAction*>& acts);
@ -181,7 +183,7 @@ signals:
void updateRenderingDataAccordingToAction(int,MLRenderingAction*);
private slots:
void toggle(QAction* act);
void toggle(QAction*);
};
class MLRenderingParametersFrame : public QFrame