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.

Sign up for GitHub

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

Mask array in Smoothing #29

Merged
merged 6 commits into from
Jul 4, 2017
Merged

Mask array in Smoothing #29

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad2bb4d
feat(ScalarFieldSmoother): add an optional mask array
Jun 28, 2017
5a46525
feat(GeometrySmoother): Adapt for Mask array use
Jun 28, 2017
be4e8be
fix(ScalarFieldSmoother): minor changes
Jul 3, 2017
386d536
feat(ScalarFieldSmoother): add mask feature to cmd standalone
Jul 3, 2017
f1c1688
feat(GeometrySmoother): add mask feature to gui
Jul 3, 2017
99341a2
feat(Gui standalone): The fullscreen is optional
Jul 3, 2017
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
Prev Previous commit
Next Next commit
fix(ScalarFieldSmoother): minor changes
  • Loading branch information
Charles Gueunet committed Jul 3, 2017
commit be4e8be050df6354f01335f526353a5bb277f636
2 changes: 0 additions & 2 deletions core/baseCode/scalarFieldSmoother/ScalarFieldSmoother.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ template <class dataType> int ScalarFieldSmoother::smooth(
}
}

cout << "Mask: " << (mask_ == nullptr) << endl;

for(int it = 0; it < numberOfIterations; it++){
#ifdef withOpenMP
omp_lock_t writeLock;
Expand Down
3 changes: 3 additions & 0 deletions core/vtkWrappers/ttkGeometrySmoother/ttkGeometrySmoother.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ class VTKFILTERSCORE_EXPORT ttkGeometrySmoother
vtkSetMacro(NumberOfIterations, int);
vtkGetMacro(NumberOfIterations, int);

vtkSetMacro(MaskIdentifier, int);
vtkGetMacro(MaskIdentifier, int);

vtkSetMacro(UseInputMask, bool);
vtkGetMacro(UseInputMask, bool);

Expand Down