3party/easy_profiler
0
0
Fork 0
mirror of https://github.com/yse/easy_profiler.git synced 2025-01-14 00:27:55 +08:00
Code Issues Projects Releases Wiki Activity

(profiler_gui) New flags for expanding all items on file open and for collapsing all items after closing tree (Blocks hierarchy dock-window);

Browse Source 
(EasyTreeWidget) Fix of invisible progress bar;
This commit is contained in:
Victor Zarubkin 2016-08-23 22:44:04 +03:00
parent 355e3f519b
commit 3d8a120502
5 changed files with 127 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
profiler_gui/blocks_tree_widget.cpp
View File

@ -178,7 +178,7 @@ void EasyTreeWidget::setTree(const unsigned int _blocksNumber, const ::profiler:
{
m_bLocked = true;
m_progress->setValue(0);
//m_progress->show();
m_progress->show();
m_hierarchyBuilder.fillTree(m_beginTime, _blocksNumber, _blocksTree, m_bColorRows);
m_fillTimer.start(HIERARCHY_BUILDER_TIMER_INTERVAL);
}
@ -211,7 +211,7 @@ void EasyTreeWidget::setTreeBlocks(const ::profiler_gui::TreeBlocks& _blocks, ::
{
m_bLocked = true;
m_progress->setValue(0);
//m_progress->show();
m_progress->show();
m_hierarchyBuilder.fillTreeBlocks(m_inputBlocks, _session_begin_time, _left, _right, _strict, m_bColorRows);
m_fillTimer.start(HIERARCHY_BUILDER_TIMER_INTERVAL);
}
@ -260,19 +260,22 @@ void EasyTreeWidget::clearSilent(bool _global)
if (!_global)
{
for (auto item : m_items)
if (::profiler_gui::EASY_GLOBALS.collapse_items_on_tree_close) for (auto item : m_items)
{
auto& gui_block = ::profiler_gui::EASY_GLOBALS.gui_blocks[item->block()->block_index];
::profiler_gui::set_max(gui_block.tree_item);
gui_block.expanded = false;
}
else for (auto item : m_items)
{
::profiler_gui::set_max(::profiler_gui::EASY_GLOBALS.gui_blocks[item->block()->block_index].tree_item);
}
}
m_items.clear();
m_roots.clear();
const QSignalBlocker b(this);
clear();
{ const QSignalBlocker b(this); clear(); } // clear without emitting any signals
if (!_global)
emit ::profiler_gui::EASY_GLOBALS.events.itemsExpandStateChanged();

2
profiler_gui/globals.cpp
View File

@ -35,6 +35,8 @@ namespace profiler_gui {
, selected_block(-1)
, draw_graphics_items_borders(true)
, display_only_relevant_stats(true)
, collapse_items_on_tree_close(false)
, all_items_expanded_by_default(true)
{
}

2
profiler_gui/globals.h
View File

@ -74,6 +74,8 @@ namespace profiler_gui {
unsigned int selected_block; ///< Current selected profiler block index
bool draw_graphics_items_borders; ///< Draw borders for graphics blocks or not
bool display_only_relevant_stats; ///< Display only relevant information in ProfTreeWidget (excludes min, max, average times if there are only 1 calls number)
bool collapse_items_on_tree_close; ///< Collapse all items which were displayed in the hierarchy tree after tree close/reset
bool all_items_expanded_by_default; ///<
private:

147
profiler_gui/main_window.cpp
View File

@ -33,6 +33,7 @@
#include <QTextCodec>
#include <QProgressDialog>
#include <QSignalBlocker>
#include <QDebug>
#include "main_window.h"
#include "blocks_tree_widget.h"
#include "blocks_graphics_view.h"
@ -68,31 +69,48 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_treeWidget(nullptr), m_graphicsVi
addDockWidget(Qt::TopDockWidgetArea, m_graphicsView);
addDockWidget(Qt::BottomDockWidgetArea, m_treeWidget);
auto actionOpen = new QAction("Open", nullptr);
connect(actionOpen, &QAction::triggered, this, &This::onOpenFileClicked);
auto actionReload = new QAction("Reload", nullptr);
connect(actionReload, &QAction::triggered, this, &This::onReloadFileClicked);
auto actionExit = new QAction("Exit", nullptr);
connect(actionExit, &QAction::triggered, this, &This::onExitClicked);
auto menu = new QMenu("&File");
auto actionExpand = new QAction("Expand all", nullptr);
connect(actionExpand, &QAction::triggered, this, &This::onExpandAllClicked);
auto action = menu->addAction("&Open");
connect(action, &QAction::triggered, this, &This::onOpenFileClicked);
auto actionCollapse = new QAction("Collapse all", nullptr);
connect(actionCollapse, &QAction::triggered, this, &This::onCollapseAllClicked);
action = menu->addAction("&Reload");
connect(action, &QAction::triggered, this, &This::onReloadFileClicked);
auto menu = new QMenu("File");
menu->addAction(actionOpen);
menu->addAction(actionReload);
menu->addSeparator();
menu->addAction(actionExit);
action = menu->addAction("&Exit");
connect(action, &QAction::triggered, this, &This::onExitClicked);
menuBar()->addMenu(menu);
menu = new QMenu("View");
menu->addAction(actionExpand);
menu->addAction(actionCollapse);
menu = new QMenu("&View");
action = menu->addAction("Expand all");
connect(action, &QAction::triggered, this, &This::onExpandAllClicked);
action = menu->addAction("Collapse all");
connect(action, &QAction::triggered, this, &This::onCollapseAllClicked);
menu->addSeparator();
action = menu->addAction("Draw items' borders");
action->setCheckable(true);
action->setChecked(::profiler_gui::EASY_GLOBALS.draw_graphics_items_borders);
connect(action, &QAction::triggered, this, &This::onDrawBordersChanged);
action = menu->addAction("Collapse item on tree reset");
action->setCheckable(true);
action->setChecked(::profiler_gui::EASY_GLOBALS.collapse_items_on_tree_close);
connect(action, &QAction::triggered, this, &This::onCollapseItemsAfterCloseChanged);
action = menu->addAction("Expand all on file open");
action->setCheckable(true);
action->setChecked(::profiler_gui::EASY_GLOBALS.all_items_expanded_by_default);
connect(action, &QAction::triggered, this, &This::onAllItemsExpandedByDefaultChange);
menuBar()->addMenu(menu);
QSettings settings(::profiler_gui::ORGANAZATION_NAME, ::profiler_gui::APPLICATION_NAME);
@ -105,7 +123,7 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_treeWidget(nullptr), m_graphicsVi
QTextCodec::setCodecForLocale(default_codec);
settings.endGroup();
menu = new QMenu("Settings");
menu = new QMenu("&Settings");
auto encodingMenu = menu->addMenu(tr("&Encoding"));
QActionGroup* codecs_actions = new QActionGroup(this);
@ -125,12 +143,6 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_treeWidget(nullptr), m_graphicsVi
connect(action, &QAction::triggered, this, &This::onEncodingChanged);
}
menu->addSeparator();
auto actionBorders = menu->addAction("Draw items' borders");
actionBorders->setCheckable(true);
actionBorders->setChecked(::profiler_gui::EASY_GLOBALS.draw_graphics_items_borders);
connect(actionBorders, &QAction::triggered, this, &This::onDrawBordersChanged);
menuBar()->addMenu(menu);
connect(graphicsView->view(), &EasyGraphicsView::intervalChanged, treeWidget, &EasyTreeWidget::setTreeBlocks);
@ -148,7 +160,7 @@ EasyMainWindow::EasyMainWindow() : Parent(), m_treeWidget(nullptr), m_graphicsVi
if(QCoreApplication::arguments().size() > 1)
{
auto opened_filename = QCoreApplication::arguments().at(1).toStdString();
auto opened_filename = QCoreApplication::arguments().at(1);
loadFile(opened_filename);
}
}
@ -162,18 +174,22 @@ EasyMainWindow::~EasyMainWindow()
void EasyMainWindow::onOpenFileClicked(bool)
{
auto filename = QFileDialog::getOpenFileName(this, "Open profiler log", m_lastFile.c_str(), "Profiler Log File (*.prof);;All Files (*.*)");
loadFile(filename.toStdString());
auto filename = QFileDialog::getOpenFileName(this, "Open profiler log", m_lastFile, "Profiler Log File (*.prof);;All Files (*.*)");
loadFile(filename);
}
//////////////////////////////////////////////////////////////////////////
void EasyMainWindow::loadFile(const std::string& stdfilename)
void EasyMainWindow::loadFile(const QString& filename)
{
const auto i = filename.lastIndexOf(QChar('/'));
const auto j = filename.lastIndexOf(QChar('\\'));
m_progress->setLabelText(QString("Loading %1...").arg(filename.mid(::std::max(i, j) + 1)));
m_progress->setValue(0);
//m_progress->show();
m_readerTimer.start(LOADER_TIMER_INTERVAL);
m_reader.load(stdfilename);
m_reader.load(filename);
// ::profiler::SerializedData data;
// ::profiler::thread_blocks_tree_t prof_blocks;
@ -200,7 +216,7 @@ void EasyMainWindow::loadFile(const std::string& stdfilename)
void EasyMainWindow::onReloadFileClicked(bool)
{
if (m_lastFile.empty())
if (m_lastFile.isEmpty())
return;
loadFile(m_lastFile);
}
@ -227,6 +243,16 @@ void EasyMainWindow::onDrawBordersChanged(bool _checked)
::profiler_gui::EASY_GLOBALS.draw_graphics_items_borders = _checked;
}
void EasyMainWindow::onCollapseItemsAfterCloseChanged(bool _checked)
{
::profiler_gui::EASY_GLOBALS.collapse_items_on_tree_close = _checked;
}
void EasyMainWindow::onAllItemsExpandedByDefaultChange(bool _checked)
{
::profiler_gui::EASY_GLOBALS.all_items_expanded_by_default = _checked;
}
//////////////////////////////////////////////////////////////////////////
void EasyMainWindow::onExpandAllClicked(bool)
@ -277,7 +303,25 @@ void EasyMainWindow::loadSettings()
auto last_file = settings.value("last_file");
if (!last_file.isNull())
{
m_lastFile = last_file.toString().toStdString();
m_lastFile = last_file.toString();
}
auto flag = settings.value("draw_graphics_items_borders");
if (!flag.isNull())
{
::profiler_gui::EASY_GLOBALS.draw_graphics_items_borders = flag.toBool();
}
flag = settings.value("collapse_items_on_tree_close");
if (!flag.isNull())
{
::profiler_gui::EASY_GLOBALS.collapse_items_on_tree_close = flag.toBool();
}
flag = settings.value("all_items_expanded_by_default");
if (!flag.isNull())
{
::profiler_gui::EASY_GLOBALS.all_items_expanded_by_default = flag.toBool();
}
settings.endGroup();
@ -289,7 +333,10 @@ void EasyMainWindow::saveSettings()
settings.beginGroup("main");
settings.setValue("geometry", this->saveGeometry());
settings.setValue("last_file", m_lastFile.c_str());
settings.setValue("last_file", m_lastFile);
settings.setValue("draw_graphics_items_borders", ::profiler_gui::EASY_GLOBALS.draw_graphics_items_borders);
settings.setValue("collapse_items_on_tree_close", ::profiler_gui::EASY_GLOBALS.collapse_items_on_tree_close);
settings.setValue("all_items_expanded_by_default", ::profiler_gui::EASY_GLOBALS.all_items_expanded_by_default);
settings.setValue("encoding", QTextCodec::codecForLocale()->name());
settings.endGroup();
@ -308,10 +355,16 @@ void EasyMainWindow::onFileReaderTimeout()
::profiler::SerializedData data;
::profiler::thread_blocks_tree_t prof_blocks;
::std::string stdfilename;
m_reader.get(data, prof_blocks, stdfilename);
QString filename;
m_reader.get(data, prof_blocks, filename);
m_lastFile = ::std::move(stdfilename);
if (prof_blocks.size() > 0xff)
{
qWarning() << "Warning: file " << filename << " contains " << prof_blocks.size() << " threads!";
qWarning() << "Warning: Currently, maximum number of displayed threads is 255! Some threads will not be displayed.";
}
m_lastFile = ::std::move(filename);
m_serializedData = ::std::move(data);
::profiler_gui::EASY_GLOBALS.selected_thread = 0;
::profiler_gui::set_max(::profiler_gui::EASY_GLOBALS.selected_block);
@ -322,12 +375,21 @@ void EasyMainWindow::onFileReaderTimeout()
static_cast<EasyGraphicsViewWidget*>(m_graphicsView->widget())->view()->setTree(::profiler_gui::EASY_GLOBALS.profiler_blocks);
}
else
{
qWarning() << "Warning: Can not open file " << m_reader.filename();
}
m_reader.interrupt();
m_readerTimer.stop();
m_progress->setValue(100);
//m_progress->hide();
if (::profiler_gui::EASY_GLOBALS.all_items_expanded_by_default)
{
onExpandAllClicked(true);
}
}
else
{
@ -370,15 +432,20 @@ unsigned int EasyFileReader::size() const
return m_size.load();
}
void EasyFileReader::load(const ::std::string& _filename)
const QString& EasyFileReader::filename() const
{
return m_filename;
}
void EasyFileReader::load(const QString& _filename)
{
interrupt();
m_filename = _filename;
m_thread = ::std::move(::std::thread([](::std::atomic_bool& isDone, ::std::atomic<unsigned int>& blocks_number, ::std::atomic<int>& progress, const char* filename, ::profiler::SerializedData& serialized_blocks, ::profiler::thread_blocks_tree_t& threaded_trees) {
blocks_number.store(fillTreesFromFile(progress, filename, serialized_blocks, threaded_trees, true));
m_thread = ::std::move(::std::thread([](::std::atomic_bool& isDone, ::std::atomic<unsigned int>& blocks_number, ::std::atomic<int>& progress, const QString& filename, ::profiler::SerializedData& serialized_blocks, ::profiler::thread_blocks_tree_t& threaded_trees) {
blocks_number.store(fillTreesFromFile(progress, filename.toStdString().c_str(), serialized_blocks, threaded_trees, true));
isDone.store(true);
}, ::std::ref(m_bDone), ::std::ref(m_size), ::std::ref(m_progress), m_filename.c_str(), ::std::ref(m_serializedData), ::std::ref(m_blocksTree)));
}, ::std::ref(m_bDone), ::std::ref(m_size), ::std::ref(m_progress), ::std::ref(m_filename), ::std::ref(m_serializedData), ::std::ref(m_blocksTree)));
}
void EasyFileReader::interrupt()
@ -394,7 +461,7 @@ void EasyFileReader::interrupt()
m_blocksTree.clear();
}
void EasyFileReader::get(::profiler::SerializedData& _data, ::profiler::thread_blocks_tree_t& _tree, ::std::string& _filename)
void EasyFileReader::get(::profiler::SerializedData& _data, ::profiler::thread_blocks_tree_t& _tree, QString& _filename)
{
if (done())
{

13
profiler_gui/main_window.h
View File

@ -34,7 +34,7 @@ class EasyFileReader final
{
::profiler::SerializedData m_serializedData; ///<
::profiler::thread_blocks_tree_t m_blocksTree; ///<
::std::string m_filename; ///<
QString m_filename; ///<
::std::thread m_thread; ///<
::std::atomic_bool m_bDone; ///<
::std::atomic<int> m_progress; ///<
@ -48,10 +48,11 @@ public:
bool done() const;
int progress() const;
unsigned int size() const;
const QString& filename() const;
void load(const ::std::string& _filename);
void load(const QString& _filename);
void interrupt();
void get(::profiler::SerializedData& _data, ::profiler::thread_blocks_tree_t& _tree, ::std::string& _filename);
void get(::profiler::SerializedData& _data, ::profiler::thread_blocks_tree_t& _tree, QString& _filename);
}; // END of class EasyFileReader.
@ -66,7 +67,7 @@ protected:
typedef EasyMainWindow This;
typedef QMainWindow Parent;
::std::string m_lastFile;
QString m_lastFile;
QDockWidget* m_treeWidget;
QDockWidget* m_graphicsView;
class QProgressDialog* m_progress;
@ -90,6 +91,8 @@ protected slots:
void onExitClicked(bool);
void onEncodingChanged(bool);
void onDrawBordersChanged(bool);
void onCollapseItemsAfterCloseChanged(bool);
void onAllItemsExpandedByDefaultChange(bool);
void onExpandAllClicked(bool);
void onCollapseAllClicked(bool);
void onFileReaderTimeout();
@ -99,7 +102,7 @@ private:
// Private non-virtual methods
void loadFile(const std::string& filename);
void loadFile(const QString& filename);
void loadSettings();
void saveSettings();