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

add option to filter vectors field in 3dSDPViewer #297

Merged
merged 2 commits into from
Mar 30, 2017
Merged

add option to filter vectors field in 3dSDPViewer #297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
313e10c
add option to filter vectors field in 3dSDPViewer
kerautret Mar 7, 2017
2a8dca5
david corrections
kerautret Mar 29, 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
7 changes: 7 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# DGtalTools 0.9.3

- *visualisation*:
- Add an option to filter vector displayed in 3dSDPViewer.
(Bertrand Kerautret, [#296](https://github.com/DGtal-team/pull/296)


# DGtalTools 0.9.3

- *global*:
- Various fixes to enable the new Version3 (compressed) Vol/Longvol files.
(David Coeurjolly, [#287](https://github.com/DGtal-team/pull/287))
Expand Down
21 changes: 17 additions & 4 deletions visualisation/3dSDPViewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ typedef Viewer3D<Z3i::Space, Z3i::KSpace> Viewer;
color labels in the source file (used
by -importColorLabels).
-f [ --filter ] arg (=100) filter input file in order to display
only the [arg] pourcent of the input 3D
only the [arg] percentage of the input 3D
points (uniformly selected).
--noPointDisplay usefull for instance to only display
the lines between points.
Expand Down Expand Up @@ -124,6 +124,11 @@ typedef Viewer3D<Z3i::Space, Z3i::KSpace> Viewer;
determined by two consecutive point
given, each point represented by its
coordinates on a single line.
--filterVectors arg (=100) filters vector input file in order to
display only the [arg] percentage of the
input vectors (uniformly selected, to
be used with option --drawVectors otherwise
no effect).
--interactiveDisplayVoxCoords by using this option the pixel
coordinates can be displayed after
selection (shift+left click on voxel).
Expand Down Expand Up @@ -200,7 +205,7 @@ int main( int argc, char** argv )
("importColorLabels", "import color labels from the input file (label index should be by default at index 3).")
("setColorsIndex", po::value<std::vector<unsigned int> >()->multitoken(), "customize the index of the imported colors in the source file (used by -importColor).")
("setColorLabelIndex", po::value<unsigned int >()->default_value(3), "customize the index of the imported color labels in the source file (used by -importColorLabels).")
("filter,f",po::value<double>()->default_value(100.0), "filter input file in order to display only the [arg] pourcent of the input 3D points (uniformly selected)." )
("filter,f",po::value<double>()->default_value(100.0), "filter input file in order to display only the [arg] percent of the input 3D points (uniformly selected)." )
("noPointDisplay", "usefull for instance to only display the lines between points.")
("drawLines", "draw the line between discrete points." )
("scaleX,x", po::value<float>()->default_value(1.0), "set the scale value in the X direction (default 1.0)" )
Expand All @@ -212,7 +217,9 @@ int main( int argc, char** argv )
("lineSize", po::value<double>()->default_value(0.2), "defines the line size (used when the --drawLines or --drawVectors option is selected). (default value 0.2))")
("primitive,p", po::value<std::string>()->default_value("voxel"), "set the primitive to display the set of points (can be sphere, voxel (default), or glPoints (opengl points).")
("drawVectors,v", po::value<std::string>(), "SDP vector file: draw a set of vectors from the given file (each vector are determined by two consecutive point given, each point represented by its coordinates on a single line.")
("interactiveDisplayVoxCoords", "by using this option the pixel coordinates can be displayed after selection (shift+left click on voxel)." );
("filterVectors",po::value<double>()->default_value(100.0), "filters vector input file in order to display only the [arg] percent of the input vectors (uniformly selected, to be used with option --drawVectors else no effect). " )

("interactiveDisplayVoxCoords", "by using this option the pixel coordinates can be displayed after selection (shift+left click on voxel)." );


bool parseOK=true;
Expand Down Expand Up @@ -420,7 +427,13 @@ int main( int argc, char** argv )
{
trace.info()<<"Warning the two set of points doesn't contains the same number of points, some vectors will be skipped." << std::endl;
}
for(unsigned int i =0; i<vectorsPt.size()-1; i=i+2)
int step=1;
if(vm.count("filterVectors"))
{
double percentage = vm["filterVectors"].as<double>();
step = max(1, (int) (100/percentage));
}
for(unsigned int i =0; i<vectorsPt.size()-1; i=i+2*step)
{
viewer.addLine(vectorsPt.at(i),vectorsPt.at(i+1), lineSize);
}
Expand Down