Skip to content

Commit 9c0bf5f

Browse files
authored
Merge pull request #730 from openstudiocoalition/708_Improve_SPM_Views
Fix #708 - Improve SetpointManager views: support more types, add plots where applicable, and support PlantLoop
2 parents 2d13a50 + 72b0bda commit 9c0bf5f

File tree

6 files changed

+621
-114
lines changed

6 files changed

+621
-114
lines changed

.github/workflows/app_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,7 @@ jobs:
428428
pip show setuptools
429429
pip install setuptools --upgrade
430430
pip3 install aqtinstall
431-
aqt install-qt --outputdir ./build/Qt-install/ ${{ matrix.QT_OS_NAME }} desktop $QT_VERSION ${{ matrix.QT_ARCH }} -m qtwebchannel qtwebengine qtwebview qt5compat qtpositioning
431+
aqt install-qt --outputdir ./build/Qt-install/ ${{ matrix.QT_OS_NAME }} desktop $QT_VERSION ${{ matrix.QT_ARCH }} -m qtwebchannel qtwebengine qtwebview qt5compat qtpositioning qtcharts
432432
fi
433433
434434
echo "$QT_INSTALL_DIR/bin" >> $GITHUB_PATH

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ message(STATUS "QT_INSTALL_DIR=${QT_INSTALL_DIR}")
540540

541541
find_package(Qt6 ${QT_VERSION} COMPONENTS CoreTools GuiTools WidgetsTools QmlTools WebEngineCoreTools REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
542542

543-
find_package(Qt6 ${QT_VERSION} COMPONENTS Core Core5Compat Gui Widgets Sql Svg Network Xml Concurrent PrintSupport Quick QuickWidgets Qml WebChannel Positioning WebEngineCore WebEngineWidgets REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
543+
find_package(Qt6 ${QT_VERSION} COMPONENTS Core Core5Compat Gui Widgets Sql Svg Network Xml Concurrent PrintSupport Quick QuickWidgets Qml WebChannel Positioning WebEngineCore WebEngineWidgets Charts REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
544544

545545
find_package(Qt6LinguistTools ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
546546

@@ -616,6 +616,7 @@ list(APPEND QT_LIBS Qt6::Xml)
616616
list(APPEND QT_LIBS Qt6::PrintSupport)
617617
list(APPEND QT_LIBS Qt6::Gui)
618618
list(APPEND QT_LIBS Qt6::Svg)
619+
list(APPEND QT_LIBS Qt6::Charts)
619620

620621
if(WIN32)
621622
find_package(Qt6OpenGL ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)

0 commit comments

Comments
 (0)