From e9accd96a9e3d3159bc6907a83a0b7440366d425 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Sat, 11 Jun 2022 08:57:45 +0000 Subject: [PATCH] - use blaze matrix library git-svn-id: http://moon:8086/svn/software/trunk/projects/mpsk_rx_gui@944 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- Makefile | 2 +- Source/GraphComponent.cpp | 4 ++-- mpsk.code-workspace | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 585fc74..0670b6e 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CXXFLAGS_release := -O3 -flto CFLAGS_release := -O3 -flto LDFLAGS_release := -O3 -flto TARGET_ARCH := -march=native -CXXFLAGS += -std=c++17 +CXXFLAGS += -std=c++20 LIBS := -lstdc++ -lm -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt LDFLAGS += $(TARGET_ARCH) $(LIBDIR) -L/usr/X11R6/lib/ diff --git a/Source/GraphComponent.cpp b/Source/GraphComponent.cpp index fe1c00c..9f2f316 100644 --- a/Source/GraphComponent.cpp +++ b/Source/GraphComponent.cpp @@ -136,7 +136,7 @@ void GraphComponent::receiverStatusChanged(ReceiverInterface *pReceiver) for (i=0; i < w.size(); i++) { m_pCurves[j].m_pPointArray[i].x = (float)i; - m_pCurves[j].m_pPointArray[i].y = abs(w(i)); + m_pCurves[j].m_pPointArray[i].y = abs(w[i]); if (m_pCurves[j].m_pPointArray[i].y < minY) { @@ -157,7 +157,7 @@ void GraphComponent::receiverStatusChanged(ReceiverInterface *pReceiver) for (i=0; i < w.size(); i++) { m_pCurves[j].m_pPointArray[i].x = (float)i; - m_pCurves[j].m_pPointArray[i].y = abs(w(i)); + m_pCurves[j].m_pPointArray[i].y = abs(w[i]); if (m_pCurves[j].m_pPointArray[i].y < minY) { diff --git a/mpsk.code-workspace b/mpsk.code-workspace index a58ce83..531aeb8 100644 --- a/mpsk.code-workspace +++ b/mpsk.code-workspace @@ -104,7 +104,9 @@ "hash_map": "cpp", "armadillo": "cpp", "matrixfunctions": "cpp", - "float.h": "c" + "float.h": "c", + "fir2.h": "c", + "sparseqr": "cpp" } } }