Skip to content

UI: Add graphs for Stats dock #9190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pkviet wants to merge 7 commits into from
Closed

UI: Add graphs for Stats dock #9190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d23f7be
obs-ffmpeg: Move mpegts to its own module
pkviet Aug 1, 2022
a0fe3b3
obs-mpegts: Add stats proc handler for SRT
pkviet Jun 5, 2023
ae4022c
cmake: Copy QCharts dll and its dependencies
pkviet Jun 5, 2023
d3e53c4
obs-mpegts: Add SRT stats dock
pkviet Jun 26, 2023
dbcd77e
CI: Use deps with QCharts (temp, remove once deps are merged)
pkviet Feb 19, 2024
6e07c5b
UI: Add graphs for stats dock
pkviet Jun 30, 2023
7516ad1
CI: Enable QtCharts for linux deps
pkviet Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/scripts/utils.zsh/setup_linux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ if (( QT_VERSION == 6 )) {
qt6-base-dev
libqt6svg6-dev
qt6-base-private-dev
libqt6opengl6-dev
libqt6openglwidgets6
libqt6charts6-dev
)
} else {
log_error "Unsupported Qt version '${QT_VERSION}' specified."
Expand Down
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ if(CMAKE_HOST_SYSTEM_NAME MATCHES "(Darwin)" OR OBS_CMAKE_VERSION VERSION_GREATE
option(ENABLE_UI "Enable building with UI (requires Qt)" ON)
option(ENABLE_SCRIPTING "Enable scripting support" ON)
option(ENABLE_HEVC "Enable HEVC encoders" ON)
option(ENABLE_NEW_MPEGTS_OUTPUT "Use native SRT/RIST mpegts output" ON)
if(ENABLE_NEW_MPEGTS_OUTPUT)
add_compile_definitions(NEW_MPEGTS_OUTPUT)
endif()

add_subdirectory(libobs)
if(OS_WINDOWS)
Expand Down Expand Up @@ -65,6 +69,10 @@ option(ENABLE_HEVC "Enable HEVC encoders" ON)
if(ENABLE_HEVC)
add_compile_definitions(ENABLE_HEVC)
endif()
option(ENABLE_NEW_MPEGTS_OUTPUT "Use native SRT/RIST mpegts output" ON)
if(ENABLE_NEW_MPEGTS_OUTPUT)
add_compile_definitions(NEW_MPEGTS_OUTPUT)
endif()
option(BUILD_FOR_DISTRIBUTION "Build for distribution (enables optimizations)" OFF)
option(ENABLE_UI "Enable building with UI (requires Qt)" ON)
option(ENABLE_SCRIPTING "Enable scripting support" ON)
Expand Down
4 changes: 2 additions & 2 deletions UI/cmake/legacy.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ find_package(CURL REQUIRED)
add_subdirectory(frontend-plugins)
add_executable(obs)

find_qt(COMPONENTS Widgets Network Svg Xml COMPONENTS_LINUX Gui)
find_qt(COMPONENTS Widgets Network Svg Xml Charts COMPONENTS_LINUX Gui)

target_link_libraries(obs PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network)
target_link_libraries(obs PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network Qt::Charts)

set_target_properties(
obs
Expand Down
4 changes: 2 additions & 2 deletions UI/cmake/ui-qt.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# cmake-format: off
find_package(Qt6 REQUIRED Widgets Network Svg Xml)
find_package(Qt6 REQUIRED Widgets Network Svg Xml Charts)
# cmake-format: on

if(OS_LINUX
Expand All @@ -8,7 +8,7 @@ if(OS_LINUX
find_package(Qt6 REQUIRED Gui)
endif()

target_link_libraries(obs-studio PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network)
target_link_libraries(obs-studio PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network Qt::Charts)

set_target_properties(
obs-studio
Expand Down
14 changes: 14 additions & 0 deletions UI/data/locale/en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,20 @@ Basic.Stats.MegabytesSent="Total Data Output"
Basic.Stats.Bitrate="Bitrate"
Basic.Stats.DiskFullIn="Disk full in (approx.)"
Basic.Stats.ResetStats="Reset Stats"
Basic.Stats.Dropped.Frames="Dropped Frames (%)"
Basic.Stats.Bitrate.kbps="Bitrate (kbps)"
Basic.Stats.Graphs="Live Graphs (Bitrate & Dropped Frames)"
Basic.Stats.Graph.Tooltip="zoom out: right-click.\n zoom in: select a vertical span."
Basic.Stats.Graphs.Show.Hide="Show / Hide Graphs."

@WizardCM WizardCM Jul 8, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
Basic.Stats.Graphs.Show.Hide="Show / Hide Graphs."
Basic.Stats.Graphs.Show.Hide="Toggle Graphs"

Basic.Stats.Time.HMS="hh:mm:ss"
Basic.Stats.Time.Selector="Time span"
Basic.Stats.Time.Selector.MN="1 min"
Basic.Stats.Time.Selector.3MN="3 min"
Basic.Stats.Time.Selector.5MN="5 min"
Basic.Stats.Time.Selector.10MN="10 min"
Basic.Stats.Time.Selector.HR="1 hr"
Basic.Stats.Time.Selector.2HR="2 hr"
Basic.Stats.Time.Selector.4HR="4 hr"

ResetUIWarning.Title="Are you sure you want to reset the UI?"
ResetUIWarning.Text="Resetting the UI will hide additional docks. You will need to unhide these docks from the Docks menu if you want them to be visible.\n\nAre you sure you want to reset the UI?"
Expand Down
Loading