Skip to content

Commit

Permalink
Refs #19880: Fix logos and revert to .png format
Browse files Browse the repository at this point in the history
Signed-off-by: JesusPoderoso <[email protected]>
  • Loading branch information
JesusPoderoso committed Nov 23, 2023
1 parent b5ce9dc commit 01a93e3
Show file tree
Hide file tree
Showing 20 changed files with 17 additions and 24 deletions.
18 changes: 9 additions & 9 deletions qml.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -252,14 +252,14 @@
<file alias="SHAPES_DEMO.svg">resources/images/app_icons/SHAPES_DEMO.svg</file>
</qresource>
<qresource prefix="/resources/images/app_logos">
<file alias="AML_IP.svg">resources/images/app_logos/AML_IP.svg</file>
<file alias="DDS_RECORDER.svg">resources/images/app_logos/DDS_RECORDER.svg</file>
<file alias="DDS_REPLAYER.svg">resources/images/app_logos/DDS_REPLAYER.svg</file>
<file alias="DDS_ROUTER.svg">resources/images/app_logos/DDS_ROUTER.svg</file>
<file alias="FASTDDS.svg">resources/images/app_logos/FASTDDS.svg</file>
<file alias="FASTDDS_MONITOR.svg">resources/images/app_logos/FASTDDS_MONITOR.svg</file>
<file alias="FASTDDS_SPY.svg">resources/images/app_logos/FASTDDS_SPY.svg</file>
<file alias="SAFEDDS.svg">resources/images/app_logos/SAFEDDS.svg</file>
<file alias="SHAPES_DEMO.svg">resources/images/app_logos/SHAPES_DEMO.svg</file>
<file alias="AML_IP.png">resources/images/app_logos/AML_IP.png</file>
<file alias="DDS_RECORDER.png">resources/images/app_logos/DDS_RECORDER.png</file>
<file alias="DDS_REPLAYER.png">resources/images/app_logos/DDS_REPLAYER.png</file>
<file alias="DDS_ROUTER.png">resources/images/app_logos/DDS_ROUTER.png</file>
<file alias="FASTDDS.png">resources/images/app_logos/FASTDDS.png</file>
<file alias="FASTDDS_MONITOR.png">resources/images/app_logos/FASTDDS_MONITOR.png</file>
<file alias="FASTDDS_SPY.png">resources/images/app_logos/FASTDDS_SPY.png</file>
<file alias="SAFEDDS.png">resources/images/app_logos/SAFEDDS.png</file>
<file alias="SHAPES_DEMO.png">resources/images/app_logos/SHAPES_DEMO.png</file>
</qresource>
</RCC>
14 changes: 8 additions & 6 deletions qml/MonitoringPanel.qml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ ColumnLayout {
id: monitoringPanel
spacing: 0

readonly property int logo_height_: 120
readonly property int logo_height_: 400
readonly property int logo_width_: 1080
readonly property int logo_margin_: 10

signal explorerDDSEntitiesChanged(bool status)
signal explorerPhysicalChanged(bool status)
Expand Down Expand Up @@ -302,14 +304,15 @@ ColumnLayout {
anchors.top: parent.top
anchors.left: parent.left
width: parent.width
height: infoSelectedEntity.app_id != "UNKNOWN_APP" ? logo_height_ : 0
height: infoSelectedEntity.app_id != "UNKNOWN_APP" ? (parent.width * logo_height_)/logo_width_ : 0
color: "transparent"

Image {
id: app_logo
smooth: true
visible: parent.visible
source: parent.visible ? "/resources/images/app_logos/" + infoSelectedEntity.app_id + ".svg" : ""
anchors.top: parent.top
anchors.topMargin: logo_margin_
sourceSize.width: parent.width
sourceSize.height:parent.height
}
Expand All @@ -319,7 +322,6 @@ ColumnLayout {
{
color: "transparent"
anchors.top: app_logo_rect.bottom
anchors.bottom: parent.bottom
height: infoTabBar.height
width: parent.width

Expand All @@ -341,14 +343,14 @@ ColumnLayout {
? "No entity selected" : (entityKind.toUpperCase() + ": " + entityAlias)
infoSelectedEntity.app_id = entity_app_id
infoSelectedEntity.height = entity_app_id != "UNKNOWN_APP"
? infoTabBar.height + logo_height_ : infoTabBar.height
? infoTabBar.height + (parent.width * logo_height_)/logo_width_ : infoTabBar.height
}
}
}

StackLayout {
currentIndex: infoTabBar.currentIndex
anchors.top: infoSelectedEntity.bottom
anchors.top: infoSelectedEntity.bottom//; anchors.topMargin: -infoTabBar.height
anchors.bottom: parent.bottom
anchors.left: parent.left
width: parent.width
Expand Down
Binary file added resources/images/app_logos/AML_IP.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion resources/images/app_logos/AML_IP.svg

This file was deleted.

Binary file added resources/images/app_logos/DDS_RECORDER.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion resources/images/app_logos/DDS_RECORDER.svg

This file was deleted.

Binary file added resources/images/app_logos/DDS_REPLAYER.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion resources/images/app_logos/DDS_REPLAYER.svg

This file was deleted.

Binary file added resources/images/app_logos/DDS_ROUTER.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion resources/images/app_logos/DDS_ROUTER.svg

This file was deleted.

Binary file added resources/images/app_logos/FASTDDS.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 01a93e3

Please sign in to comment.