Skip to content
Snippets Groups Projects
Commit 72d35a55 authored by Andre Offringa's avatar Andre Offringa
Browse files

Bug 1491: fixing compile errors on some compiler about missing references due to GSL removal

parent 38aeb9bd
No related branches found
No related tags found
No related merge requests found
...@@ -139,7 +139,6 @@ install(FILES ...@@ -139,7 +139,6 @@ install(FILES
strategy/algorithms/frequencypowerplot.h strategy/algorithms/frequencypowerplot.h
strategy/algorithms/fringestoppingfitter.h strategy/algorithms/fringestoppingfitter.h
strategy/algorithms/fringetestcreater.h strategy/algorithms/fringetestcreater.h
strategy/algorithms/imagetile.h
strategy/algorithms/localfitmethod.h strategy/algorithms/localfitmethod.h
strategy/algorithms/medianwindow.h strategy/algorithms/medianwindow.h
strategy/algorithms/methoditerator.h strategy/algorithms/methoditerator.h
...@@ -154,7 +153,6 @@ install(FILES ...@@ -154,7 +153,6 @@ install(FILES
strategy/algorithms/thresholdconfig.h strategy/algorithms/thresholdconfig.h
strategy/algorithms/thresholdmitigater.h strategy/algorithms/thresholdmitigater.h
strategy/algorithms/thresholdtools.h strategy/algorithms/thresholdtools.h
strategy/algorithms/tiledimage.h
strategy/algorithms/timeflagcountplot.h strategy/algorithms/timeflagcountplot.h
strategy/algorithms/timefrequencystatistics.h strategy/algorithms/timefrequencystatistics.h
strategy/algorithms/types.h strategy/algorithms/types.h
......
...@@ -49,8 +49,6 @@ class SlidingWindowFitFrame : public Gtk::Frame { ...@@ -49,8 +49,6 @@ class SlidingWindowFitFrame : public Gtk::Frame {
_fitWeightedAverageButton("W.Average"), _fitWeightedAverageButton("W.Average"),
_fitMedianButton("Median"), _fitMedianButton("Median"),
_fitMinimumButton("Minimum"), _fitMinimumButton("Minimum"),
_fitLeastSquareButton("Least squares fit"),
_fitLeastAbsButton("Least absolute fit"),
_applyButton(Gtk::Stock::APPLY) _applyButton(Gtk::Stock::APPLY)
{ {
initParameterWidgets(); initParameterWidgets();
...@@ -91,12 +89,6 @@ class SlidingWindowFitFrame : public Gtk::Frame { ...@@ -91,12 +89,6 @@ class SlidingWindowFitFrame : public Gtk::Frame {
_fitMinimumButton.set_group(methodGroup); _fitMinimumButton.set_group(methodGroup);
_box.pack_start(_fitMinimumButton); _box.pack_start(_fitMinimumButton);
_fitLeastSquareButton.set_group(methodGroup);
_box.pack_start(_fitLeastSquareButton);
_fitLeastAbsButton.set_group(methodGroup);
_box.pack_start(_fitLeastAbsButton);
switch(_action.Parameters().method) switch(_action.Parameters().method)
{ {
...@@ -115,12 +107,6 @@ class SlidingWindowFitFrame : public Gtk::Frame { ...@@ -115,12 +107,6 @@ class SlidingWindowFitFrame : public Gtk::Frame {
case rfiStrategy::SlidingWindowFitParameters::Minimum: case rfiStrategy::SlidingWindowFitParameters::Minimum:
_fitMinimumButton.set_active(true); _fitMinimumButton.set_active(true);
break; break;
case rfiStrategy::SlidingWindowFitParameters::LeastSquare:
_fitLeastSquareButton.set_active(true);
break;
case rfiStrategy::SlidingWindowFitParameters::LeastAbs:
_fitLeastAbsButton.set_active(true);
break;
} }
_fitNoneButton.show(); _fitNoneButton.show();
...@@ -128,8 +114,6 @@ class SlidingWindowFitFrame : public Gtk::Frame { ...@@ -128,8 +114,6 @@ class SlidingWindowFitFrame : public Gtk::Frame {
_fitWeightedAverageButton.show(); _fitWeightedAverageButton.show();
_fitMedianButton.show(); _fitMedianButton.show();
_fitMinimumButton.show(); _fitMinimumButton.show();
_fitLeastSquareButton.show();
_fitLeastAbsButton.show();
} }
void initScales() void initScales()
...@@ -172,7 +156,7 @@ class SlidingWindowFitFrame : public Gtk::Frame { ...@@ -172,7 +156,7 @@ class SlidingWindowFitFrame : public Gtk::Frame {
_hKernelSizeLabel, _vKernelSizeLabel; _hKernelSizeLabel, _vKernelSizeLabel;
Gtk::HScale _iterationCountScale; Gtk::HScale _iterationCountScale;
Gtk::RadioButton Gtk::RadioButton
_fitNoneButton, _fitAverageButton, _fitWeightedAverageButton, _fitMedianButton, _fitMinimumButton, _fitLeastSquareButton, _fitLeastAbsButton; _fitNoneButton, _fitAverageButton, _fitWeightedAverageButton, _fitMedianButton, _fitMinimumButton;
Gtk::Button _applyButton; Gtk::Button _applyButton;
void onApplyClicked() void onApplyClicked()
...@@ -186,10 +170,6 @@ class SlidingWindowFitFrame : public Gtk::Frame { ...@@ -186,10 +170,6 @@ class SlidingWindowFitFrame : public Gtk::Frame {
method = rfiStrategy::SlidingWindowFitParameters::Median; method = rfiStrategy::SlidingWindowFitParameters::Median;
else if(_fitMinimumButton.get_active()) else if(_fitMinimumButton.get_active())
method = rfiStrategy::SlidingWindowFitParameters::Minimum; method = rfiStrategy::SlidingWindowFitParameters::Minimum;
else if(_fitLeastSquareButton.get_active())
method = rfiStrategy::SlidingWindowFitParameters::LeastSquare;
else if(_fitLeastAbsButton.get_active())
method = rfiStrategy::SlidingWindowFitParameters::LeastAbs;
else else
method = rfiStrategy::SlidingWindowFitParameters::None; method = rfiStrategy::SlidingWindowFitParameters::None;
_action.Parameters().method = method; _action.Parameters().method = method;
......
...@@ -76,7 +76,6 @@ set(STRATEGY_ALGORITHMS_FILES ...@@ -76,7 +76,6 @@ set(STRATEGY_ALGORITHMS_FILES
strategy/algorithms/frequencypowerplot.cpp strategy/algorithms/frequencypowerplot.cpp
strategy/algorithms/fringestoppingfitter.cpp strategy/algorithms/fringestoppingfitter.cpp
strategy/algorithms/fringetestcreater.cpp strategy/algorithms/fringetestcreater.cpp
strategy/algorithms/imagetile.cpp
strategy/algorithms/localfitmethod.cpp strategy/algorithms/localfitmethod.cpp
strategy/algorithms/methoditerator.cpp strategy/algorithms/methoditerator.cpp
strategy/algorithms/mitigationtester.cpp strategy/algorithms/mitigationtester.cpp
...@@ -89,7 +88,6 @@ set(STRATEGY_ALGORITHMS_FILES ...@@ -89,7 +88,6 @@ set(STRATEGY_ALGORITHMS_FILES
strategy/algorithms/thresholdconfig.cpp strategy/algorithms/thresholdconfig.cpp
strategy/algorithms/thresholdmitigater.cpp strategy/algorithms/thresholdmitigater.cpp
strategy/algorithms/thresholdtools.cpp strategy/algorithms/thresholdtools.cpp
strategy/algorithms/tiledimage.cpp
strategy/algorithms/timeflagcountplot.cpp strategy/algorithms/timeflagcountplot.cpp
strategy/algorithms/timefrequencystatistics.cpp) strategy/algorithms/timefrequencystatistics.cpp)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment