mirror of
https://github.com/lucaspalomodevelop/meshlab.git
synced 2026-03-13 08:09:39 +00:00
- huge commit! MeshLab is now qt 5.0 compatible. Compiling process has not been yet tested on MacOSx.
This commit is contained in:
Guido Ranzuglia granzuglia
parent
c95ff34651
commit
2446d7782f
@ -78,6 +78,7 @@ INCLUDEPATH += . $$EXIF_DIR
|
||||
DEFINES += GLEW_STATIC
|
||||
win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||
win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||
win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS
|
||||
|
||||
|
||||
# Input
|
||||
@ -120,6 +121,7 @@ macx64:LIBS += -L../external/lib/macx64 -ljhead
|
||||
win32-msvc.net:LIBS += ../external/lib/win32-msvc.net/jhead.lib
|
||||
win32-msvc2005:LIBS += ../external/lib/win32-msvc2005/jhead.lib
|
||||
win32-msvc2008:LIBS += ../external/lib/win32-msvc2008/jhead.lib
|
||||
win32-msvc2010:LIBS += ../external/lib/win32-msvc2008/jhead.lib
|
||||
win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead
|
||||
linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead
|
||||
linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead
|
||||
|
||||
@ -653,7 +653,7 @@ protected:
|
||||
#define MESH_RENDER_INTERFACE_IID "vcg.meshlab.MeshRenderInterface/1.0"
|
||||
#define MESH_DECORATE_INTERFACE_IID "vcg.meshlab.MeshDecorateInterface/1.0"
|
||||
#define MESH_EDIT_INTERFACE_IID "vcg.meshlab.MeshEditInterface/1.0"
|
||||
#define MESH_IO_INTERFACE_FACTORY_IID "vcg.meshlab.MeshEditInterfaceFactory/1.0"
|
||||
#define MESH_EDIT_INTERFACE_FACTORY_IID "vcg.meshlab.MeshEditInterfaceFactory/1.0"
|
||||
|
||||
Q_DECLARE_INTERFACE(MeshIOInterface, MESH_IO_INTERFACE_IID)
|
||||
Q_DECLARE_INTERFACE(MeshFilterInterface, MESH_FILTER_INTERFACE_IID)
|
||||
@ -661,6 +661,6 @@ Q_DECLARE_INTERFACE(MeshLabFilterInterface, MESHLAB_FILTER_INTERFACE_IID)
|
||||
Q_DECLARE_INTERFACE(MeshRenderInterface, MESH_RENDER_INTERFACE_IID)
|
||||
Q_DECLARE_INTERFACE(MeshDecorateInterface, MESH_DECORATE_INTERFACE_IID)
|
||||
Q_DECLARE_INTERFACE(MeshEditInterface, MESH_EDIT_INTERFACE_IID)
|
||||
Q_DECLARE_INTERFACE(MeshEditInterfaceFactory, MESH_IO_INTERFACE_FACTORY_IID)
|
||||
Q_DECLARE_INTERFACE(MeshEditInterfaceFactory, MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
|
||||
#endif
|
||||
|
||||
@ -50,10 +50,8 @@
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QFileInfo>
|
||||
#include <QObject>
|
||||
#include "GLLogStream.h"
|
||||
#include "filterscript.h"
|
||||
#include <QSemaphore>
|
||||
|
||||
// Forward declarations needed for creating the used types
|
||||
class CVertexO;
|
||||
@ -428,9 +426,9 @@ public:
|
||||
|
||||
}; // end class RenderMode
|
||||
|
||||
class MeshLabRenderState : public QObject
|
||||
class MeshLabRenderState //: public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
//Q_OBJECT
|
||||
public:
|
||||
MeshLabRenderState();
|
||||
~MeshLabRenderState();
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
#include "meshmodel.h"
|
||||
#include "vcg/space/point3.h"
|
||||
|
||||
|
||||
class ScriptAdapterGenerator
|
||||
{
|
||||
private:
|
||||
|
||||
@ -1,11 +1,16 @@
|
||||
|
||||
- if the GMM_INCLUDE_DIR tag is not presented in CMAKE set the gmm path by hand in cmake/FindGMM.cmake
|
||||
(for instance find_path( GMM_INCLUDE_DIR NAMES gmm/gmm.h PATHS $ENV{GMM_DIR}"d:\\code\\gmm-4.2\\include") )
|
||||
|
||||
- if EIGEN3 tag is not presented in CMAKE set the gmm path by hand in cmake/FindEIGEN3.cmake
|
||||
(for instance find_path( EIGEN3_INCLUDE_DIR NAMES Eigen/Dense PATHS $ENV{EIGEN_DIR}) )
|
||||
|
||||
- change from dll to static lib. remove the COMISODLL preprocessor directive. remove properties->build events->post building event
|
||||
|
||||
- add to the linking path of the CoMISo project properties the static lib generated by GotoBLAS2
|
||||
|
||||
- for test quadratic_solver remove COMISODLL preprocessor directive also from quadratic_solver project.
|
||||
|
||||
- to test the example included with CoMISo go to the example properties and change from Linker->System->SubSystem->Console
|
||||
|
||||
- some tests will not compile
|
||||
2
src/external/external.pro
vendored
2
src/external/external.pro
vendored
@ -6,7 +6,7 @@ SUBDIRS = lib3ds-1.3.0/lib3ds \
|
||||
bzip2-1.0.5/bzip2-1.0.5.pro \
|
||||
muparser_v132/src \
|
||||
levmar-2.3/levmar-2.3.pro \
|
||||
# structuresynth/structuresynth.pro \
|
||||
structuresynth/structuresynth.pro \
|
||||
OpenCTM-1.0.3/openctm.pro \
|
||||
jhead-2.95/jhead-2.95.pro
|
||||
# openkinect/openkinect.pro
|
||||
|
||||
164
src/external/jhead-2.95/makefile
vendored
164
src/external/jhead-2.95/makefile
vendored
@ -1,23 +1,153 @@
|
||||
#--------------------------------
|
||||
# jhead makefile for Unix
|
||||
#--------------------------------
|
||||
OBJ=.
|
||||
SRC=.
|
||||
CFLAGS= -O3 -Wall
|
||||
#############################################################################
|
||||
# Makefile for building: libjhead
|
||||
# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun 24. Mar 19:33:40 2013
|
||||
# Project: jhead-2.95.pro
|
||||
# Template: lib
|
||||
# Command: c:\Qt\4.8.4\bin\qmake.exe -spec c:\Qt\4.8.4\mkspecs\win32-g++ CONFIG+=declarative_debug -o Makefile jhead-2.95.pro
|
||||
#############################################################################
|
||||
|
||||
all: jhead
|
||||
first: debug
|
||||
install: debug-install
|
||||
uninstall: debug-uninstall
|
||||
MAKEFILE = Makefile
|
||||
QMAKE = c:\Qt\4.8.4\bin\qmake.exe
|
||||
DEL_FILE = del
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
COPY = copy /y
|
||||
COPY_FILE = $(COPY)
|
||||
COPY_DIR = xcopy /s /q /y /i
|
||||
INSTALL_FILE = $(COPY_FILE)
|
||||
INSTALL_PROGRAM = $(COPY_FILE)
|
||||
INSTALL_DIR = $(COPY_DIR)
|
||||
DEL_FILE = del
|
||||
SYMLINK =
|
||||
DEL_DIR = rmdir
|
||||
MOVE = move
|
||||
CHK_DIR_EXISTS= if not exist
|
||||
MKDIR = mkdir
|
||||
SUBTARGETS = \
|
||||
debug \
|
||||
release
|
||||
|
||||
objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/paths.o \
|
||||
$(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o
|
||||
debug: $(MAKEFILE).Debug FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Debug
|
||||
debug-make_default: $(MAKEFILE).Debug FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Debug
|
||||
debug-make_first: $(MAKEFILE).Debug FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Debug first
|
||||
debug-all: $(MAKEFILE).Debug FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Debug all
|
||||
debug-clean: $(MAKEFILE).Debug FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Debug clean
|
||||
debug-distclean: $(MAKEFILE).Debug FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Debug distclean
|
||||
debug-install: $(MAKEFILE).Debug FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Debug install
|
||||
debug-uninstall: $(MAKEFILE).Debug FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Debug uninstall
|
||||
release: $(MAKEFILE).Release FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Release
|
||||
release-make_default: $(MAKEFILE).Release FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Release
|
||||
release-make_first: $(MAKEFILE).Release FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Release first
|
||||
release-all: $(MAKEFILE).Release FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Release all
|
||||
release-clean: $(MAKEFILE).Release FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Release clean
|
||||
release-distclean: $(MAKEFILE).Release FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Release distclean
|
||||
release-install: $(MAKEFILE).Release FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Release install
|
||||
release-uninstall: $(MAKEFILE).Release FORCE
|
||||
$(MAKE) -f $(MAKEFILE).Release uninstall
|
||||
|
||||
$(OBJ)/%.o:$(SRC)/%.c
|
||||
${CC} $(CFLAGS) -c $< -o $@
|
||||
Makefile: jhead-2.95.pro c:/Qt/4.8.4/mkspecs/win32-g++/qmake.conf c:/Qt/4.8.4/mkspecs/features/device_config.prf \
|
||||
c:/Qt/4.8.4/mkspecs/qconfig.pri \
|
||||
c:/Qt/4.8.4/mkspecs/modules/qt_webkit_version.pri \
|
||||
c:/Qt/4.8.4/mkspecs/features/qt_functions.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/qt_config.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/exclusive_builds.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/default_pre.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/win32/default_pre.prf \
|
||||
../ext_common.pri \
|
||||
c:/Qt/4.8.4/mkspecs/features/debug.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/debug_and_release.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/default_post.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/win32/default_post.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/staticlib.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/static.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/declarative_debug.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/win32/rtti.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/win32/exceptions.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/win32/stl.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/warn_on.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/qt.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/win32/thread.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/moc.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/win32/windows.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/resources.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/uic.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/yacc.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/lex.prf \
|
||||
c:/Qt/4.8.4/mkspecs/features/include_source_dir.prf
|
||||
$(QMAKE) -spec c:\Qt\4.8.4\mkspecs\win32-g++ CONFIG+=declarative_debug -o Makefile jhead-2.95.pro
|
||||
c:\Qt\4.8.4\mkspecs\features\device_config.prf:
|
||||
c:\Qt\4.8.4\mkspecs\qconfig.pri:
|
||||
c:\Qt\4.8.4\mkspecs\modules\qt_webkit_version.pri:
|
||||
c:\Qt\4.8.4\mkspecs\features\qt_functions.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\qt_config.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\exclusive_builds.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\default_pre.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\win32\default_pre.prf:
|
||||
..\ext_common.pri:
|
||||
c:\Qt\4.8.4\mkspecs\features\debug.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\debug_and_release.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\default_post.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\win32\default_post.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\staticlib.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\static.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\declarative_debug.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\win32\rtti.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\win32\exceptions.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\win32\stl.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\warn_on.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\qt.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\win32\thread.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\moc.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\win32\windows.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\resources.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\uic.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\yacc.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\lex.prf:
|
||||
c:\Qt\4.8.4\mkspecs\features\include_source_dir.prf:
|
||||
qmake: qmake_all FORCE
|
||||
@$(QMAKE) -spec c:\Qt\4.8.4\mkspecs\win32-g++ CONFIG+=declarative_debug -o Makefile jhead-2.95.pro
|
||||
|
||||
jhead: $(objs) jhead.h
|
||||
${CC} -o jhead $(objs) -lm
|
||||
qmake_all: FORCE
|
||||
|
||||
clean:
|
||||
rm -f $(objs) jhead
|
||||
make_default: debug-make_default release-make_default FORCE
|
||||
make_first: debug-make_first release-make_first FORCE
|
||||
all: debug-all release-all FORCE
|
||||
clean: debug-clean release-clean FORCE
|
||||
distclean: debug-distclean release-distclean FORCE
|
||||
-$(DEL_FILE) Makefile
|
||||
|
||||
install:
|
||||
cp jhead ${DESTDIR}/usr/local/bin/
|
||||
check: first
|
||||
|
||||
debug-mocclean: $(MAKEFILE).Debug
|
||||
$(MAKE) -f $(MAKEFILE).Debug mocclean
|
||||
release-mocclean: $(MAKEFILE).Release
|
||||
$(MAKE) -f $(MAKEFILE).Release mocclean
|
||||
mocclean: debug-mocclean release-mocclean
|
||||
|
||||
debug-mocables: $(MAKEFILE).Debug
|
||||
$(MAKE) -f $(MAKEFILE).Debug mocables
|
||||
release-mocables: $(MAKEFILE).Release
|
||||
$(MAKE) -f $(MAKEFILE).Release mocables
|
||||
mocables: debug-mocables release-mocables
|
||||
FORCE:
|
||||
|
||||
$(MAKEFILE).Debug: Makefile
|
||||
$(MAKEFILE).Release: Makefile
|
||||
|
||||
2
src/external/qtsoap-2.7_1/src/qtsoap.cpp
vendored
2
src/external/qtsoap-2.7_1/src/qtsoap.cpp
vendored
@ -3157,7 +3157,7 @@ void QtSoapHttpTransport::submitRequest(QtSoapMessage &request, const QString &p
|
||||
{
|
||||
QNetworkRequest networkReq;
|
||||
networkReq.setHeader(QNetworkRequest::ContentTypeHeader, QLatin1String("text/xml;charset=utf-8"));
|
||||
networkReq.setRawHeader("SOAPAction", soapAction.toAscii());
|
||||
networkReq.setRawHeader("SOAPAction", soapAction.toUtf8().data());
|
||||
url.setPath(path);
|
||||
networkReq.setUrl(url);
|
||||
|
||||
|
||||
@ -117,6 +117,7 @@ macx:DESTDIR = ../lib/macx
|
||||
win32-g++:DESTDIR = ../lib/win32-gcc
|
||||
win32-msvc2005:DESTDIR = ../lib/win32-msvc2005
|
||||
win32-msvc2008:DESTDIR = ../lib/win32-msvc2008
|
||||
win32-msvc2010:DESTDIR = ../lib/win32-msvc2010
|
||||
linux-g++-32:DESTDIR = ../lib/linux-g++-32
|
||||
linux-g++-64:DESTDIR = ../lib/linux-g++-64
|
||||
linux-g++:DESTDIR = ../lib/linux-g++
|
||||
|
||||
@ -36,42 +36,17 @@
|
||||
|
||||
#include <QTimer>
|
||||
#include <QTime>
|
||||
#include <QtGui>
|
||||
|
||||
#include "../common/interfaces.h"
|
||||
#include "glarea_setting.h"
|
||||
#include "multiViewer_Container.h"
|
||||
#include "snapshotsetting.h"
|
||||
|
||||
#define SSHOT_BYTES_PER_PIXEL 4
|
||||
|
||||
enum LightingModel{LDOUBLE,LFANCY};
|
||||
|
||||
|
||||
class SnapshotSetting
|
||||
{
|
||||
public:
|
||||
QString outdir;
|
||||
QString basename;
|
||||
int counter;
|
||||
int resolution;
|
||||
bool transparentBackground;
|
||||
bool snapAllLayers;
|
||||
bool tiledSave; // if true all the tiles are saved as separated files and not joined.
|
||||
bool addToRasters;
|
||||
|
||||
SnapshotSetting()
|
||||
{
|
||||
outdir=".";
|
||||
basename="snapshot";
|
||||
counter=0;
|
||||
resolution=1;
|
||||
transparentBackground=true;
|
||||
snapAllLayers=false;
|
||||
tiledSave=false;
|
||||
addToRasters=false;
|
||||
};
|
||||
};
|
||||
|
||||
class MeshModel;
|
||||
class MainWindow;
|
||||
class GLArea : public QGLWidget
|
||||
|
||||
@ -20,7 +20,6 @@
|
||||
* for more details. *
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
#include <common/mlapplication.h>
|
||||
#include <QMessageBox>
|
||||
#include "mainwindow.h"
|
||||
@ -28,6 +27,7 @@
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
|
||||
MeshLabApplication app(argc, argv);
|
||||
QLocale::setDefault(QLocale::C);
|
||||
QCoreApplication::setOrganizationName(MeshLabApplication::organization());
|
||||
|
||||
@ -2211,6 +2211,7 @@ bool MainWindow::importMesh(QString fileName)
|
||||
if(!prePar.isEmpty())
|
||||
{
|
||||
GenericParamDialog preOpenDialog(this, &prePar, tr("Pre-Open Options"));
|
||||
preOpenDialog.setFocus();
|
||||
preOpenDialog.exec();
|
||||
}
|
||||
int mask = 0;
|
||||
|
||||
@ -30,6 +30,7 @@ HEADERS = ../common/interfaces.h \
|
||||
xmlstdpardialog.h \
|
||||
additionalgui.h \
|
||||
xmlgeneratorgui.h \
|
||||
snapshotsetting.h \
|
||||
$$VCGDIR/wrap/gui/trackball.h \
|
||||
$$VCGDIR/wrap/gui/trackmode.h \
|
||||
$$VCGDIR/wrap/gl/trimesh.h \
|
||||
|
||||
@ -21,9 +21,9 @@
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
#include "glarea.h"
|
||||
#include <QDialog>
|
||||
#include <QFileDialog>
|
||||
#include "snapshotsetting.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
@ -8,24 +8,39 @@
|
||||
TEMPLATE = subdirs
|
||||
CONFIG += ordered
|
||||
|
||||
SUBDIRS = common \ # the common framework, used by all the plugins,
|
||||
meshlab \ # the GUI framework
|
||||
meshlabplugins/io_base\ # a few basic file formats (ply, obj, off), without this you cannot open anything
|
||||
|
||||
# the common framework, used by all the plugins,
|
||||
SUBDIRS = common \
|
||||
meshlab \ # the GUI framework
|
||||
meshlabplugins/io_base\ # a few basic file formats (ply, obj, off), without this you cannot open anything
|
||||
meshlabplugins/filter_meshing \
|
||||
meshlabplugins/filter_mls \ # a few basic filtering operations, including the well know simplification
|
||||
meshlabplugins/decorate_background \
|
||||
meshlabplugins/edit_align \
|
||||
meshlabplugins/edit_arc3D \
|
||||
meshlabplugins/edit_hole \
|
||||
|
||||
|
||||
# meshlabplugins/io_expe \
|
||||
# meshlabplugins/io_collada \
|
||||
#meshlabplugins/io_3ds \
|
||||
#meshlabplugins/io_u3d \
|
||||
#meshlabplugins/filter_poisson \
|
||||
#
|
||||
# Next some other useful, but still easy to be compiled, plugins
|
||||
# Uncomment them if you succeed in compiling the above ones.
|
||||
# meshlabplugins/edit_select \
|
||||
# meshlabplugins/filter_create\
|
||||
# meshlabplugins/filter_create\
|
||||
# meshlabplugins/filter_mutualinfoxml \
|
||||
# meshlabplugins/decorate_background \
|
||||
# meshlabplugins/filter_select \
|
||||
# meshlabplugins/decorate_base \
|
||||
# meshlabplugins/filter_colorize\
|
||||
# meshlabplugins/filter_measure\
|
||||
# meshlabplugins/filter_sampling\
|
||||
# meshlabplugins/filter_layer\
|
||||
# meshlabplugins/filter_bnpts \
|
||||
# meshlabplugins/edit_manipulators \
|
||||
# meshlabserver \
|
||||
|
||||
#
|
||||
|
||||
|
||||
@ -78,7 +78,7 @@ void CICubeMap::DrawEnvCube(Matrix44f &tr)
|
||||
|
||||
void CICubeMap::DrawEnvCubeOld(Matrix44f &tr)
|
||||
{
|
||||
checkGLError::qDebug("DrawEnvCubeOld: start");
|
||||
checkGLError::debugInfo("DrawEnvCubeOld: start");
|
||||
glMatrixMode(GL_MODELVIEW);
|
||||
glPushAttrib(GL_ENABLE_BIT|GL_CURRENT_BIT | GL_TEXTURE_BIT);
|
||||
|
||||
@ -112,7 +112,7 @@ void CICubeMap::DrawEnvCubeOld(Matrix44f &tr)
|
||||
glDepthMask(true);
|
||||
glPopMatrix();
|
||||
glPopAttrib();
|
||||
checkGLError::qDebug("DrawEnvCubeOld: end");
|
||||
checkGLError::debugInfo("DrawEnvCubeOld: end");
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -21,13 +21,10 @@
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtGui>
|
||||
|
||||
#include <math.h>
|
||||
#include <limits>
|
||||
#include <stdlib.h>
|
||||
#include "decorate_background.h"
|
||||
#include <QGLWidget>
|
||||
#include <wrap/gl/addons.h>
|
||||
|
||||
#include <meshlab/glarea.h>
|
||||
@ -341,4 +338,4 @@ void DecorateBackgroundPlugin::DrawGriddedCube(MeshModel &m, const Box3f &bb, fl
|
||||
|
||||
void DecorateBackgroundPlugin::setValue(QString name, vcg::Shotf val) {curShot=val;}
|
||||
|
||||
Q_EXPORT_PLUGIN(DecorateBackgroundPlugin)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(DecorateBackgroundPlugin)
|
||||
|
||||
@ -40,6 +40,7 @@ New small samples
|
||||
class DecorateBackgroundPlugin : public QObject, public MeshDecorateInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_DECORATE_INTERFACE_IID)
|
||||
Q_INTERFACES(MeshDecorateInterface)
|
||||
QString decorationName(FilterIDType id) const;
|
||||
QString decorationInfo(FilterIDType id) const;
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
include (../../shared.pri)
|
||||
|
||||
QT += opengl
|
||||
|
||||
HEADERS += decorate_background.h cubemap.h
|
||||
|
||||
SOURCES += decorate_background.cpp\
|
||||
|
||||
@ -1364,7 +1364,7 @@ void ExtraMeshDecoratePlugin::DrawTexParam(MeshModel &m, GLArea *gla, QPainter *
|
||||
textureName = qPrintable(QString(m.cm.textures[0].c_str()))+QString(" ");
|
||||
//, QPainter *qDebug(qPrintable(textureName));
|
||||
glLabel::render(painter,Point3f(0.0,-0.10,0.0),textureName);
|
||||
checkGLError::qDebug("DrawTexParam");
|
||||
checkGLError::debugInfo("DrawTexParam");
|
||||
drawQuotedLine(Point3d(0,0,0),Point3d(0,1,0),0,1,0.1,painter,qf,0,true);
|
||||
drawQuotedLine(Point3d(0,0,0),Point3d(1,0,0),0,1,0.1,painter,qf,90.0f);
|
||||
|
||||
@ -1477,4 +1477,4 @@ void ExtraMeshDecoratePlugin::initGlobalParameterSet(QAction *action, RichParame
|
||||
}
|
||||
|
||||
|
||||
Q_EXPORT_PLUGIN(ExtraMeshDecoratePlugin)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(ExtraMeshDecoratePlugin)
|
||||
|
||||
@ -34,6 +34,7 @@ typedef std::pair<vcg::Point3f,vcg::Color4b> PointPC; // this type is used to ha
|
||||
class ExtraMeshDecoratePlugin : public QObject, public MeshDecorateInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_DECORATE_INTERFACE_IID)
|
||||
Q_INTERFACES(MeshDecorateInterface)
|
||||
QString decorationName(FilterIDType filter) const;
|
||||
QString decorationInfo(FilterIDType filter) const;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
include (../../shared.pri)
|
||||
QT += opengl
|
||||
|
||||
HEADERS += decorate_base.h \
|
||||
colorhistogram.h \
|
||||
$$VCGDIR/wrap/qt/gl_label.h
|
||||
|
||||
@ -696,4 +696,4 @@ void DecorateRasterProjPlugin::decorateDoc( QAction *act,
|
||||
|
||||
|
||||
|
||||
Q_EXPORT_PLUGIN(DecorateRasterProjPlugin)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(DecorateRasterProjPlugin)
|
||||
|
||||
@ -36,6 +36,7 @@
|
||||
class DecorateRasterProjPlugin : public QObject, public MeshDecorateInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_DECORATE_INTERFACE_IID)
|
||||
Q_INTERFACES( MeshDecorateInterface )
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
include (../../shared.pri)
|
||||
|
||||
QT += opengl
|
||||
|
||||
HEADERS += decorate_raster_proj.h \
|
||||
$$VCGDIR/wrap/gui/trackball.h \
|
||||
|
||||
@ -22,9 +22,17 @@
|
||||
****************************************************************************/
|
||||
#ifndef DECORATE_SHADER_H
|
||||
#define DECORATE_SHADER_H
|
||||
#include <QObject>
|
||||
#include <GL/glew.h>
|
||||
#include <QFile>
|
||||
#include <QImage>
|
||||
#include <cassert>
|
||||
|
||||
//#include <QObject>
|
||||
#include <common/interfaces.h>
|
||||
#include <meshlab/glarea.h>
|
||||
//#include <meshlab/glarea.h>
|
||||
|
||||
|
||||
class GLArea;
|
||||
|
||||
#define BLUR_COEF 0.4
|
||||
|
||||
@ -92,17 +100,10 @@ protected:
|
||||
* and returns false, otherwise returns true;
|
||||
* @return true if no errors happened during the setup, false otherwise.
|
||||
*/
|
||||
bool initGlew(){
|
||||
bool initGlew()
|
||||
{
|
||||
GLenum err = glewInit();
|
||||
if (!GLEW_OK == err){
|
||||
QMessageBox msgBox;
|
||||
msgBox.setIcon(QMessageBox::Warning);
|
||||
msgBox.setWindowTitle("GLEW init failure");
|
||||
msgBox.setText(QString("Init GLEW failed."));
|
||||
msgBox.exec();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
return (err == GLEW_OK);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -110,16 +111,9 @@ protected:
|
||||
* it shows an allert message an returns false, otherwise returns true;
|
||||
* @return true if no errors happened during the setup, false otherwise.
|
||||
*/
|
||||
bool initSetup(){
|
||||
if(!this->setup()){
|
||||
QMessageBox msgBox;
|
||||
msgBox.setIcon(QMessageBox::Warning);
|
||||
msgBox.setWindowTitle("FBO Setup failure");
|
||||
msgBox.setText(QString("Failed in creating a Frame Buffer Object."));
|
||||
msgBox.exec();
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
bool initSetup()
|
||||
{
|
||||
return setup();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -119,4 +119,4 @@ void DecorateShadowPlugin::decorateDoc(QAction *action, MeshDocument &md, RichPa
|
||||
}
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(DecorateShadowPlugin)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(DecorateShadowPlugin)
|
||||
|
||||
@ -35,6 +35,7 @@
|
||||
class DecorateShadowPlugin : public QObject, public MeshDecorateInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_DECORATE_INTERFACE_IID)
|
||||
Q_INTERFACES(MeshDecorateInterface)
|
||||
|
||||
enum {
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
include (../../shared.pri)
|
||||
|
||||
QT += opengl
|
||||
|
||||
HEADERS += decorate_shadow.h \
|
||||
shadow_mapping.h \
|
||||
|
||||
@ -21,10 +21,12 @@
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
#include <meshlab/glarea.h>
|
||||
#include "decorate_shader.h"
|
||||
#include "shadow_mapping.h"
|
||||
#include <common/pluginmanager.h>
|
||||
|
||||
|
||||
ShadowMapping::ShadowMapping(float intensity):DecorateShader()
|
||||
{
|
||||
this->_intensity=intensity;
|
||||
|
||||
@ -21,8 +21,11 @@
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
#include <meshlab/glarea.h>
|
||||
#include "ssao.h"
|
||||
|
||||
#include <common/pluginmanager.h>
|
||||
|
||||
SSAO::SSAO(float radius):DecorateShader()
|
||||
{
|
||||
this->_radius = radius;
|
||||
|
||||
@ -24,6 +24,8 @@
|
||||
#include "decorate_shader.h"
|
||||
#include "variance_shadow_mapping.h"
|
||||
#include <common/pluginmanager.h>
|
||||
#include <meshlab/glarea.h>
|
||||
|
||||
|
||||
VarianceShadowMapping::VarianceShadowMapping(float intensity):ShadowMapping(intensity)
|
||||
{
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
#include <meshlab/glarea.h>
|
||||
#include "decorate_shader.h"
|
||||
#include "variance_shadow_mapping_blur.h"
|
||||
#include <common/pluginmanager.h>
|
||||
|
||||
@ -22,10 +22,12 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include <GL/glew.h>
|
||||
#include <QObject>
|
||||
#include <QtGui>
|
||||
#include <QLabel>
|
||||
#include <QCheckBox>
|
||||
#include <QDialog>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QLayout>
|
||||
#include <QDesktopWidget>
|
||||
#include <wrap/gui/trackball.h>
|
||||
#include <common/interfaces.h>
|
||||
#include "AlignPairWidget.h"
|
||||
|
||||
@ -110,7 +110,7 @@ public:
|
||||
int FixFaceNum;
|
||||
int TotTime() { return I.back().Time-StartTime; }
|
||||
int IterTime(unsigned int i) const
|
||||
{ const int clock_per_ms = std::max(CLOCKS_PER_SEC / 1000,1);
|
||||
{ const int clock_per_ms = std::max<int>(CLOCKS_PER_SEC / 1000,1);
|
||||
assert(i<I.size());
|
||||
if(i==0) return (I[i].Time-StartTime )/clock_per_ms;
|
||||
else return (I[i].Time - I[i-1].Time)/clock_per_ms ;
|
||||
|
||||
@ -28,8 +28,7 @@ $Log: stdpardialog.cpp,v $
|
||||
****************************************************************************/
|
||||
|
||||
#include <GL/glew.h>
|
||||
#include <QtGui>
|
||||
|
||||
#include <QDockWidget>
|
||||
#include "edit_align.h"
|
||||
|
||||
#include "alignDialog.h"
|
||||
|
||||
@ -27,7 +27,8 @@ $Log: stdpardialog.cpp,v $
|
||||
****************************************************************************/
|
||||
#ifndef ALIGN_DIALOG_H
|
||||
#define ALIGN_DIALOG_H
|
||||
#include <QtGui>
|
||||
#include <QMenu>
|
||||
#include <QDockWidget>
|
||||
#include "meshtree.h"
|
||||
class GLArea;
|
||||
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
History
|
||||
$Log: meshedit.cpp,v $
|
||||
****************************************************************************/
|
||||
#include <QtGui>
|
||||
|
||||
#include <meshlab/glarea.h>
|
||||
#include "edit_align.h"
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
#ifndef EditAlignPLUGIN_H
|
||||
#define EditAlignPLUGIN_H
|
||||
|
||||
#include <QObject>
|
||||
#include <common/interfaces.h>
|
||||
#include "align/AlignPair.h"
|
||||
#include "align/OccupancyGrid.h"
|
||||
|
||||
@ -35,7 +35,7 @@ INCLUDEPATH += ../../external
|
||||
|
||||
FORMS += alignDialog.ui
|
||||
TARGET = edit_align
|
||||
QT += opengl
|
||||
|
||||
RESOURCES = edit_align.qrc
|
||||
release {DEFINES += NDEBUG}
|
||||
macx:QMAKE_CXX=g++
|
||||
|
||||
@ -52,4 +52,4 @@ QString EditAlignFactory::getEditToolDescription(QAction *)
|
||||
return EditAlignPlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(EditAlignFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(EditAlignFactory)
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
class EditAlignFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -25,7 +25,6 @@
|
||||
$Log: meshedit.cpp,v $
|
||||
****************************************************************************/
|
||||
#include <Qt>
|
||||
#include <QtGui>
|
||||
#include <QtXml/QDomDocument>
|
||||
#include <QtXml/QDomElement>
|
||||
#include <QtXml/QDomNode>
|
||||
@ -194,7 +193,6 @@ void EditArc3DPlugin::ExportPly()
|
||||
|
||||
int tt2=clock();
|
||||
this->Log(GLLogStream::SYSTEM,"** Mesh %i : Append in %i\n",selectedCount,tt2-tt1);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -289,7 +287,7 @@ void EditArc3DPlugin::exportShotsToRasters()
|
||||
{
|
||||
if ((saveSelected==v3dImportDialog::EXPORT_ALL) || (qtw->isItemSelected(qtw->item(i,0))))
|
||||
{
|
||||
er.modelList[i].cam.Open(er.modelList[i].cameraName.toAscii());
|
||||
er.modelList[i].cam.Open(er.modelList[i].cameraName.toUtf8().data());
|
||||
mm.Clear();
|
||||
Point3f corr=er.modelList[i].TraCorrection(mm,subSampleVal*2,minCountVal,0);
|
||||
er.modelList[i].shot.Extrinsics.SetTra(er.modelList[i].shot.Extrinsics.Tra()-corr);
|
||||
@ -613,8 +611,8 @@ bool Arc3DModel::BuildMesh(CMeshO &m, int subsampleFactor, int minCount, float m
|
||||
FloatImage depthImgf;
|
||||
CharImage countImgc;
|
||||
int ttt0=clock();
|
||||
depthImgf.Open(depthName.toAscii());
|
||||
countImgc.Open(countName.toAscii());
|
||||
depthImgf.Open(depthName.toUtf8().data());
|
||||
countImgc.Open(countName.toUtf8().data());
|
||||
|
||||
QImage TextureImg;
|
||||
TextureImg.load(textureName);
|
||||
@ -661,7 +659,7 @@ bool Arc3DModel::BuildMesh(CMeshO &m, int subsampleFactor, int minCount, float m
|
||||
m.vn--;
|
||||
}
|
||||
|
||||
cam.Open(cameraName.toAscii());
|
||||
cam.Open(cameraName.toUtf8().data());
|
||||
|
||||
CMeshO::VertexIterator vi;
|
||||
Matrix33d Rinv= Inverse(cam.R);
|
||||
@ -725,8 +723,8 @@ Point3f Arc3DModel::TraCorrection(CMeshO &m, int subsampleFactor, int minCount,
|
||||
{
|
||||
FloatImage depthImgf;
|
||||
CharImage countImgc;
|
||||
depthImgf.Open(depthName.toAscii());
|
||||
countImgc.Open(countName.toAscii());
|
||||
depthImgf.Open(depthName.toUtf8().data());
|
||||
countImgc.Open(countName.toUtf8().data());
|
||||
|
||||
QImage TextureImg;
|
||||
TextureImg.load(textureName);
|
||||
@ -762,7 +760,7 @@ Point3f Arc3DModel::TraCorrection(CMeshO &m, int subsampleFactor, int minCount,
|
||||
m.vn--;
|
||||
}
|
||||
|
||||
cam.Open(cameraName.toAscii());
|
||||
cam.Open(cameraName.toUtf8().data());
|
||||
|
||||
CMeshO::VertexIterator vi;
|
||||
Matrix33d Rinv= Inverse(cam.R);
|
||||
@ -826,7 +824,7 @@ bool Arc3DModel::Init(QDomNode &node)
|
||||
|
||||
FILE* lvcam;
|
||||
|
||||
lvcam = fopen(cameraName.toAscii(),"rb");
|
||||
lvcam = fopen(cameraName.toUtf8().data(),"rb");
|
||||
|
||||
// focus + image centers
|
||||
fscanf(lvcam,"%lf %lf %lf",&(cam[0]),&(cam[1]),&(cam[2]));
|
||||
|
||||
@ -41,7 +41,7 @@
|
||||
class EditArc3DPlugin : public QObject, public MeshEditInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
Q_INTERFACES(MeshEditInterface)
|
||||
Q_INTERFACES(MeshEditInterface)
|
||||
|
||||
public:
|
||||
EditArc3DPlugin();
|
||||
|
||||
@ -26,11 +26,11 @@ SOURCES += edit_arc3D.cpp \
|
||||
$$VCGDIR/wrap/ply/plylib.cpp
|
||||
|
||||
TARGET = edit_arc3D
|
||||
QT += xml
|
||||
RESOURCES = edit_arc3D.qrc
|
||||
|
||||
win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib
|
||||
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib
|
||||
win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/bz2.lib
|
||||
win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a
|
||||
linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a
|
||||
linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a
|
||||
@ -38,6 +38,7 @@ linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a
|
||||
|
||||
win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
win32-msvc2010:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5
|
||||
|
||||
@ -54,4 +54,4 @@ QString EditArc3DFactory::getEditToolDescription(QAction *)
|
||||
return EditArc3DPlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(EditArc3DFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(EditArc3DFactory)
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
class EditArc3DFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -24,23 +24,23 @@
|
||||
#include "maskImageWidget.h"
|
||||
#include "maskRenderWidget.h"
|
||||
#include "fillImage.h"
|
||||
#include <QtGui/QPen>
|
||||
#include <QtGui/QBrush>
|
||||
#include <QtGui/QPolygon>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPalette>
|
||||
#include <QtGui/QMouseEvent>
|
||||
#include <QtGui/QPaintEvent>
|
||||
#include <QtGui/QApplication>
|
||||
#include <QtGui/QMessageBox>
|
||||
#include <QtGui/QAction>
|
||||
#include <QtGui/QVBoxLayout>
|
||||
#include <QtGui/QToolBar>
|
||||
#include <QtGui/QSpinBox>
|
||||
#include <QtGui/QFileDialog>
|
||||
#include <QtGui/QDesktopWidget>
|
||||
#include <QPen>
|
||||
#include <QBrush>
|
||||
#include <QPolygon>
|
||||
#include <QPixmap>
|
||||
#include <QImage>
|
||||
#include <QPainter>
|
||||
#include <QPalette>
|
||||
#include <QMouseEvent>
|
||||
#include <QPaintEvent>
|
||||
#include <QApplication>
|
||||
#include <QMessageBox>
|
||||
#include <QAction>
|
||||
#include <QVBoxLayout>
|
||||
#include <QToolBar>
|
||||
#include <QSpinBox>
|
||||
#include <QFileDialog>
|
||||
#include <QDesktopWidget>
|
||||
|
||||
#include <stack>
|
||||
#include <cmath>
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#define __IO_MASK_IMAGE_WIDGET_INC__
|
||||
|
||||
|
||||
#include <QtGui/QDialog>
|
||||
#include <QDialog>
|
||||
|
||||
|
||||
namespace ui
|
||||
|
||||
@ -22,17 +22,17 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include "maskRenderWidget.h"
|
||||
#include <QtGui/QPen>
|
||||
#include <QtGui/QBrush>
|
||||
#include <QtGui/QPolygon>
|
||||
#include <QtGui/QPixmap>
|
||||
#include <QtGui/QImage>
|
||||
#include <QtGui/QPainter>
|
||||
#include <QtGui/QPalette>
|
||||
#include <QtGui/QMouseEvent>
|
||||
#include <QtGui/QPaintEvent>
|
||||
#include <QtGui/QApplication>
|
||||
#include <QtGui/QMessageBox>
|
||||
#include <QPen>
|
||||
#include <QBrush>
|
||||
#include <QPolygon>
|
||||
#include <QPixmap>
|
||||
#include <QImage>
|
||||
#include <QPainter>
|
||||
#include <QPalette>
|
||||
#include <QMouseEvent>
|
||||
#include <QPaintEvent>
|
||||
#include <QApplication>
|
||||
#include <QMessageBox>
|
||||
|
||||
#include <stack>
|
||||
#include <cmath>
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
#define __IO_MASK_RENDER_WIDGET_INC__
|
||||
|
||||
|
||||
#include <QtGui/QWidget>
|
||||
#include <QWidget>
|
||||
|
||||
|
||||
namespace ui
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
* *
|
||||
****************************************************************************/
|
||||
#include <Qt>
|
||||
#include <QtGui>
|
||||
#include <QMessageBox>
|
||||
#include <QDialog>
|
||||
|
||||
#include "v3dImportDialog.h"
|
||||
@ -167,7 +167,7 @@ void v3dImportDialog::setArc3DReconstruction(Arc3DReconstruction *_er)
|
||||
if(!QFile::exists(ThumbCntName))
|
||||
{
|
||||
CharImage chi;
|
||||
bool ret=chi.Open(er->modelList[i].countName.toAscii());
|
||||
bool ret=chi.Open(er->modelList[i].countName.toUtf8().data());
|
||||
if(!ret) QMessageBox::warning(this,"Error in Thumb creation",QString("Unable to create '%1' from '%2'").arg(ThumbCntName,er->modelList[i].textureName));
|
||||
|
||||
CharImage::colorizedScaledToHeight(64,chi).save(ThumbCntName,"jpg");
|
||||
|
||||
@ -21,7 +21,8 @@
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtGui>
|
||||
#include <QMessageBox>
|
||||
#include <QMouseEvent>
|
||||
#include <QString>
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
@ -14,11 +14,7 @@ SOURCES = edit_hole_factory.cpp \
|
||||
holeListModel.cpp
|
||||
|
||||
TARGET = edit_hole
|
||||
|
||||
QT += opengl
|
||||
RESOURCES = edit_hole.qrc
|
||||
FORMS = edit_hole.ui
|
||||
|
||||
QT += opengl
|
||||
|
||||
|
||||
|
||||
@ -54,4 +54,4 @@ QString EditHoleFactory::getEditToolDescription(QAction *)
|
||||
return EditHolePlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(EditHoleFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(EditHoleFactory)
|
||||
|
||||
@ -25,12 +25,13 @@
|
||||
#ifndef EditHoleFactoryPLUGIN_H
|
||||
#define EditHoleFactoryPLUGIN_H
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include <common/interfaces.h>
|
||||
|
||||
class EditHoleFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -24,9 +24,9 @@
|
||||
#define FILLERDIALOG_H
|
||||
|
||||
#include <QWidget>
|
||||
#include <QtGui/QDockWidget>
|
||||
#include <QtGui/QStandardItemModel>
|
||||
#include <QtGui/QSortFilterProxyModel>
|
||||
#include <QDockWidget>
|
||||
#include <QStandardItemModel>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include "ui_edit_hole.h"
|
||||
|
||||
class FillerDialog : public QDockWidget
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include "holeListModel.h"
|
||||
#include <QMessageBox>
|
||||
|
||||
using namespace vcg;
|
||||
|
||||
@ -373,7 +374,7 @@ QModelIndex HoleListModel::index(int row, int column, const QModelIndex &/*paren
|
||||
{
|
||||
if(row >= (int)holesManager.holes.size())
|
||||
return QModelIndex();
|
||||
return createIndex(row,column, 0);
|
||||
return createIndex(row,column/*,0*/);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -25,7 +25,9 @@
|
||||
|
||||
#include <QWidget>
|
||||
#include <QHeaderView>
|
||||
#include <QtGui>
|
||||
#include <QVariant>
|
||||
#include <QModelIndex>
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <common/meshmodel.h>
|
||||
#include "fgtHole.h"
|
||||
#include "fgtBridge.h"
|
||||
|
||||
@ -20,13 +20,13 @@
|
||||
* for more details. *
|
||||
* *
|
||||
****************************************************************************/
|
||||
#include <QtGui>
|
||||
|
||||
#include <meshlab/glarea.h>
|
||||
#include "edit_manipulators.h"
|
||||
#include <wrap/qt/gl_label.h>
|
||||
#include <wrap/gui/trackball.h>
|
||||
|
||||
|
||||
using namespace vcg;
|
||||
|
||||
EditManipulatorsPlugin::EditManipulatorsPlugin()
|
||||
|
||||
@ -10,6 +10,4 @@ SOURCES = edit_manipulators_factory.cpp \
|
||||
|
||||
TARGET = edit_manipulators
|
||||
|
||||
QT += opengl
|
||||
|
||||
RESOURCES = edit_manipulators.qrc
|
||||
|
||||
@ -54,4 +54,4 @@ QString EditManipulatorsFactory::getEditToolDescription(QAction *)
|
||||
return EditManipulatorsPlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(EditManipulatorsFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(EditManipulatorsFactory)
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
class EditManipulatorsFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -24,7 +24,6 @@
|
||||
History
|
||||
$Log: editmeasure.cpp,v $
|
||||
****************************************************************************/
|
||||
#include <QtGui>
|
||||
|
||||
#include <meshlab/glarea.h>
|
||||
#include "edit_measure.h"
|
||||
|
||||
@ -9,6 +9,4 @@ SOURCES = edit_measure_factory.cpp \
|
||||
|
||||
TARGET = edit_measure
|
||||
|
||||
QT += opengl
|
||||
|
||||
RESOURCES = edit_measure.qrc
|
||||
|
||||
@ -54,4 +54,4 @@ QString EditMeasureFactory::getEditToolDescription(QAction *)
|
||||
return EditMeasurePlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(EditMeasureFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(EditMeasureFactory)
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
class EditMeasureFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -19,85 +19,87 @@
|
||||
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) *
|
||||
* for more details. *
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef CLONEVIEW_H_
|
||||
#define CLONEVIEW_H_
|
||||
|
||||
#include <QtGui>
|
||||
|
||||
class CloneView : public QGraphicsView
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
private :
|
||||
QPointF last_pos;
|
||||
QPointF start_pos;
|
||||
|
||||
QGraphicsItem * crosshair;
|
||||
|
||||
public :
|
||||
QGraphicsItem * scenegroup;
|
||||
|
||||
CloneView(QWidget * parent) : QGraphicsView(parent)
|
||||
{
|
||||
setDragMode(QGraphicsView::NoDrag); setMouseTracking(false);
|
||||
}
|
||||
|
||||
virtual void mousePressEvent(QMouseEvent * event) {
|
||||
start_pos = QPointF(event->pos());
|
||||
last_pos.setX(event->pos().x()); last_pos.setY(event->pos().y());
|
||||
|
||||
if (event->buttons() == Qt::RightButton)
|
||||
emit positionReset();
|
||||
}
|
||||
|
||||
virtual void mouseMoveEvent ( QMouseEvent * event)
|
||||
{
|
||||
if (!(event->buttons() & Qt::LeftButton)) return;
|
||||
QGraphicsItem * item = itemAt(event->pos());
|
||||
if (item != NULL)
|
||||
if (!crosshair->isAncestorOf(item)) item->moveBy(event->pos().x() - last_pos.x(), event->pos().y() - last_pos.y());
|
||||
last_pos.setX(event->pos().x()); last_pos.setY(event->pos().y());
|
||||
// emit positionChanged(last_pos.x() - start_pos.x(), last_pos.y() - start_pos.y());
|
||||
}
|
||||
|
||||
virtual void mouseReleaseEvent ( QMouseEvent *)
|
||||
{
|
||||
emit positionChanged(last_pos.x() - start_pos.x(), last_pos.y() - start_pos.y());
|
||||
}
|
||||
|
||||
virtual void wheelEvent(QWheelEvent *)
|
||||
{
|
||||
//ignore or move..
|
||||
}
|
||||
|
||||
virtual void setScene(QGraphicsScene * scene)
|
||||
{
|
||||
QGraphicsView::setScene(scene);
|
||||
|
||||
scenegroup = new QGraphicsItemGroup(NULL, scene);
|
||||
crosshair = new QGraphicsItemGroup(scenegroup);
|
||||
crosshair->setZValue(2);
|
||||
QPen pen;
|
||||
pen.setWidth(3);
|
||||
pen.setColor(QColor(qRgb(255, 255, 255)));
|
||||
QGraphicsItem * p = scene->addLine(0, 8, 0, -8, pen);
|
||||
p->setParentItem(crosshair);
|
||||
QGraphicsItem * c = scene->addLine(8, 0, -8, 0, pen);
|
||||
c->setParentItem(p); p = c;
|
||||
pen.setWidth(1);
|
||||
pen.setColor(QColor(qRgb(0, 0, 0)));
|
||||
c = scene->addLine(0, 8, 0, -8, pen);
|
||||
c->setParentItem(p); p = c;
|
||||
c = scene->addLine(8, 0, -8, 0, pen);
|
||||
c->setParentItem(p); p = c;
|
||||
}
|
||||
|
||||
signals:
|
||||
void positionChanged(double x, double y);
|
||||
void positionReset();
|
||||
|
||||
};
|
||||
|
||||
#endif /*CLONEVIEW_H_*/
|
||||
****************************************************************************/
|
||||
|
||||
#ifndef CLONEVIEW_H_
|
||||
#define CLONEVIEW_H_
|
||||
|
||||
#include <QGraphicsView>
|
||||
#include <QGraphicsItem>
|
||||
#include <QMouseEvent>
|
||||
|
||||
class CloneView : public QGraphicsView
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
private :
|
||||
QPointF last_pos;
|
||||
QPointF start_pos;
|
||||
|
||||
QGraphicsItem * crosshair;
|
||||
|
||||
public :
|
||||
QGraphicsItem * scenegroup;
|
||||
|
||||
CloneView(QWidget * parent) : QGraphicsView(parent)
|
||||
{
|
||||
setDragMode(QGraphicsView::NoDrag); setMouseTracking(false);
|
||||
}
|
||||
|
||||
virtual void mousePressEvent(QMouseEvent * event) {
|
||||
start_pos = QPointF(event->pos());
|
||||
last_pos.setX(event->pos().x()); last_pos.setY(event->pos().y());
|
||||
|
||||
if (event->buttons() == Qt::RightButton)
|
||||
emit positionReset();
|
||||
}
|
||||
|
||||
virtual void mouseMoveEvent ( QMouseEvent * event)
|
||||
{
|
||||
if (!(event->buttons() & Qt::LeftButton)) return;
|
||||
QGraphicsItem * item = itemAt(event->pos());
|
||||
if (item != NULL)
|
||||
if (!crosshair->isAncestorOf(item)) item->moveBy(event->pos().x() - last_pos.x(), event->pos().y() - last_pos.y());
|
||||
last_pos.setX(event->pos().x()); last_pos.setY(event->pos().y());
|
||||
// emit positionChanged(last_pos.x() - start_pos.x(), last_pos.y() - start_pos.y());
|
||||
}
|
||||
|
||||
virtual void mouseReleaseEvent ( QMouseEvent *)
|
||||
{
|
||||
emit positionChanged(last_pos.x() - start_pos.x(), last_pos.y() - start_pos.y());
|
||||
}
|
||||
|
||||
virtual void wheelEvent(QWheelEvent *)
|
||||
{
|
||||
//ignore or move..
|
||||
}
|
||||
|
||||
virtual void setScene(QGraphicsScene * scene)
|
||||
{
|
||||
QGraphicsView::setScene(scene);
|
||||
|
||||
scenegroup = new QGraphicsItemGroup(NULL/*, scene*/);
|
||||
crosshair = new QGraphicsItemGroup(scenegroup);
|
||||
crosshair->setZValue(2);
|
||||
QPen pen;
|
||||
pen.setWidth(3);
|
||||
pen.setColor(QColor(qRgb(255, 255, 255)));
|
||||
QGraphicsItem * p = scene->addLine(0, 8, 0, -8, pen);
|
||||
p->setParentItem(crosshair);
|
||||
QGraphicsItem * c = scene->addLine(8, 0, -8, 0, pen);
|
||||
c->setParentItem(p); p = c;
|
||||
pen.setWidth(1);
|
||||
pen.setColor(QColor(qRgb(0, 0, 0)));
|
||||
c = scene->addLine(0, 8, 0, -8, pen);
|
||||
c->setParentItem(p); p = c;
|
||||
c = scene->addLine(8, 0, -8, 0, pen);
|
||||
c->setParentItem(p); p = c;
|
||||
}
|
||||
|
||||
signals:
|
||||
void positionChanged(double x, double y);
|
||||
void positionReset();
|
||||
|
||||
};
|
||||
|
||||
#endif /*CLONEVIEW_H_*/
|
||||
|
||||
@ -1,7 +1,8 @@
|
||||
#ifndef COLORFRAME_H_
|
||||
#define COLORFRAME_H_
|
||||
|
||||
#include <QtGui>
|
||||
#include <QFrame>
|
||||
#include <QColorDialog>
|
||||
|
||||
/*
|
||||
*A simple widget that displays a color and allows the
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
include (../../shared.pri)
|
||||
|
||||
QT += opengl
|
||||
|
||||
HEADERS = edit_paint_factory.h \
|
||||
cloneview.h \
|
||||
colorframe.h \
|
||||
|
||||
@ -54,4 +54,4 @@ QString EditPaintFactory::getEditToolDescription(QAction *)
|
||||
return EditPaintPlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(EditPaintFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(EditPaintFactory)
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
class EditPaintFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -22,6 +22,7 @@
|
||||
****************************************************************************/
|
||||
|
||||
#include "paintbox.h"
|
||||
#include <QFileDialog>
|
||||
|
||||
Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags)
|
||||
{
|
||||
|
||||
@ -28,6 +28,9 @@
|
||||
|
||||
#include <vcg/math/base.h>
|
||||
#include <GL/glew.h>
|
||||
#include <QHash>
|
||||
#include <QUndoStack>
|
||||
#include <QUndoGroup>
|
||||
#include "ui_paintbox.h"
|
||||
|
||||
/**
|
||||
|
||||
@ -20,5 +20,3 @@ FORMS += pickpointsDialog.ui
|
||||
|
||||
TARGET = edit_pickpoints
|
||||
|
||||
QT += opengl
|
||||
QT += xml
|
||||
|
||||
@ -54,4 +54,4 @@ QString EditPickPointsFactory::getEditToolDescription(QAction *)
|
||||
return EditPickPointsPlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(EditPickPointsFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(EditPickPointsFactory)
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
class EditPickPointsFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -27,8 +27,6 @@
|
||||
* @author Oscar Barney
|
||||
*/
|
||||
|
||||
#include <QtGui>
|
||||
|
||||
#include <GL/glew.h>
|
||||
|
||||
#include "editpickpoints.h"
|
||||
|
||||
@ -26,8 +26,7 @@
|
||||
* @author Oscar Barney
|
||||
*/
|
||||
|
||||
#include <QtGui>
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <math.h>
|
||||
|
||||
#include <common/meshmodel.h>
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#ifndef PICKPOINTS_DIALOG_H
|
||||
#define PICKPOINTS_DIALOG_H
|
||||
|
||||
#include <QtGui>
|
||||
#include <QDockWidget>
|
||||
|
||||
#include <common/meshmodel.h>
|
||||
#include <meshlab/glarea.h>
|
||||
|
||||
@ -21,8 +21,6 @@
|
||||
* *
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtGui>
|
||||
|
||||
#include <math.h>
|
||||
#include <stdlib.h>
|
||||
#include <meshlab/glarea.h>
|
||||
|
||||
@ -13,7 +13,6 @@ SOURCES = \
|
||||
|
||||
TARGET = edit_point
|
||||
|
||||
QT += opengl
|
||||
|
||||
RESOURCES = edit_point.qrc
|
||||
|
||||
|
||||
@ -58,4 +58,4 @@ QString PointEditFactory::getEditToolDescription(QAction *)
|
||||
return EditPointPlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(PointEditFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(PointEditFactory)
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
class PointEditFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -27,4 +27,3 @@ RESOURCES = qualitymapper.qrc
|
||||
|
||||
FORMS = qualitymapperdialog.ui
|
||||
|
||||
QT += opengl
|
||||
|
||||
@ -55,4 +55,4 @@ QString QualityMapperFactory::getEditToolDescription(QAction *)
|
||||
return QualityMapperPlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(QualityMapperFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(QualityMapperFactory)
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
class QualityMapperFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -28,6 +28,8 @@ FIRST RELEASE
|
||||
****************************************************************************/
|
||||
|
||||
#include "eqhandle.h"
|
||||
#include <QMouseEvent>
|
||||
#include <QGraphicsSceneMouseEvent>
|
||||
|
||||
EqHandle::EqHandle(CHART_INFO *environment_info, QColor color, QPointF position,
|
||||
EQUALIZER_HANDLE_TYPE type, EqHandle** handles, qreal* midHandlePercentilePosition, QDoubleSpinBox* spinbox,
|
||||
|
||||
@ -31,6 +31,7 @@ FIRST RELEASE
|
||||
#define _EQHANDLE_H_
|
||||
|
||||
#include "handle.h"
|
||||
#include <QDoubleSpinBox>
|
||||
|
||||
enum EQUALIZER_HANDLE_TYPE
|
||||
{
|
||||
|
||||
@ -28,7 +28,7 @@ FIRST RELEASE
|
||||
****************************************************************************/
|
||||
|
||||
#include "handle.h"
|
||||
|
||||
#include <QGraphicsSceneMouseEvent>
|
||||
|
||||
Handle::Handle(CHART_INFO *environment_info, QColor color, QPointF position, int zOrder, int size ) : _chartInfo(environment_info)
|
||||
{
|
||||
|
||||
@ -27,7 +27,6 @@ FIRST RELEASE
|
||||
|
||||
****************************************************************************/
|
||||
|
||||
#include <QtGui>
|
||||
#include <limits>
|
||||
#include <meshlab/glarea.h>
|
||||
#include "qualitymapper.h"
|
||||
|
||||
@ -25,6 +25,8 @@
|
||||
#include <limits>
|
||||
#include <QPen>
|
||||
#include <QBrush>
|
||||
#include <QGraphicsSceneMouseEvent>
|
||||
#include <QFileDialog>
|
||||
|
||||
using namespace vcg;
|
||||
|
||||
|
||||
@ -28,6 +28,7 @@ FIRST RELEASE
|
||||
****************************************************************************/
|
||||
|
||||
#include "tfhandle.h"
|
||||
#include <QGraphicsSceneMouseEvent>
|
||||
|
||||
//declaration of static member of TFHandle class
|
||||
TransferFunction* TFHandle::_tf = 0;
|
||||
|
||||
@ -8,7 +8,6 @@ SOURCES = edit_select_factory.cpp \
|
||||
|
||||
TARGET = edit_select
|
||||
|
||||
QT += opengl
|
||||
RESOURCES = edit_select.qrc
|
||||
|
||||
|
||||
|
||||
@ -62,4 +62,4 @@ QString EditSelectFactory::getEditToolDescription(QAction */*a*/)
|
||||
return EditSelectPlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(EditSelectFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(EditSelectFactory)
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
class EditSelectFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -54,4 +54,4 @@ QString EditSliceFactory::getEditToolDescription(QAction *)
|
||||
return ExtraMeshSlidePlugin::Info();
|
||||
}
|
||||
|
||||
Q_EXPORT_PLUGIN(EditSliceFactory)
|
||||
MESHLAB_PLUGIN_NAME_EXPORTER(EditSliceFactory)
|
||||
|
||||
@ -30,6 +30,7 @@
|
||||
class EditSliceFactory : public QObject, public MeshEditInterfaceFactory
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_FACTORY_IID)
|
||||
Q_INTERFACES(MeshEditInterfaceFactory)
|
||||
|
||||
public:
|
||||
|
||||
@ -60,6 +60,7 @@ typedef vcg::edg::io::SVGProperties SVGProperties;
|
||||
class ExtraMeshSlidePlugin : public QObject, public MeshEditInterface
|
||||
{
|
||||
Q_OBJECT
|
||||
MESHLAB_PLUGIN_IID_EXPORTER(MESH_EDIT_INTERFACE_IID)
|
||||
Q_INTERFACES(MeshEditInterface)
|
||||
|
||||
public:
|
||||
|
||||
@ -14,6 +14,5 @@ SOURCES = edit_slice_factory.cpp \
|
||||
|
||||
TARGET = editslice
|
||||
|
||||
QT += opengl
|
||||
RESOURCES = meshlab.qrc
|
||||
FORMS = slicedialog.ui svgpro.ui
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user