From: "Yordan Karadzhov (VMware)" <y.karadz@gmail.com> To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org, "Yordan Karadzhov (VMware)" <y.karadz@gmail.com> Subject: [PATCH v8 39/44] kernel-shark: Consistent method naming in KsPlotTools Date: Mon, 4 Jan 2021 19:47:19 +0200 Message-ID: <20210104174724.70404-40-y.karadz@gmail.com> (raw) In-Reply-To: <20210104174724.70404-1-y.karadz@gmail.com> Remove "get" from the name of the methods used to retrieve data fields in KsPlotTools. This makes the naming consistent with the style used by Qt. Signed-off-by: Yordan Karadzhov (VMware) <y.karadz@gmail.com> --- src/KsPlotTools.cpp | 30 +++++++++++++++--------------- src/KsPlotTools.hpp | 34 +++++++++++++++++----------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/KsPlotTools.cpp b/src/KsPlotTools.cpp index ef15cde..4bf08ef 100644 --- a/src/KsPlotTools.cpp +++ b/src/KsPlotTools.cpp @@ -120,7 +120,7 @@ void Color::blend(float alpha) * * @returns ColorTable instance. */ -ColorTable getTaskColorTable() +ColorTable taskColorTable() { struct kshark_context *kshark_ctx(nullptr); int nTasks(0), pid, *pids, i(0), *streamIds; @@ -173,7 +173,7 @@ ColorTable getTaskColorTable() * * @returns ColorTable instance. */ -ColorTable getCPUColorTable() +ColorTable CPUColorTable() { kshark_context *kshark_ctx(nullptr); int nCPUs, nCPUMax(0), *streamIds; @@ -205,7 +205,7 @@ ColorTable getCPUColorTable() * * @returns ColorTable instance. */ -ColorTable getStreamColorTable() +ColorTable streamColorTable() { kshark_context *kshark_ctx(nullptr); ColorTable colors; @@ -360,7 +360,7 @@ void Shape::setPoint(size_t i, const Point &p) * @brief Get the point "i". If the point does not exist, the function returns * nullptr. */ -const ksplot_point *Shape::getPoint(size_t i) const +const ksplot_point *Shape::point(size_t i) const { if (i < _nPoints) return &_points[i]; @@ -394,7 +394,7 @@ void Shape::setPointY(size_t i, int y) { * @brief Get the horizontal coordinate of the point "i". If the point does * not exist, the function returns 0. */ -int Shape::getPointX(size_t i) const { +int Shape::pointX(size_t i) const { if (i < _nPoints) return _points[i].x; @@ -405,7 +405,7 @@ int Shape::getPointX(size_t i) const { * @brief Get the vertical coordinate of the point "i". If the point does * not exist, the function returns 0. */ -int Shape::getPointY(size_t i) const { +int Shape::pointY(size_t i) const { if (i < _nPoints) return _points[i].y; @@ -599,9 +599,9 @@ void TextBox::setBoxAppearance(const Color &col, int l, int h) if (h <= 0 && _font) h = _font->height; - _box.setPoint(1, _box.getPointX(0), _box.getPointY(0) - h); - _box.setPoint(2, _box.getPointX(0) + l, _box.getPointY(0) - h); - _box.setPoint(3, _box.getPointX(0) + l, _box.getPointY(0)); + _box.setPoint(1, _box.pointX(0), _box.pointY(0) - h); + _box.setPoint(2, _box.pointX(0) + l, _box.pointY(0) - h); + _box.setPoint(3, _box.pointX(0) + l, _box.pointY(0)); } void TextBox::_draw(const Color &col, float size) const @@ -611,15 +611,15 @@ void TextBox::_draw(const Color &col, float size) const return; if (_box._visible ) { - int bShift = (_box.getPointY(0) - _box.getPointY(1) - _font->height) / 2; + int bShift = (_box.pointY(0) - _box.pointY(1) - _font->height) / 2; ksplot_print_text(_font, NULL, - _box.getPointX(0) + _font->height / 4, - _box.getPointY(0) - _font->base - bShift, + _box.pointX(0) + _font->height / 4, + _box.pointY(0) - _font->base - bShift, _text.c_str()); } else { ksplot_print_text(_font, col.color_c_ptr(), - _box.getPointX(0) + _font->height / 4, - _box.getPointY(0) - _font->base, + _box.pointX(0) + _font->height / 4, + _box.pointY(0) - _font->base, _text.c_str()); } } @@ -808,7 +808,7 @@ void Graph::_initBins() /** * Get the number of bins. */ -int Graph::size() +int Graph::size() const { return _size; } diff --git a/src/KsPlotTools.hpp b/src/KsPlotTools.hpp index b270a56..287e0fb 100644 --- a/src/KsPlotTools.hpp +++ b/src/KsPlotTools.hpp @@ -64,7 +64,7 @@ public: * @brief Get the frequency value used to generate the Rainbow * palette. */ - static float getRainbowFrequency() {return _frequency;} + static float rainbowFrequency() {return _frequency;} private: ksplot_color _col_c; @@ -76,11 +76,11 @@ private: /** Hash table of colors. */ typedef std::unordered_map<int, KsPlot::Color> ColorTable; -ColorTable getTaskColorTable(); +ColorTable taskColorTable(); -ColorTable getCPUColorTable(); +ColorTable CPUColorTable(); -ColorTable getStreamColorTable(); +ColorTable streamColorTable(); Color getColor(const ColorTable *colors, int id); @@ -143,15 +143,15 @@ public: void setPoint(size_t i, const Point &p); - const ksplot_point *getPoint(size_t i) const; + const ksplot_point *point(size_t i) const; void setPointX(size_t i, int x); void setPointY(size_t i, int y); - int getPointX(size_t i) const; + int pointX(size_t i) const; - int getPointY(size_t i) const; + int pointY(size_t i) const; /** * @brief Get the number of point used to define the polygon. @@ -179,10 +179,10 @@ public: virtual ~Point() {} /** @brief Get the horizontal coordinate of the point. */ - int x() const {return getPointX(0);} + int x() const {return pointX(0);} /** @brief Get the vertical coordinate of the point. */ - int y() const {return getPointY(0);} + int y() const {return pointY(0);} /** @brief Set the horizontal coordinate of the point. */ void setX(int x) {setPointX(0, x);} @@ -201,7 +201,7 @@ public: /** * @brief Get the C struct defining the point. */ - const ksplot_point *point_c_ptr() const {return getPoint(0);} + const ksplot_point *point_c_ptr() const {return point(0);} private: void _draw(const Color &col, float size = 1.) const override; @@ -235,7 +235,7 @@ public: void setA(int x, int y) { setPoint(0, x, y);} /** @brief Get the first finishing point of the line. */ - const ksplot_point *getA() const {return getPoint(0);} + const ksplot_point *a() const {return point(0);} /** * @brief Set the coordinats of the second finishing point of the @@ -247,7 +247,7 @@ public: void setB(int x, int y) {setPoint(1, x, y);} /** @brief Get the second finishing point of the line. */ - const ksplot_point *getB() const {return getPoint(1);} + const ksplot_point *b() const {return point(1);} private: void _draw(const Color &col, float size = 1.) const override; @@ -408,7 +408,7 @@ public: void drawVal(float size = 2.); /** Get the height (module) of the line, representing the Bin. */ - int mod() {return _val.y() - _base.y();} + int mod() const {return _val.y() - _base.y();} /** @brief Set the vertical coordinate of the "val" Point. */ void setVal(int v) {_val.setY(_base.y() - v); } @@ -458,7 +458,7 @@ public: /* Keep this destructor virtual. */ virtual ~Graph(); - int size(); + int size() const; void setModelPtr(kshark_trace_histo *histo); @@ -485,12 +485,12 @@ public: void setBase(int b); /** @brief Get the vertical coordinate of the Graph's base. */ - int getBase() const {return _bins[0]._base.y();} + int base() const {return _bins[0]._base.y();} void setHeight(int h); /** @brief Get the vertical size (height) of the Graph. */ - int getHeight() const {return _height;} + int height() const {return _height;} void setBinValue(int bin, int val); @@ -504,7 +504,7 @@ public: const Color &col, uint8_t m); /** @brief Get a particular bin. */ - const Bin &getBin(int bin) const {return _bins[bin];} + const Bin &bin(int bin) const {return _bins[bin];} void setHMargin(int hMargin); -- 2.25.1
next prev parent reply index Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-04 17:46 [PATCH v8 00/44] Start KernelShark v2 transformation Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 01/44] kernel-shark: Adopt trace-cmd API changes Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 02/44] kernel-shark: Use libtraceevent and libtracefs Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 03/44] kernel-shark: Add license information Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 04/44] kernel-shark: Change the CMake minimum version required Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 05/44] kernel-shark: Change default libraries install location Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 06/44] kernel-shark: Split the installation in two components Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 07/44] kernel-shark: Update README Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 08/44] kernel-shark: Define build target for JSONC Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 09/44] kernel-shark: Use only signed types in kshark_entry Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 10/44] kernel-shark: Add stream_id to kshark_entry Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 11/44] kernel-shark: Introduce libkshark-hash Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 12/44] kernel-shark: Introduce Data streams Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 13/44] kernel-shark: Rename static methods in libkshark Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 14/44] kernel-shark: Add basic methods for Data streams Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 15/44] kernel-shark: Housekeeping before implementing stream interface Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 16/44] kernel-shark: Add stream interface for trace-cmd data Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 17/44] kernel-shark: Start introducing KernelShark 2.0 Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 18/44] kernel-shark: Start using data streams Yordan Karadzhov (VMware) 2021-01-04 17:46 ` [PATCH v8 19/44] kernel-shark: Remove dead code Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 20/44] kernel-shark: Redesign the plugin interface Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 21/44] kernel-shark: Complete the stream integration Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 22/44] kernel-shark: Provide merging of multiple data streams Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 23/44] kernel-shark: Integrate the stream definitions with data model Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 24/44] kernel-shark: Use only signed types for model defs Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 25/44] kernel-shark: Add ksmodel_get_bin() Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 26/44] kernel-shark: Protect ksmodel_set_in_range_bining() Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 27/44] kernel-shark: Add methods for time calibration Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 28/44] kernel-shark: Integrate streams with libkshark-configio Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 29/44] kernel-shark: Add support for drawing text Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 30/44] kernel-shark: Make GLUT optional dependency Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 31/44] kernel-shark: Add ksplot_draw_polyline() Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 32/44] kernel-shark: Optimize ksplot_draw_polygon() Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 33/44] kernel-shark: Add basic infrastructure for testing Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 34/44] kernel-shark: Add "github Actions" workflow Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 35/44] kernel-shark: Integrate streams with KsPlotTools Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 36/44] kernel-shark: Add getStreamColorTable() Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 37/44] kernel-shark: Redefine the args of KsPlot::getColor() Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 38/44] kernel-shark: Add TextBox class to KsPlot namespace Yordan Karadzhov (VMware) 2021-01-04 17:47 ` Yordan Karadzhov (VMware) [this message] 2021-01-04 17:47 ` [PATCH v8 40/44] kernel-shark: Make the label part of the graph Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 41/44] kernel-shark: Remove the hard-coded Idle PID Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 42/44] kernel-shark: Add class Polyline to KsPlot namespace Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 43/44] kernel-shark: Add VirtBridge and VirtGap classes Yordan Karadzhov (VMware) 2021-01-04 17:47 ` [PATCH v8 44/44] kernel-shark: Add double click interface to PlotObject Yordan Karadzhov (VMware) 2021-01-05 0:27 ` [PATCH v8 00/44] Start KernelShark v2 transformation Steven Rostedt
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210104174724.70404-40-y.karadz@gmail.com \ --to=y.karadz@gmail.com \ --cc=linux-trace-devel@vger.kernel.org \ --cc=rostedt@goodmis.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-Trace-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-trace-devel/0 linux-trace-devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-trace-devel linux-trace-devel/ https://lore.kernel.org/linux-trace-devel \ linux-trace-devel@vger.kernel.org public-inbox-index linux-trace-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-trace-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git