Skip to content

Commit

Permalink
3.2 (#456)
Browse files Browse the repository at this point in the history
* Updated support for windows build + installer (#396)

* embracing C++17 and new data strucutre to accomodate more types

* WIP

* string series seems to work

* adding PlotGroups and alternative "tree_name"

* multiple changes

- remove redundant importPlotDataMapHelper
- add "text_color" attribute
- change the way _replot_timer works (one shot triggered by
DataStreamer::dataReceived() )

* fix PlotGroup and new attributes

* Fix "TextColor" in dark mode

* add deleteSerieFromGroup

* bug fix

* apply the array visualization in the curvelist_panel itself

* delete button added. CPU optimized

* apply color and style recursively in a group

* file removed

Co-authored-by: alkaes <[email protected]>
  • Loading branch information
facontidavide and alkaes authored Jun 12, 2021
1 parent e015c57 commit 99c9696
Show file tree
Hide file tree
Showing 54 changed files with 1,735 additions and 2,526 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.10)

PROJECT(plotjuggler)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/cmake")

add_definitions(
Expand Down Expand Up @@ -56,8 +59,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
SET(CMAKE_AUTOUIC ON)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

if (NOT WIN32)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fno-omit-frame-pointer")
Expand Down Expand Up @@ -228,8 +229,7 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/3rdparty/paho.mqtt.c/CMakeLists.txt")
SET(CMAKE_INSTALL_INCLUDEDIR )

add_subdirectory( 3rdparty/paho.mqtt.c EXCLUDE_FROM_ALL)

add_subdirectory( plugins/DataStreamMQTT )
add_subdirectory( plugins/DataStreamMQTT )
endif()

if(EXISTS "${PROJECT_SOURCE_DIR}/3rdparty/liblsl/CMakeLists.txt" AND NOT WIN32)
Expand Down
Loading

0 comments on commit 99c9696

Please sign in to comment.