diff --git a/src/meshlab/GLLogStream.h b/src/meshlab/GLLogStream.h index d5eff137a..f6c6871cd 100644 --- a/src/meshlab/GLLogStream.h +++ b/src/meshlab/GLLogStream.h @@ -24,6 +24,9 @@ /**************************************************************************** History $Log$ +Revision 1.5 2006/05/25 09:46:37 cignoni +missing std and and all the other gcc detected syntax errors + Revision 1.4 2006/01/25 15:37:15 glvertex Added variable vertical spacing @@ -67,7 +70,8 @@ class GLArea; class GLLogStream : public LogStream { public: - void print(QStringList &list); // Fills a QStringList with the log entries + virtual ~GLLogStream () {} + void print(QStringList &list); // Fills a QStringList with the log entries void glDraw(QGLWidget *qgl, int Level, int nlines,float vSpacing,QFont font); void Save(int Level, const char *filename); void Clear() {S.clear();} diff --git a/src/meshlab/interfaces.h b/src/meshlab/interfaces.h index 01a514782..ad298abe9 100644 --- a/src/meshlab/interfaces.h +++ b/src/meshlab/interfaces.h @@ -23,6 +23,9 @@ /**************************************************************************** History $Log$ +Revision 1.43 2006/05/25 09:46:37 cignoni +missing std and and all the other gcc detected syntax errors + Revision 1.42 2006/05/25 04:57:45 cignoni Major 0.7 release. A lot of things changed. Colorize interface gone away, Editing and selection start to work. Optional data really working. Clustering decimation totally rewrote. History start to work. Filters organized in classes. @@ -237,7 +240,7 @@ public: QMap::iterator ii=paramMap.find(name); if(ii==paramMap.end()) assert(0); assert(ii.value().type()==QVariant::Int); - return float(ii.value().toInt()); + return ii.value().toInt(); } inline float getFloat(QString name) { diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index dcb73db86..0f7c16d31 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -8,6 +8,7 @@ HEADERS = interfaces.h \ saveSnapshotDialog.h \ savemaskexporter.h \ changetexturename.h \ + GenericELDialog.h \ ../../../sf/wrap/gui/trackball.h\ ../../../sf/wrap/gui/trackmode.h\ ../../../sf/wrap/gl/trimesh.h @@ -30,7 +31,8 @@ FORMS = ui/customDialog.ui\ ui/savesnapshotDialog.ui\ ui/aboutDialog.ui \ ui/renametexture.ui \ - ui/savemaskexporter.ui + ui/savemaskexporter.ui \ + ui/GenericELDialog.ui RESOURCES = meshlab.qrc diff --git a/src/meshlab/meshmodel.h b/src/meshlab/meshmodel.h index f7536d34e..dc85420a3 100644 --- a/src/meshlab/meshmodel.h +++ b/src/meshlab/meshmodel.h @@ -23,6 +23,9 @@ /**************************************************************************** History $Log$ +Revision 1.22 2006/05/25 09:46:37 cignoni +missing std and and all the other gcc detected syntax errors + Revision 1.21 2006/05/25 04:57:45 cignoni Major 0.7 release. A lot of things changed. Colorize interface gone away, Editing and selection start to work. Optional data really working. Clustering decimation totally rewrote. History start to work. Filters organized in classes. @@ -232,4 +235,4 @@ public: } }; -#endif \ No newline at end of file +#endif diff --git a/src/meshlabplugins/meshfilter/meshfilter.h b/src/meshlabplugins/meshfilter/meshfilter.h index 957856c21..a2937d690 100644 --- a/src/meshlabplugins/meshfilter/meshfilter.h +++ b/src/meshlabplugins/meshfilter/meshfilter.h @@ -20,9 +20,11 @@ * for more details. * * * ****************************************************************************/ -/**************************************************************************** /* History $Log$ +Revision 1.31 2006/05/25 09:46:38 cignoni +missing std and and all the other gcc detected syntax errors + Revision 1.30 2006/05/25 06:24:14 cignoni Decimator dialog no more necessary diff --git a/src/meshlabplugins/meshfilter/refine_loop.h b/src/meshlabplugins/meshfilter/refine_loop.h index 02df59725..adff5514d 100644 --- a/src/meshlabplugins/meshfilter/refine_loop.h +++ b/src/meshlabplugins/meshfilter/refine_loop.h @@ -24,6 +24,9 @@ History $Log$ +Revision 1.11 2006/05/25 09:46:38 cignoni +missing std and and all the other gcc detected syntax errors + Revision 1.10 2006/03/29 07:29:50 zifnab1974 extra typename needed for compilation with gcc 3.4.5 @@ -111,6 +114,7 @@ small gcc-related compiling issues (typenames,ending cr, initialization order) #ifndef __VCGLIB_REFINE_LOOP #define __VCGLIB_REFINE_LOOP +#include #include #include #include @@ -251,6 +255,7 @@ struct EvenPointLoop : public std::unary_function @@ -315,7 +320,7 @@ bool RefineOddEvenE(MESH_TYPE &m, ODD_VERT odd, EVEN_VERT even,float length, } if (cbEven) { - (*cbEven)(100 * (float)j / (float)m.fn,"Refining"); + (*cbEven)(int(100.0f * (float)j / (float)m.fn),"Refining"); j++; } even((*fi).V(i)->P(), aux); diff --git a/src/meshlabplugins/meshrender/meshrender.pro b/src/meshlabplugins/meshrender/meshrender.pro index 971fe3fcd..cc7454c3a 100644 --- a/src/meshlabplugins/meshrender/meshrender.pro +++ b/src/meshlabplugins/meshrender/meshrender.pro @@ -10,7 +10,7 @@ DESTDIR = ../../meshlab/plugins # the following line is needed to avoid mismatch between # the awful min/max macros of windows and the limits max win32:DEFINES += NOMINMAX -win32:LIBS += QtXml4.lib +//win32:LIBS += QtXml4.lib FORMS = shaderDialog.ui DEFINES += GLEW_STATIC @@ -28,4 +28,4 @@ contains(TEMPLATE,lib) { else:TARGET = $$member(TARGET, 0)d } } -QT += opengl +QT += opengl xml diff --git a/src/meshlabplugins/meshselect/meshselect.h b/src/meshlabplugins/meshselect/meshselect.h index cf18bc086..2db1ab450 100644 --- a/src/meshlabplugins/meshselect/meshselect.h +++ b/src/meshlabplugins/meshselect/meshselect.h @@ -48,7 +48,7 @@ class SelectionFilterPlugin : public QObject, public MeshFilterInterface virtual const PluginInfo &Info(); virtual const QString ST(FilterType filter); - virtual const FilterClass getClass(QAction *) {return FilterClass::Selection;}; + virtual const FilterClass getClass(QAction *) {return MeshFilterInterface::Selection;}; virtual bool getParameters(QAction *, QWidget *, MeshModel &m, FilterParameter &par){return true;}; virtual const int getRequirements(QAction *){return 0;}; virtual bool applyFilter(QAction *filter, MeshModel &m, FilterParameter & /*parent*/, vcg::CallBackPos * cb) ;