Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add windows.h for includes GL/gl.h; handle cancel for denoiseWidget. #2267

Merged
merged 1 commit into from
Mar 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,10 @@
# include <OpenGL/gl.h>
# include <OpenGL/glu.h>
#else
#if _WIN32
// Need this to pull in APIENTRY, etc.
#include "windows.h"
#endif
# include <GL/gl.h>
# include <GL/glu.h>
#endif
Expand Down
5 changes: 5 additions & 0 deletions apps/point_cloud_editor/src/cloudEditorWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,11 @@ CloudEditorWidget::denoise ()
return;
DenoiseParameterForm form;
form.exec();
// check for cancel.
if (!form.ok())
{
return;
}
boost::shared_ptr<DenoiseCommand> c(new DenoiseCommand(selection_ptr_,
cloud_ptr_, form.getMeanK(), form.getStdDevThresh()));
command_queue_ptr_->execute(c);
Expand Down