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

fixed a crash with the release version

Browse Source
This commit is contained in:
Paolo Cignoni cignoni 2007-11-02 13:58:28 +00:00
parent 71a7c569dd
commit bd80073e57
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/meshlabplugins/editsegment/editsegment.cpp
View File

@ -227,15 +227,20 @@ Color4b toVcgColor(QColor c) {
return Color4b(c.red(),c.green(),c.blue(),255);
}
EditSegment::EditSegment() {
actionList << new QAction(QIcon(":/images/editsegment.png"),"Mesh Segmentation", this);
QAction* qaction = new QAction(QIcon(":/images/editsegment.png"),"Mesh Segmentation", this);
qaction->setCheckable(true);
actionList << qaction;
pixels = 0;
pen.radius = 3;
pen.backface = false;
pen.invisible = false;
pressed = false;
dragging = false;
first = true;
meshCut = 0;
meshCutDialog = 0;
glarea = 0;
meshcut_dock = 0;
//glarea = 0;
selectForeground = true;
}
EditSegment::~EditSegment(){
@ -290,6 +295,10 @@ void EditSegment::StartEdit(QAction * mode, MeshModel & m, GLArea * parent) {
parent->getCurrentRenderMode().colorMode=vcg::GLW::CMPerVert;
parent->mm()->ioMask|=MeshModel::IOM_VERTCOLOR;
first = true;
pressed = false;
dragging = false;
glarea = parent;
parent->update();
@ -304,7 +313,7 @@ void EditSegment::Decorate (QAction * ac, MeshModel & m, GLArea * gla) {
if (first) {
first=false;
if (pixels!=0) { free(pixels); }
if (pixels) { free(pixels); }
pixels=(GLfloat *)malloc(sizeof(GLfloat)*gla->curSiz.width()*gla->curSiz.height());
glReadPixels(0,0,gla->curSiz.width(),gla->curSiz.height(),GL_DEPTH_COMPONENT,GL_FLOAT,pixels);
}
@ -318,8 +327,8 @@ void EditSegment::Decorate (QAction * ac, MeshModel & m, GLArea * gla) {
vector<CMeshO::FacePointer> faceSel;
getInternFaces(m,&currentSelection,&newSel,&faceSel,gla,pen,current_point,previous_point,pixels,mvmatrix,projmatrix,viewport);
vector<CMeshO::FacePointer>::iterator fpo;
vector<CMeshO::FacePointer>::iterator fpo;
for(fpo=faceSel.begin();fpo!=faceSel.end();++fpo) {
for (int i=0; i<3; ++i) {
if (mouse_button_pressed==Qt::LeftButton) {

1
src/meshlabplugins/editsegment/editsegment.h
View File

@ -36,7 +36,6 @@ private:
bool first;
bool dragging;
bool selectForeground;
QPoint starting_point;
QPoint current_point;
QPoint previous_point;
Qt::MouseButton mouse_button_pressed;

8
src/meshlabplugins/editsegment/editsegment.pro
View File

@ -1,5 +1,6 @@
TEMPLATE = lib
CONFIG += plugin
CONFIG += debug_and_release
INCLUDEPATH += ../.. ../../../../sf ../../../../code/lib/glew/include
HEADERS = editsegment.h cutting.h curvaturetensor.h meshcutdialog.h colorpicker.h
SOURCES = editsegment.cpp ../../../../code/lib/glew/src/glew.c meshcutdialog.cpp colorpiker.cpp
@ -9,6 +10,7 @@ DEFINES += GLEW_STATIC
QT += opengl
RESOURCES = meshlab.qrc
FORMS+=meshcutdialog.ui
contains(TEMPLATE,lib){
CONFIG(debug, debug|release){
unix{
@ -19,6 +21,6 @@ contains(TEMPLATE,lib){
}
}
}
#win32{
# DEFINES += NOMINMAX
#}
win32{
DEFINES += NOMINMAX
}