From 183c0e038ecb723576ca03a8f653112eab37d987 Mon Sep 17 00:00:00 2001 From: Sebastian Pape Date: Mon, 31 Mar 2025 13:07:26 +0200 Subject: [PATCH 1/6] Pushing more little changes related to changes in DasherCore --- DasherCore | 2 +- src/DasherController.cpp | 1 + src/SocketInput.cpp | 1 + src/SocketInput.h | 7 +++++-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/DasherCore b/DasherCore index b79ce05..7bf5843 160000 --- a/DasherCore +++ b/DasherCore @@ -1 +1 @@ -Subproject commit b79ce0574a2e95ae0700c79f904786d92d72d9b8 +Subproject commit 7bf58430dd9214b3f71aa287a97e5c23f5bf2f56 diff --git a/src/DasherController.cpp b/src/DasherController.cpp index 9ae55b8..7526088 100644 --- a/src/DasherController.cpp +++ b/src/DasherController.cpp @@ -1,4 +1,5 @@ #include "DasherController.h" +#include class XmlServerStore; diff --git a/src/SocketInput.cpp b/src/SocketInput.cpp index 75a5319..3c42cea 100644 --- a/src/SocketInput.cpp +++ b/src/SocketInput.cpp @@ -2,6 +2,7 @@ #include #include +#include #include "DasherInterfaceBase.h" #include "DasherModel.h" diff --git a/src/SocketInput.h b/src/SocketInput.h index b334245..c582731 100644 --- a/src/SocketInput.h +++ b/src/SocketInput.h @@ -1,9 +1,12 @@ #pragma once #include "DasherInput.h" +#include "DefaultFilter.h" + +#ifdef _WIN32 + #include //Selects version for ASIO on Windows +#endif #include "asio.hpp" -#include "DashIntfSettings.h" -#include "PressFilter.h" class SocketInput : public Dasher::CScreenCoordInput, public Dasher::CDefaultFilter { From 31ddd60248bd7336efb51ca1ec115b757494216c Mon Sep 17 00:00:00 2001 From: Sebastian Pape Date: Mon, 31 Mar 2025 13:07:48 +0200 Subject: [PATCH 2/6] Adding install step for ubuntu-latest --- .github/workflows/cmake-multi-platform.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index decde4d..a8601c5 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -55,6 +55,10 @@ jobs: run: | echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" + - name: Install OpenGL + if: matrix.os == 'ubuntu-latest' + run: sudo apt install -y libgl1-mesa-dev + - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type From c5bdb3f8671cc058ae2017260fd9954d5c288673 Mon Sep 17 00:00:00 2001 From: Sebastian Pape Date: Mon, 31 Mar 2025 13:39:00 +0200 Subject: [PATCH 3/6] Adding more glfw dependencies --- .github/workflows/cmake-multi-platform.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index a8601c5..84810ee 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -55,9 +55,10 @@ jobs: run: | echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" - - name: Install OpenGL + - name: Install GLFW dependencies + # Install glfw dependiencies on ubuntu if: matrix.os == 'ubuntu-latest' - run: sudo apt install -y libgl1-mesa-dev + run: sudo apt install -y libgl1-mesa-dev libxrandr-dev libxinerama-dev libxkbfile-dev libxcursor-dev libxi-dev - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. From 5c464240ba01d175c0ab0936d313db55544a8d7f Mon Sep 17 00:00:00 2001 From: Sebastian Pape Date: Mon, 31 Mar 2025 13:44:04 +0200 Subject: [PATCH 4/6] adding libgtk-3-dev for native file dialog --- .github/workflows/cmake-multi-platform.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 84810ee..ad26222 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -55,10 +55,10 @@ jobs: run: | echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT" - - name: Install GLFW dependencies - # Install glfw dependiencies on ubuntu + - name: Install dependencies on ubuntu + # Install thirdparty dependiencies on ubuntu if: matrix.os == 'ubuntu-latest' - run: sudo apt install -y libgl1-mesa-dev libxrandr-dev libxinerama-dev libxkbfile-dev libxcursor-dev libxi-dev + run: sudo apt install -y libgl1-mesa-dev libxrandr-dev libxinerama-dev libxkbfile-dev libxcursor-dev libxi-dev libgtk-3-dev - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. From d90d9c4bd6ef01f9c128f207a1428c5ab91917a5 Mon Sep 17 00:00:00 2001 From: Sebastian Pape Date: Mon, 31 Mar 2025 13:48:46 +0200 Subject: [PATCH 5/6] Adding headers --- src/SocketInput.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/SocketInput.cpp b/src/SocketInput.cpp index 3c42cea..3340942 100644 --- a/src/SocketInput.cpp +++ b/src/SocketInput.cpp @@ -1,7 +1,9 @@ #include "SocketInput.h" #include +#include #include +#include #include #include "DasherInterfaceBase.h" From 52b88559b2ce4d0338ff343eb8d476750f44b7ea Mon Sep 17 00:00:00 2001 From: Sebastian Pape Date: Mon, 31 Mar 2025 14:15:05 +0200 Subject: [PATCH 6/6] Fixing warning and removing c++fs flag from DasherCore --- DasherCore | 2 +- src/DasherUIScreen.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DasherCore b/DasherCore index 7bf5843..8997ff0 160000 --- a/DasherCore +++ b/DasherCore @@ -1 +1 @@ -Subproject commit 7bf58430dd9214b3f71aa287a97e5c23f5bf2f56 +Subproject commit 8997ff026852bd4d880726a935d0953c9b0304b5 diff --git a/src/DasherUIScreen.cpp b/src/DasherUIScreen.cpp index e915ff1..233680f 100644 --- a/src/DasherUIScreen.cpp +++ b/src/DasherUIScreen.cpp @@ -60,7 +60,7 @@ void DasherUIScreen::Polyline(point* Points, int Number, int iWidth, const Dashe std::vector points; - for(unsigned int i = 0; i < Number; i++) + for(int i = 0; i < Number; i++) { points.push_back(CanvasPos + ImVec2(static_cast(Points[i].x), static_cast(Points[i].y))); } @@ -74,7 +74,7 @@ void DasherUIScreen::Polygon(point* Points, int Number, const Dasher::ColorPalet std::vector points; - for (unsigned int i = 0; i < Number; i++) + for (int i = 0; i < Number; i++) { points.push_back(CanvasPos + ImVec2(static_cast(Points[i].x), static_cast(Points[i].y))); }