[mon_gui] Change font for new topics in mon_gui #1879
+56
−46
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -17,6 +17,8 @@ | |||||
| * ========================= eCAL LICENSE ================================= | ||||||
| */ | ||||||
|
|
||||||
| #include <QFont> | ||||||
|
|
||||||
| #include "topic_tree_model.h" | ||||||
| #include "tree_item_type.h" | ||||||
| #include "item_data_roles.h" | ||||||
|
|
@@ -49,7 +51,6 @@ QVariant TopicTreeModel::headerData(int section, Qt::Orientation orientation, in | |||||
| return QAbstractTreeModel::headerData(section, orientation, role); | ||||||
| } | ||||||
|
|
||||||
| int TopicTreeModel::mapColumnToItem(int model_column, int tree_item_type) const | ||||||
| { | ||||||
| switch ((TreeItemType)tree_item_type) | ||||||
|
|
@@ -70,7 +71,7 @@ void TopicTreeModel::monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb) | |||||
| { | ||||||
| // Create a list of all topics to check if we have to remove them | ||||||
| std::map<std::string, bool> topic_still_existing; | ||||||
| for (const auto& topic : topic_tree_item_map_) | ||||||
| { | ||||||
| topic_still_existing[topic.first] = false; | ||||||
| } | ||||||
|
|
@@ -84,12 +85,35 @@ void TopicTreeModel::monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb) | |||||
| // Got a new topic | ||||||
| TopicTreeItem* topic_tree_item = new TopicTreeItem(topic); | ||||||
| insertItemIntoGroups(topic_tree_item); | ||||||
| STopicTreeEntry tree_entry; | ||||||
| tree_entry.tree_item = topic_tree_item; | ||||||
| topic_tree_item_map_[topic_id] = tree_entry; | ||||||
| auto fontrole = topic_tree_item->data(1, Qt::ItemDataRole::FontRole); | ||||||
| auto font = qvariant_cast<QFont>(fontrole); | ||||||
| font.setBold(true); | ||||||
| topic_tree_item->setFont(font); | ||||||
| } | ||||||
| else | ||||||
| { | ||||||
| auto& tree_entry = topic_tree_item_map_.at(topic_id); | ||||||
| auto topic_tree_item = tree_entry.tree_item; | ||||||
|
There was a problem hiding this comment. warning: 'auto topic_tree_item' can be declared as 'auto *topic_tree_item' [readability-qualified-auto]
Suggested change
|
||||||
| if (tree_entry.tree_item_counter < 20) | ||||||
|
There was a problem hiding this comment. Maybe instead of item counter, you could make it independend of the calls with a time, as the user can specify how fast the monitoring app updates the content. |
||||||
| { | ||||||
| tree_entry.tree_item_counter++; | ||||||
| } | ||||||
| else | ||||||
|
There was a problem hiding this comment. These statements can get united together. |
||||||
| { | ||||||
| if (!tree_entry.default_font) | ||||||
| { | ||||||
| auto fontrole = topic_tree_item->data(1, Qt::ItemDataRole::FontRole); | ||||||
| auto font = qvariant_cast<QFont>(fontrole); | ||||||
| font.setBold(false); | ||||||
| topic_tree_item->setFont(font); | ||||||
| tree_entry.default_font = true; | ||||||
| } | ||||||
| } | ||||||
| // Update an existing topic | ||||||
| topic_tree_item->update(topic); | ||||||
| topic_still_existing[topic_id] = true; | ||||||
| } | ||||||
| } | ||||||
|
|
@@ -99,25 +123,26 @@ void TopicTreeModel::monitorUpdated(const eCAL::pb::Monitoring& monitoring_pb) | |||||
| { | ||||||
| if (!topic.second) | ||||||
| { | ||||||
| removeItemFromGroups(topic_tree_item_map_.at(topic.first).tree_item); | ||||||
| topic_tree_item_map_.erase(topic.first); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| updateAll(); | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
| QVector<QPair<int, QVariant>> TopicTreeModel::getTreeItemColumnNameMapping() const | ||||||
| { | ||||||
| QVector<QPair<int, QVariant>> column_name_mapping; | ||||||
|
|
||||||
| for (int i = 0; i < columnCount(); i++) | ||||||
| { | ||||||
| int column = mapColumnToItem(i, (int)TreeItemType::Topic); | ||||||
| if (column >= 0) | ||||||
| { | ||||||
| QVariant name = headerData(i, Qt::Orientation::Horizontal, Qt::ItemDataRole::DisplayRole); | ||||||
|
There was a problem hiding this comment. warning: variable 'name' of type 'QVariant' can be declared 'const' [misc-const-correctness]
Suggested change
|
||||||
| column_name_mapping.push_back(QPair<int, QVariant>(column, name)); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe don't remove the logic completely. Instead set set and unset the member font varible and return it here.