diff --git a/applications/rfigui.cpp b/applications/rfigui.cpp index 99857222d8ea5164555fadd4ccdc675398ec47de..bb564b614207ed7c1adc3f22692bbc941f793a93 100644 --- a/applications/rfigui.cpp +++ b/applications/rfigui.cpp @@ -159,13 +159,8 @@ static void run(int argc, char* argv[]) { if (!index) throw std::runtime_error("Baseline not found!"); controller.SetImageSetIndex(*index); StdOutReporter reporter; - reporter.SignalFinished().connect([&](bool success) { - std::cout << "FINISH\n"; - //controller.LoadCurrentTFDataFinish(success); - }); - std::thread thread( - [&]() { controller.LoadCurrentTFDataAsync(reporter); }); - thread.join(); + controller.LoadCurrentTFDataAsync(reporter); + controller.LoadCurrentTFDataFinish(true); MaskedHeatMap& plot = controller.TFController().Plot(); plot.SetShowOriginalMask(plotFlags); plot.SetShowXAxisDescription(true); diff --git a/quality/operations.cpp b/quality/operations.cpp index d8a297897f461afdd4d23640396986d09f5b4d70..ca123b663231a5a7fd4857a82f0f53923f38bd9a 100644 --- a/quality/operations.cpp +++ b/quality/operations.cpp @@ -210,8 +210,7 @@ void PrintPerBaselineStatistics(const std::string& kindName, const QualityTablesFormatter::StatisticKind kind = QualityTablesFormatter::NameToKind(kindName); - quality::FileContents contents = - quality::ReadAndCombine(filenames, false); + quality::FileContents contents = quality::ReadAndCombine(filenames, false); contents.statistics_collection.IntegrateBaselinesToOneChannel(); const std::vector<std::pair<unsigned, unsigned>>& baselines = contents.statistics_collection.BaselineStatistics().BaselineList(); @@ -307,8 +306,7 @@ void PrintPerAntennaStatistics(const std::string& kindName, const QualityTablesFormatter::StatisticKind kind = QualityTablesFormatter::NameToKind(kindName); - quality::FileContents contents = - quality::ReadAndCombine(filenames, false); + quality::FileContents contents = quality::ReadAndCombine(filenames, false); contents.statistics_collection.IntegrateBaselinesToOneChannel(); const std::map<size_t, DefaultStatistics> stats = contents.statistics_collection.GetAntennaStatistics(); diff --git a/util/progress/stdoutreporter.h b/util/progress/stdoutreporter.h index 9ae2a30125d8400705523ea1b49f24d2d820b35e..9ff62e781d14a675d19e274f78686ddea4409e19 100644 --- a/util/progress/stdoutreporter.h +++ b/util/progress/stdoutreporter.h @@ -7,8 +7,6 @@ #include <string> #include <iostream> -#include <sigc++/signal.h> - class StdOutReporter final : public ProgressListener { public: void OnStartTask(const std::string& description) override { @@ -23,20 +21,10 @@ class StdOutReporter final : public ProgressListener { std::cout << '.' << std::flush; } } - void OnFinish() override { std::cout << "100\n"; _signalFinished(true); } + void OnFinish() override { std::cout << "100\n"; } void OnException(std::exception& thrown_exception) override { std::cerr << "ERROR! " << thrown_exception.what() << '\n'; - _signalError(thrown_exception.what()); - _signalFinished(false); - } - sigc::signal<void, bool /*errors occurred? */>& SignalFinished() { - return _signalFinished; } - sigc::signal<void, const std::string&>& SignalError() { return _signalError; } - -private: - sigc::signal<void, bool> _signalFinished; - sigc::signal<void, const std::string&> _signalError; }; #endif // UTIL_PROGRESS_STD_OUT_REPORTER_H_