From 48e0906bf4df5f43334ddee43b678790e35e7949 Mon Sep 17 00:00:00 2001 From: Victor Zarubkin Date: Mon, 8 Aug 2016 22:35:21 +0300 Subject: [PATCH] (ProfGraphicsView) using SELECTED_ITEM_COLOR constant --- profiler_gui/blocks_graphics_view.cpp | 79 ++++++++++++++++----------- profiler_gui/globals.h | 1 + 2 files changed, 48 insertions(+), 32 deletions(-) diff --git a/profiler_gui/blocks_graphics_view.cpp b/profiler_gui/blocks_graphics_view.cpp index a94638c..1e16c25 100644 --- a/profiler_gui/blocks_graphics_view.cpp +++ b/profiler_gui/blocks_graphics_view.cpp @@ -253,14 +253,6 @@ void ProfGraphicsItem::paint(QPainter* _painter, const QStyleOptionGraphicsItem* // _painter->setBrush(brush); //} - if (previousColor != item.color) - { - // Set background color brush for rectangle - previousColor = item.color; - brush.setColor(previousColor); - _painter->setBrush(brush); - } - bool changepen = false; if (!m_bTest && item.block->block_index == ::profiler_gui::EASY_GLOBALS.selected_block) { @@ -269,23 +261,38 @@ void ProfGraphicsItem::paint(QPainter* _painter, const QStyleOptionGraphicsItem* pen.setColor(Qt::red); pen.setWidth(2); _painter->setPen(pen); + + previousColor = SELECTED_ITEM_COLOR; + brush.setColor(previousColor); + _painter->setBrush(brush); } - else if (::profiler_gui::EASY_GLOBALS.draw_graphics_items_borders) + else { - if (w < 3) - { - // Do not paint borders for very narrow items - if (previousPenStyle != Qt::NoPen) - { - previousPenStyle = Qt::NoPen; - _painter->setPen(Qt::NoPen); - } + if (previousColor != item.color) + { + // Set background color brush for rectangle + previousColor = item.color; + brush.setColor(previousColor); + _painter->setBrush(brush); } - else if (previousPenStyle != Qt::SolidLine) + + if (::profiler_gui::EASY_GLOBALS.draw_graphics_items_borders) { - // Restore pen for item which is wide enough to paint borders - previousPenStyle = Qt::SolidLine; - _painter->setPen(BORDERS_COLOR); + if (w < 3) + { + // Do not paint borders for very narrow items + if (previousPenStyle != Qt::NoPen) + { + previousPenStyle = Qt::NoPen; + _painter->setPen(Qt::NoPen); + } + } + else if (previousPenStyle != Qt::SolidLine) + { + // Restore pen for item which is wide enough to paint borders + previousPenStyle = Qt::SolidLine; + _painter->setPen(BORDERS_COLOR); + } } } @@ -335,13 +342,6 @@ void ProfGraphicsItem::paint(QPainter* _painter, const QStyleOptionGraphicsItem* // brush = QBrush(previousColor); // _painter->setBrush(brush); //} else - if (previousColor != item.color) - { - // Set background color brush for rectangle - previousColor = item.color; - brush.setColor(previousColor); - _painter->setBrush(brush); - } if (!m_bTest && item.block->block_index == ::profiler_gui::EASY_GLOBALS.selected_block) { @@ -349,12 +349,27 @@ void ProfGraphicsItem::paint(QPainter* _painter, const QStyleOptionGraphicsItem* pen.setColor(Qt::red); pen.setWidth(2); _painter->setPen(pen); + + previousColor = SELECTED_ITEM_COLOR; + brush.setColor(previousColor); + _painter->setBrush(brush); } - else if (::profiler_gui::EASY_GLOBALS.draw_graphics_items_borders && previousPenStyle != Qt::SolidLine) + else { - // Restore pen for item which is wide enough to paint borders - previousPenStyle = Qt::SolidLine; - _painter->setPen(BORDERS_COLOR); + if (previousColor != item.color) + { + // Set background color brush for rectangle + previousColor = item.color; + brush.setColor(previousColor); + _painter->setBrush(brush); + } + + if (::profiler_gui::EASY_GLOBALS.draw_graphics_items_borders && previousPenStyle != Qt::SolidLine) + { + // Restore pen for item which is wide enough to paint borders + previousPenStyle = Qt::SolidLine; + _painter->setPen(BORDERS_COLOR); + } } // Draw rectangle diff --git a/profiler_gui/globals.h b/profiler_gui/globals.h index a35c21f..fbfc9a1 100644 --- a/profiler_gui/globals.h +++ b/profiler_gui/globals.h @@ -39,6 +39,7 @@ namespace profiler_gui { const QColor CHRONOMETER_COLOR = QColor::fromRgba(0x202020c0); const QRgb SELECTED_THREAD_BACKGROUND = 0x00e0e060; const QRgb SELECTED_THREAD_FOREGROUND = 0x00ffffff - SELECTED_THREAD_BACKGROUND; + const QRgb SELECTED_ITEM_COLOR = 0x000050a0; //////////////////////////////////////////////////////////////////////////