From 4a2ea71a0fc5bc17a090744fc6ce037ca107302f Mon Sep 17 00:00:00 2001 From: Bjorn Terelius Date: Wed, 29 Nov 2023 14:51:55 +0100 Subject: [PATCH] Remove deprecated PlotPython and PlotProtobuf subclasses. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (Use Plot directly instead when visualizing RTC event logs.) Bug: None Change-Id: I374e00cdccd990dfd5c707eebcf7c792c2cc7625 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/329160 Reviewed-by: Jeremy Leconte Commit-Queue: Björn Terelius Reviewed-by: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#41284} --- rtc_tools/BUILD.gn | 4 -- .../rtc_event_log_visualizer/plot_protobuf.cc | 43 ----------------- .../rtc_event_log_visualizer/plot_protobuf.h | 39 ---------------- .../rtc_event_log_visualizer/plot_python.cc | 46 ------------------- .../rtc_event_log_visualizer/plot_python.h | 39 ---------------- 5 files changed, 171 deletions(-) delete mode 100644 rtc_tools/rtc_event_log_visualizer/plot_protobuf.cc delete mode 100644 rtc_tools/rtc_event_log_visualizer/plot_protobuf.h delete mode 100644 rtc_tools/rtc_event_log_visualizer/plot_python.cc delete mode 100644 rtc_tools/rtc_event_log_visualizer/plot_python.h diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn index e5c0cdfacf..df3c55fec8 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -371,10 +371,6 @@ if (!build_with_chromium) { "rtc_event_log_visualizer/log_simulation.h", "rtc_event_log_visualizer/plot_base.cc", "rtc_event_log_visualizer/plot_base.h", - "rtc_event_log_visualizer/plot_protobuf.cc", - "rtc_event_log_visualizer/plot_protobuf.h", - "rtc_event_log_visualizer/plot_python.cc", - "rtc_event_log_visualizer/plot_python.h", ] deps = [ ":chart_proto", diff --git a/rtc_tools/rtc_event_log_visualizer/plot_protobuf.cc b/rtc_tools/rtc_event_log_visualizer/plot_protobuf.cc deleted file mode 100644 index 0b7a6f28ac..0000000000 --- a/rtc_tools/rtc_event_log_visualizer/plot_protobuf.cc +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#include "rtc_tools/rtc_event_log_visualizer/plot_protobuf.h" - -#include - -#include -#include -#include - -namespace webrtc { - -ProtobufPlot::ProtobufPlot() {} - -ProtobufPlot::~ProtobufPlot() {} - -void ProtobufPlot::Draw() {} - -ProtobufPlotCollection::ProtobufPlotCollection() {} - -ProtobufPlotCollection::~ProtobufPlotCollection() {} - -void ProtobufPlotCollection::Draw() { - webrtc::analytics::ChartCollection collection; - ExportProtobuf(&collection); - std::cout << collection.SerializeAsString(); -} - -Plot* ProtobufPlotCollection::AppendNewPlot() { - Plot* plot = new ProtobufPlot(); - plots_.push_back(std::unique_ptr(plot)); - return plot; -} - -} // namespace webrtc diff --git a/rtc_tools/rtc_event_log_visualizer/plot_protobuf.h b/rtc_tools/rtc_event_log_visualizer/plot_protobuf.h deleted file mode 100644 index 1d082aae9c..0000000000 --- a/rtc_tools/rtc_event_log_visualizer/plot_protobuf.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -#ifndef RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ -#define RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ - -#include "absl/base/attributes.h" -#include "rtc_tools/rtc_event_log_visualizer/plot_base.h" - -// Generated at build-time by the protobuf compiler. -#include "rtc_tools/rtc_event_log_visualizer/proto/chart.pb.h" - -namespace webrtc { - -class ProtobufPlot final : public Plot { - public: - ProtobufPlot(); - ~ProtobufPlot() override; - void Draw() override; -}; - -class ABSL_DEPRECATED("Use PlotCollection and ExportProtobuf() instead") - ProtobufPlotCollection final : public PlotCollection { - public: - ProtobufPlotCollection(); - ~ProtobufPlotCollection() override; - void Draw() override; - Plot* AppendNewPlot() override; -}; - -} // namespace webrtc - -#endif // RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_ diff --git a/rtc_tools/rtc_event_log_visualizer/plot_python.cc b/rtc_tools/rtc_event_log_visualizer/plot_python.cc deleted file mode 100644 index b3708110df..0000000000 --- a/rtc_tools/rtc_event_log_visualizer/plot_python.cc +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ - -#include "rtc_tools/rtc_event_log_visualizer/plot_python.h" - -#include - -#include -#include -#include - -#include "rtc_base/checks.h" - -namespace webrtc { - -PythonPlot::PythonPlot() {} - -PythonPlot::~PythonPlot() {} - -void PythonPlot::Draw() { - PrintPythonCode(); -} - -PythonPlotCollection::PythonPlotCollection(bool shared_xaxis) - : shared_xaxis_(shared_xaxis) {} - -PythonPlotCollection::~PythonPlotCollection() {} - -void PythonPlotCollection::Draw() { - PrintPythonCode(shared_xaxis_); -} - -Plot* PythonPlotCollection::AppendNewPlot() { - Plot* plot = new PythonPlot(); - plots_.push_back(std::unique_ptr(plot)); - return plot; -} - -} // namespace webrtc diff --git a/rtc_tools/rtc_event_log_visualizer/plot_python.h b/rtc_tools/rtc_event_log_visualizer/plot_python.h deleted file mode 100644 index 6acc436d71..0000000000 --- a/rtc_tools/rtc_event_log_visualizer/plot_python.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - */ -#ifndef RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_ -#define RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_ - -#include "absl/base/attributes.h" -#include "rtc_tools/rtc_event_log_visualizer/plot_base.h" - -namespace webrtc { - -class PythonPlot final : public Plot { - public: - PythonPlot(); - ~PythonPlot() override; - void Draw() override; -}; - -class ABSL_DEPRECATED("Use PlotCollection and PrintPythonCode() instead.") - PythonPlotCollection final : public PlotCollection { - public: - explicit PythonPlotCollection(bool shared_xaxis = false); - ~PythonPlotCollection() override; - void Draw() override; - Plot* AppendNewPlot() override; - - private: - bool shared_xaxis_; -}; - -} // namespace webrtc - -#endif // RTC_TOOLS_RTC_EVENT_LOG_VISUALIZER_PLOT_PYTHON_H_