@@ -42,25 +42,30 @@ using namespace SCIRun;
4242using namespace SCIRun ::Core::Geometry;
4343using namespace SCIRun ::Core::Algorithms::Fields;
4444
45- // ALGORITHM_PARAMETER_DEF(Fields, )
46- ALGORITHM_PARAMETER_DEF (Fields, StreamlineStepSize)
45+ ALGORITHM_PARAMETER_DEF (Fields, StreamlineStepSize);
46+ ALGORITHM_PARAMETER_DEF (Fields, StreamlineTolerance);
47+ ALGORITHM_PARAMETER_DEF (Fields, StreamlineMaxSteps);
48+ ALGORITHM_PARAMETER_DEF (Fields, StreamlineDirection);
49+ ALGORITHM_PARAMETER_DEF (Fields, StreamlineValue);
50+ ALGORITHM_PARAMETER_DEF (Fields, RemoveColinearPoints);
51+ ALGORITHM_PARAMETER_DEF (Fields, StreamlineMethod);
52+ ALGORITHM_PARAMETER_DEF (Fields, AutoParameters);
53+ ALGORITHM_PARAMETER_DEF (Fields, NumStreamlines);
4754
4855GenerateStreamLinesAlgo::GenerateStreamLinesAlgo ()
4956{
50- #if 0
51- add_scalar("step_size",0.01);
52- add_scalar("tolerance",0.0001);
53- add_int("max_steps",100);
54- add_int("direction",1);
55- add_int("value",1);
56- add_bool("remove_colinear_points",true);
57- add_option("method","CellWalk","AdamsBashforth|Heun|RungeKutta|RungeKuttaFehlberg|CellWalk");
57+ addParameter (Parameters::StreamlineStepSize, 0.01 );
58+ addParameter (Parameters::StreamlineTolerance, 0.0001 );
59+ addParameter (Parameters::StreamlineMaxSteps, 100 );
60+ addParameter (Parameters::StreamlineDirection, 1 );
61+ addParameter (Parameters::StreamlineValue, 1 );
62+ addParameter (Parameters::RemoveColinearPoints, true );
63+ add_option (Parameters::StreamlineMethod, " CellWalk" , " AdamsBashforth|Heun|RungeKutta|RungeKuttaFehlberg|CellWalk" );
5864 // Estimate step size and tolerance automatically based on average edge length
59- add_bool("auto_parameters" ,false);
65+ addParameter (Parameters::AutoParameters ,false );
6066
6167 // For output
62- add_int("num_streamlines",0);
63- #endif
68+ addParameter (Parameters::NumStreamlines, 0 );
6469}
6570
6671#if 0
0 commit comments