Skip to content

Commit

Permalink
Domain graph view implementation (#200)
Browse files Browse the repository at this point in the history
* Disable dragging elements out of their bounds

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: Implement domain graph view

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Improve domain view

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Adapt to new JSON and visual improvements

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Add arrows to connections

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Round elements

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Fix entities height

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Update tab name with view content

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Fix connections

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Add domain id selector for graph view

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Add Refresh button and refresh feature

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: Implement Monitor <---> Backend connection

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Establish connection

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Add try-catch in SyncBackendConnection call

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Catch Exception when no graph

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: Fix issues, visual bugs and improvements

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Fix communication arrows visual bugs

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Fix icons and text spacing in entity boxes

Signed-off-by: JesusPoderoso <[email protected]>

Refs: Remove vulcanexus blue from color palette

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Fix entity order generation to optimize resizing

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Add comments to QML code

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Improve backend calls

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Fix overlapping visual bugs

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Fix resizing with large alias

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Fix single topic (and no entities) data representation

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Fix tab issue with multiple domains

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Display domain info when navigating through different domain views in tabs

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19308: Display entity and topic data when clicked in the graph

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19513: Improve Domain ID Dialog values

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19513: Add metatraffic filter in the graph view

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19533: Improve arrow drawing

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: Please linters

Signed-off-by: JesusPoderoso <[email protected]>

* Initial empty commit

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Remove unnecessary include

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Remove unnecessary eol ';'

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Remove 'magic numbers'

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19532: [ARS] Remove wheel displacement 'magic number'

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Simplify hidden scrollbar

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Remove unnecesary item

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Update status comparision to uppercase

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Remove unnecessary width conditions

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Remove unnecessary filling rect

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Fix comment

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Remove unnecessary recursive call

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Fix refresh domain info call

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Remove unnecessary stack anchoring

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Remove unnecessary 'z' ordering

Signed-off-by: JesusPoderoso <[email protected]>

Refs #19532: [ARS] Remove unnecessary 'z' ordering

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: [ARS] Remove unnecessary load model calls

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: Reorder elements to fix tabs overlapping

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19532: Fix warning displayed when showing metatraffic

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19533: [ARS] Add parenthesys to conditional assignations

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19533: [ARS] Add error check in missing entities

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19533: [ARS] Remove unnecessary rect

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19533: [ARS] Add missing space

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19533: [ARS] Improve entities width management

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19533: Fix connections

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19743: [ARS] Improve comparasion conditions

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19743: [ARS] Run resize call only once

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19743: [ARS] Improve connection generation

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19743: Remove unnecessary load model call

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19743: Reduce amount of painting iterations

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19743: Fix typo

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19743: Remove unnecessary signal declaration

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19743: Apply latest rev suggestions

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
  • Loading branch information
JesusPoderoso committed Dec 12, 2023
1 parent 4ecc747 commit 28ade30
Show file tree
Hide file tree
Showing 14 changed files with 1,873 additions and 77 deletions.
1 change: 1 addition & 0 deletions imports/Theme/Theme.qml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ QtObject {

readonly property color grey: "#808080"
readonly property color lightGrey: "#d3d3d3"
readonly property color darkGrey: "#3e3e3e"
readonly property color x11Grey: "#BEBEBE"
readonly property color whiteSmoke: "#f5f5f5"

Expand Down
5 changes: 5 additions & 0 deletions include/fastdds_monitor/Controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,11 @@ public slots:
quint64 series_id,
quint64 new_max_point);


//! Request to backend the latest domain view JSON to build the graph
QString get_domain_view_graph (
QString domain_id);

signals:

//! Signal to show the Error Dialog
Expand Down
4 changes: 4 additions & 0 deletions include/fastdds_monitor/Engine.h
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,10 @@ class Engine : public QQmlApplicationEngine
quint64 series_id,
quint64 new_max_point);

//! Request to backend the latest domain view JSON to build the graph
backend::Graph get_domain_view_graph (
const backend::EntityId& domain_id);

signals:

/**
Expand Down
4 changes: 4 additions & 0 deletions include/fastdds_monitor/backend/SyncBackendConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,10 @@ class SyncBackendConnection
std::vector<EntityId>& source_ids,
std::vector<EntityId>& target_ids);

//! Request to backend the latest domain view JSON to build the graph
Graph get_domain_view_graph (
const EntityId& domain_id);

protected:

void change_unit_magnitude(
Expand Down
2 changes: 2 additions & 0 deletions qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<file>qml/CustomLegend.qml</file>
<file>qml/CustomScrollBar.qml</file>
<file>qml/DifferClickMouseArea.qml</file>
<file>qml/DomainGraphLayout.qml</file>
<file>qml/DoubleSpinBox.qml</file>
<file>qml/DumpFileDialog.qml</file>
<file>qml/DynamicDataKindDialog.qml</file>
Expand All @@ -30,6 +31,7 @@
<file>qml/EntityList.qml</file>
<file>qml/ErrorDialog.qml</file>
<file>qml/ExportCSVFileDialog.qml</file>
<file>qml/GraphConnection.qml</file>
<file>qml/HistoricDataKindDialog.qml</file>
<file>qml/HistoricDisplayStatisticsDialog.qml</file>
<file>qml/HistoricStatisticsChartView.qml</file>
Expand Down
Loading

0 comments on commit 28ade30

Please sign in to comment.