diff --git a/Engine/API/Abstract/abstractrhxcontroller.cpp b/Engine/API/Abstract/abstractrhxcontroller.cpp index 93cf351..26611ff 100644 --- a/Engine/API/Abstract/abstractrhxcontroller.cpp +++ b/Engine/API/Abstract/abstractrhxcontroller.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/API/Abstract/abstractrhxcontroller.h b/Engine/API/Abstract/abstractrhxcontroller.h index 8b7eaed..3751b4b 100644 --- a/Engine/API/Abstract/abstractrhxcontroller.h +++ b/Engine/API/Abstract/abstractrhxcontroller.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -214,7 +214,7 @@ class AbstractRHXController virtual int findConnectedChips(vector &chipType, vector &portIndex, vector &commandStream, vector &numChannelsOnPort, bool synthMaxChannels = false, bool returnToFastSettle = false, - bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1) = 0; + bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1, int lastDetectedNumStreams = -1) = 0; int pipeReadError() const { return pipeReadErrorCode; } diff --git a/Engine/API/Hardware/rhxcontroller.cpp b/Engine/API/Hardware/rhxcontroller.cpp index ce5d178..47a8da2 100644 --- a/Engine/API/Hardware/rhxcontroller.cpp +++ b/Engine/API/Hardware/rhxcontroller.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -1733,7 +1733,7 @@ void RHXController::uploadCommandList(const vector &commandList, A // of USB bus bandwidth. int RHXController::findConnectedChips(vector &chipType, vector &portIndex, vector &commandStream, vector &numChannelsOnPort, bool /* synthMaxChannels */, bool returnToFastSettle, - bool usePreviousDelay, int selectedPort, int lastDetectedChip) + bool usePreviousDelay, int selectedPort, int lastDetectedChip, int lastDetectedNumStreams) { int returnValue = 1; // return 1 == everything okay int maxNumStreams = maxNumDataStreams(); @@ -1895,6 +1895,10 @@ int RHXController::findConnectedChips(vector &chipType, vector &p int convertedPortIndex = (int) (2 * selectedPort); optimumDelay[convertedPortIndex] = previousDelay; chipTypeOld[convertedPortIndex] = (ChipType) lastDetectedChip; + if (lastDetectedChip == RHS2116Chip && lastDetectedNumStreams == 2) { + optimumDelay[convertedPortIndex + 1] = previousDelay; + chipTypeOld[convertedPortIndex + 1] = (ChipType) lastDetectedChip; + } if (lastDetectedChip == RHD2164Chip) { optimumDelay[convertedPortIndex + 1] = previousDelay; chipTypeOld[convertedPortIndex + 1] = RHD2164MISOBChip; diff --git a/Engine/API/Hardware/rhxcontroller.h b/Engine/API/Hardware/rhxcontroller.h index f5508c6..e3cd62c 100644 --- a/Engine/API/Hardware/rhxcontroller.h +++ b/Engine/API/Hardware/rhxcontroller.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -122,7 +122,8 @@ class RHXController : public AbstractRHXController int findConnectedChips(vector &chipType, vector &portIndex, vector &commandStream, vector &numChannelsOnPort, bool = false, bool returnToFastSettle = false, - bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1) override; + bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1, + int lastDetectedNumStreams = -1) override; // Physical board only static void resetBoard(okCFrontPanel* dev_); diff --git a/Engine/API/Hardware/rhxdatablock.cpp b/Engine/API/Hardware/rhxdatablock.cpp index c84cf5a..6303a43 100644 --- a/Engine/API/Hardware/rhxdatablock.cpp +++ b/Engine/API/Hardware/rhxdatablock.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/API/Hardware/rhxdatablock.h b/Engine/API/Hardware/rhxdatablock.h index 37c48c6..2c02c1a 100644 --- a/Engine/API/Hardware/rhxdatablock.h +++ b/Engine/API/Hardware/rhxdatablock.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/API/Hardware/rhxglobals.h b/Engine/API/Hardware/rhxglobals.h index c6c2f10..6e329ee 100644 --- a/Engine/API/Hardware/rhxglobals.h +++ b/Engine/API/Hardware/rhxglobals.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -46,7 +46,7 @@ const int HASHMARKLENGTH = 5; // Software version number (e.g., version 1.3.5) #define SOFTWARE_MAIN_VERSION_NUMBER 3 #define SOFTWARE_SECONDARY_VERSION_NUMBER 3 -#define SOFTWARE_TERTIARY_VERSION_NUMBER 1 +#define SOFTWARE_TERTIARY_VERSION_NUMBER 2 enum ControllerType { ControllerRecordUSB2 = 0, @@ -227,7 +227,7 @@ const uint32_t TCPSpikeMagicNumber = 0x3ae2710f; const QString OrganizationName = "Intan Technologies"; const QString OrganizationDomain = "intantech.com"; const QString ApplicationName = "IntanRHX"; -const QString ApplicationCopyrightYear = "2020-2023"; +const QString ApplicationCopyrightYear = "2020-2024"; const QString SoftwareVersion = QString::number(SOFTWARE_MAIN_VERSION_NUMBER) + "." + QString::number(SOFTWARE_SECONDARY_VERSION_NUMBER) + "." + diff --git a/Engine/API/Hardware/rhxregisters.cpp b/Engine/API/Hardware/rhxregisters.cpp index bc1ae70..2d4b882 100644 --- a/Engine/API/Hardware/rhxregisters.cpp +++ b/Engine/API/Hardware/rhxregisters.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/API/Hardware/rhxregisters.h b/Engine/API/Hardware/rhxregisters.h index 20463d1..ef28671 100644 --- a/Engine/API/Hardware/rhxregisters.h +++ b/Engine/API/Hardware/rhxregisters.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/API/Synthetic/playbackrhxcontroller.cpp b/Engine/API/Synthetic/playbackrhxcontroller.cpp index 9f7b13f..2cb6ac8 100644 --- a/Engine/API/Synthetic/playbackrhxcontroller.cpp +++ b/Engine/API/Synthetic/playbackrhxcontroller.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -201,7 +201,8 @@ int PlaybackRHXController::getNumSPIPorts(bool &expanderBoardDetected) int PlaybackRHXController::findConnectedChips(vector& /* chipType */, vector& /* portIndex */, vector& /* commandStream */, vector& /* numChannelsOnPort */, bool /* synthMaxChannels */, bool /* returnToFastSettle */, - bool /* usePreviousDelay */, int /* selectedPort */, int /* lastDetectedChip */) + bool /* usePreviousDelay */, int /* selectedPort */, int /* lastDetectedChip */, + int /* lastDetectedNumStreams */) { return 1; } diff --git a/Engine/API/Synthetic/playbackrhxcontroller.h b/Engine/API/Synthetic/playbackrhxcontroller.h index 043c589..bdb099b 100644 --- a/Engine/API/Synthetic/playbackrhxcontroller.h +++ b/Engine/API/Synthetic/playbackrhxcontroller.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -108,7 +108,7 @@ class PlaybackRHXController : public AbstractRHXController int findConnectedChips(vector &chipType, vector &portIndex, vector &commandStream, vector &numChannelsOnPort, bool synthMaxChannels = false, bool returnToFastSettle = false, - bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1) override; + bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1, int lastDetectedNumStreams = -1) override; private: unsigned int numWordsInFifo() override; diff --git a/Engine/API/Synthetic/randomnumber.cpp b/Engine/API/Synthetic/randomnumber.cpp index 7b9dcf4..0e5d3fe 100644 --- a/Engine/API/Synthetic/randomnumber.cpp +++ b/Engine/API/Synthetic/randomnumber.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/API/Synthetic/randomnumber.h b/Engine/API/Synthetic/randomnumber.h index 4145293..8e45447 100644 --- a/Engine/API/Synthetic/randomnumber.h +++ b/Engine/API/Synthetic/randomnumber.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/API/Synthetic/synthdatablockgenerator.cpp b/Engine/API/Synthetic/synthdatablockgenerator.cpp index f86f95d..df0083b 100644 --- a/Engine/API/Synthetic/synthdatablockgenerator.cpp +++ b/Engine/API/Synthetic/synthdatablockgenerator.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/API/Synthetic/synthdatablockgenerator.h b/Engine/API/Synthetic/synthdatablockgenerator.h index f21a64d..b86ebe1 100644 --- a/Engine/API/Synthetic/synthdatablockgenerator.h +++ b/Engine/API/Synthetic/synthdatablockgenerator.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/API/Synthetic/syntheticrhxcontroller.cpp b/Engine/API/Synthetic/syntheticrhxcontroller.cpp index 95551b0..0114d9d 100644 --- a/Engine/API/Synthetic/syntheticrhxcontroller.cpp +++ b/Engine/API/Synthetic/syntheticrhxcontroller.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -216,7 +216,7 @@ int SyntheticRHXController::getNumSPIPorts(bool &expanderBoardDetected) // of USB bus bandwidth. int SyntheticRHXController::findConnectedChips(vector &chipType, vector &portIndex, vector &commandStream, vector &numChannelsOnPort, bool synthMaxChannels, bool returnToFastSettle, - bool usePreviousDelay, int selectedPort, int lastDetectedChip) + bool usePreviousDelay, int selectedPort, int lastDetectedChip, int lastDetectedNumStreams) { int maxNumStreams = maxNumDataStreams(); int maxSPIPorts = maxNumSPIPorts(); diff --git a/Engine/API/Synthetic/syntheticrhxcontroller.h b/Engine/API/Synthetic/syntheticrhxcontroller.h index 36673ac..4931699 100644 --- a/Engine/API/Synthetic/syntheticrhxcontroller.h +++ b/Engine/API/Synthetic/syntheticrhxcontroller.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -108,7 +108,7 @@ class SyntheticRHXController : public AbstractRHXController int findConnectedChips(vector &chipType, vector &portIndex, vector &commandStream, vector &numChannelsOnPort, bool synthMaxChannels = false, bool returnToFastSettle = false, - bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1) override; + bool usePreviousDelay = false, int selectedPort = 0, int lastDetectedChip = -1, int lastDetectedNumStreams = -1) override; private: unsigned int numWordsInFifo() override; diff --git a/Engine/Processing/DataFileReaders/datafile.cpp b/Engine/Processing/DataFileReaders/datafile.cpp index 257d5fd..891be2b 100644 --- a/Engine/Processing/DataFileReaders/datafile.cpp +++ b/Engine/Processing/DataFileReaders/datafile.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/datafile.h b/Engine/Processing/DataFileReaders/datafile.h index 1a662fa..5070e21 100644 --- a/Engine/Processing/DataFileReaders/datafile.h +++ b/Engine/Processing/DataFileReaders/datafile.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/datafilemanager.cpp b/Engine/Processing/DataFileReaders/datafilemanager.cpp index 9758a53..b083895 100644 --- a/Engine/Processing/DataFileReaders/datafilemanager.cpp +++ b/Engine/Processing/DataFileReaders/datafilemanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/datafilemanager.h b/Engine/Processing/DataFileReaders/datafilemanager.h index d445ae7..a334466 100644 --- a/Engine/Processing/DataFileReaders/datafilemanager.h +++ b/Engine/Processing/DataFileReaders/datafilemanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/datafilereader.cpp b/Engine/Processing/DataFileReaders/datafilereader.cpp index 1e5ca02..544f736 100644 --- a/Engine/Processing/DataFileReaders/datafilereader.cpp +++ b/Engine/Processing/DataFileReaders/datafilereader.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/datafilereader.h b/Engine/Processing/DataFileReaders/datafilereader.h index 1b6ad41..474750c 100644 --- a/Engine/Processing/DataFileReaders/datafilereader.h +++ b/Engine/Processing/DataFileReaders/datafilereader.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/fileperchannelmanager.cpp b/Engine/Processing/DataFileReaders/fileperchannelmanager.cpp index d1fbc69..9535114 100644 --- a/Engine/Processing/DataFileReaders/fileperchannelmanager.cpp +++ b/Engine/Processing/DataFileReaders/fileperchannelmanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/fileperchannelmanager.h b/Engine/Processing/DataFileReaders/fileperchannelmanager.h index 40d7f0f..0309352 100644 --- a/Engine/Processing/DataFileReaders/fileperchannelmanager.h +++ b/Engine/Processing/DataFileReaders/fileperchannelmanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/filepersignaltypemanager.cpp b/Engine/Processing/DataFileReaders/filepersignaltypemanager.cpp index df06f1b..c1d0701 100644 --- a/Engine/Processing/DataFileReaders/filepersignaltypemanager.cpp +++ b/Engine/Processing/DataFileReaders/filepersignaltypemanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/filepersignaltypemanager.h b/Engine/Processing/DataFileReaders/filepersignaltypemanager.h index e770b04..3c8f158 100644 --- a/Engine/Processing/DataFileReaders/filepersignaltypemanager.h +++ b/Engine/Processing/DataFileReaders/filepersignaltypemanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/traditionalintanfilemanager.cpp b/Engine/Processing/DataFileReaders/traditionalintanfilemanager.cpp index 1e62116..5636125 100644 --- a/Engine/Processing/DataFileReaders/traditionalintanfilemanager.cpp +++ b/Engine/Processing/DataFileReaders/traditionalintanfilemanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/DataFileReaders/traditionalintanfilemanager.h b/Engine/Processing/DataFileReaders/traditionalintanfilemanager.h index a45a370..06f8191 100644 --- a/Engine/Processing/DataFileReaders/traditionalintanfilemanager.h +++ b/Engine/Processing/DataFileReaders/traditionalintanfilemanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/SaveManagers/fileperchannelsavemanager.cpp b/Engine/Processing/SaveManagers/fileperchannelsavemanager.cpp index 34ad556..e89eb0f 100644 --- a/Engine/Processing/SaveManagers/fileperchannelsavemanager.cpp +++ b/Engine/Processing/SaveManagers/fileperchannelsavemanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/SaveManagers/fileperchannelsavemanager.h b/Engine/Processing/SaveManagers/fileperchannelsavemanager.h index df49202..c533906 100644 --- a/Engine/Processing/SaveManagers/fileperchannelsavemanager.h +++ b/Engine/Processing/SaveManagers/fileperchannelsavemanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/SaveManagers/filepersignaltypesavemanager.cpp b/Engine/Processing/SaveManagers/filepersignaltypesavemanager.cpp index 721c4ea..2af2198 100644 --- a/Engine/Processing/SaveManagers/filepersignaltypesavemanager.cpp +++ b/Engine/Processing/SaveManagers/filepersignaltypesavemanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/SaveManagers/filepersignaltypesavemanager.h b/Engine/Processing/SaveManagers/filepersignaltypesavemanager.h index 815cce1..9102572 100644 --- a/Engine/Processing/SaveManagers/filepersignaltypesavemanager.h +++ b/Engine/Processing/SaveManagers/filepersignaltypesavemanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/SaveManagers/intanfilesavemanager.cpp b/Engine/Processing/SaveManagers/intanfilesavemanager.cpp index 5364c32..8652ae8 100644 --- a/Engine/Processing/SaveManagers/intanfilesavemanager.cpp +++ b/Engine/Processing/SaveManagers/intanfilesavemanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/SaveManagers/intanfilesavemanager.h b/Engine/Processing/SaveManagers/intanfilesavemanager.h index 5beae08..373b9f1 100644 --- a/Engine/Processing/SaveManagers/intanfilesavemanager.h +++ b/Engine/Processing/SaveManagers/intanfilesavemanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/SaveManagers/savefile.cpp b/Engine/Processing/SaveManagers/savefile.cpp index 3dee8a5..bd0fd2c 100644 --- a/Engine/Processing/SaveManagers/savefile.cpp +++ b/Engine/Processing/SaveManagers/savefile.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/SaveManagers/savefile.h b/Engine/Processing/SaveManagers/savefile.h index 94c43d8..608a0af 100644 --- a/Engine/Processing/SaveManagers/savefile.h +++ b/Engine/Processing/SaveManagers/savefile.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/SaveManagers/savemanager.cpp b/Engine/Processing/SaveManagers/savemanager.cpp index a717d9f..e70d647 100644 --- a/Engine/Processing/SaveManagers/savemanager.cpp +++ b/Engine/Processing/SaveManagers/savemanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -149,6 +149,7 @@ void SaveManager::writeLiveNoteEntry(uint64_t timestamp, const QString& note) QTime recordTime(0, 0); QString timeString = recordTime.addSecs(timeInSeconds).toString("HH:mm:ss"); liveNotesFile->writeQStringAsAsciiText(timestampString + ", " + timeString + ", " + note + "\r\n"); + liveNotesFile->forceFlush(); } else { cerr << "SaveManager::writeLiveNoteEntry: live notes file " << liveNotesFileName.toStdString() << " is not open.\n"; } diff --git a/Engine/Processing/SaveManagers/savemanager.h b/Engine/Processing/SaveManagers/savemanager.h index 75f1392..3267c33 100644 --- a/Engine/Processing/SaveManagers/savemanager.h +++ b/Engine/Processing/SaveManagers/savemanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/XPUInterfaces/abstractxpuinterface.cpp b/Engine/Processing/XPUInterfaces/abstractxpuinterface.cpp index 8021cbe..d8acb17 100644 --- a/Engine/Processing/XPUInterfaces/abstractxpuinterface.cpp +++ b/Engine/Processing/XPUInterfaces/abstractxpuinterface.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/XPUInterfaces/abstractxpuinterface.h b/Engine/Processing/XPUInterfaces/abstractxpuinterface.h index 50741cc..8fbf365 100644 --- a/Engine/Processing/XPUInterfaces/abstractxpuinterface.h +++ b/Engine/Processing/XPUInterfaces/abstractxpuinterface.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/XPUInterfaces/cpuinterface.cpp b/Engine/Processing/XPUInterfaces/cpuinterface.cpp index f767260..9ca2607 100644 --- a/Engine/Processing/XPUInterfaces/cpuinterface.cpp +++ b/Engine/Processing/XPUInterfaces/cpuinterface.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/XPUInterfaces/cpuinterface.h b/Engine/Processing/XPUInterfaces/cpuinterface.h index 8e3c3e5..7c2b167 100644 --- a/Engine/Processing/XPUInterfaces/cpuinterface.h +++ b/Engine/Processing/XPUInterfaces/cpuinterface.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/XPUInterfaces/gpuinterface.cpp b/Engine/Processing/XPUInterfaces/gpuinterface.cpp index 9d94544..bfa78a7 100644 --- a/Engine/Processing/XPUInterfaces/gpuinterface.cpp +++ b/Engine/Processing/XPUInterfaces/gpuinterface.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/XPUInterfaces/gpuinterface.h b/Engine/Processing/XPUInterfaces/gpuinterface.h index 77e092d..cec7dfc 100644 --- a/Engine/Processing/XPUInterfaces/gpuinterface.h +++ b/Engine/Processing/XPUInterfaces/gpuinterface.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/XPUInterfaces/xpucontroller.cpp b/Engine/Processing/XPUInterfaces/xpucontroller.cpp index 9a496ff..82818f7 100644 --- a/Engine/Processing/XPUInterfaces/xpucontroller.cpp +++ b/Engine/Processing/XPUInterfaces/xpucontroller.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/XPUInterfaces/xpucontroller.h b/Engine/Processing/XPUInterfaces/xpucontroller.h index a9fa8d3..24b4f90 100644 --- a/Engine/Processing/XPUInterfaces/xpucontroller.h +++ b/Engine/Processing/XPUInterfaces/xpucontroller.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/channel.cpp b/Engine/Processing/channel.cpp index f4bccae..17d6077 100644 --- a/Engine/Processing/channel.cpp +++ b/Engine/Processing/channel.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/channel.h b/Engine/Processing/channel.h index c8721d3..ead56e6 100644 --- a/Engine/Processing/channel.h +++ b/Engine/Processing/channel.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/commandparser.cpp b/Engine/Processing/commandparser.cpp index 47cc176..2c70627 100644 --- a/Engine/Processing/commandparser.cpp +++ b/Engine/Processing/commandparser.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/commandparser.h b/Engine/Processing/commandparser.h index 47f57f6..ca08aca 100644 --- a/Engine/Processing/commandparser.h +++ b/Engine/Processing/commandparser.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/controllerinterface.cpp b/Engine/Processing/controllerinterface.cpp index fc830c2..8ea5210 100644 --- a/Engine/Processing/controllerinterface.cpp +++ b/Engine/Processing/controllerinterface.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -296,7 +296,8 @@ int ControllerInterface::scanPorts(vector &chipType, vector &port state->manualFastSettleEnabled->getValue(), state->usePreviousDelay->getValue(), state->previousDelaySelectedPort->getValue(), - state->lastDetectedChip->getValue()); + state->lastDetectedChip->getValue(), + state->lastDetectedNumStreams->getValue()); for (uint i = 0; i < chipType.size(); i++) { if (chipType[i] != NoChip) { @@ -322,6 +323,7 @@ int ControllerInterface::scanPorts(vector &chipType, vector &port for (int i = 0; i < (int) portIndex.size(); ++i) { if (portIndex[i] != -1) ++numDataStreams; } + state->lastDetectedNumStreams->setValue(numDataStreams); // Turn on appropriate LEDs for Ports A-H. int ledArray[8] = {0, 0, 0, 0, 0, 0, 0, 0}; diff --git a/Engine/Processing/controllerinterface.h b/Engine/Processing/controllerinterface.h index b5c38d6..a90ef52 100644 --- a/Engine/Processing/controllerinterface.h +++ b/Engine/Processing/controllerinterface.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/datastreamfifo.cpp b/Engine/Processing/datastreamfifo.cpp index d97e424..94ceb81 100644 --- a/Engine/Processing/datastreamfifo.cpp +++ b/Engine/Processing/datastreamfifo.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/datastreamfifo.h b/Engine/Processing/datastreamfifo.h index e0ffb77..d045b22 100644 --- a/Engine/Processing/datastreamfifo.h +++ b/Engine/Processing/datastreamfifo.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/displayundomanager.cpp b/Engine/Processing/displayundomanager.cpp index bc0031a..6727457 100644 --- a/Engine/Processing/displayundomanager.cpp +++ b/Engine/Processing/displayundomanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/displayundomanager.h b/Engine/Processing/displayundomanager.h index 17d55b9..88aabb4 100644 --- a/Engine/Processing/displayundomanager.h +++ b/Engine/Processing/displayundomanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/fastfouriertransform.cpp b/Engine/Processing/fastfouriertransform.cpp index 63c2920..90fd7d7 100644 --- a/Engine/Processing/fastfouriertransform.cpp +++ b/Engine/Processing/fastfouriertransform.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/fastfouriertransform.h b/Engine/Processing/fastfouriertransform.h index a1c5f92..cd6971d 100644 --- a/Engine/Processing/fastfouriertransform.h +++ b/Engine/Processing/fastfouriertransform.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/filter.cpp b/Engine/Processing/filter.cpp index 2db8d88..d59494a 100644 --- a/Engine/Processing/filter.cpp +++ b/Engine/Processing/filter.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/filter.h b/Engine/Processing/filter.h index fada7a2..96aa702 100644 --- a/Engine/Processing/filter.h +++ b/Engine/Processing/filter.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/impedancereader.cpp b/Engine/Processing/impedancereader.cpp index 56312f9..44d7abd 100644 --- a/Engine/Processing/impedancereader.cpp +++ b/Engine/Processing/impedancereader.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/impedancereader.h b/Engine/Processing/impedancereader.h index 37f2941..2a98b2f 100644 --- a/Engine/Processing/impedancereader.h +++ b/Engine/Processing/impedancereader.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/matfilewriter.cpp b/Engine/Processing/matfilewriter.cpp index d1cea41..0842a97 100644 --- a/Engine/Processing/matfilewriter.cpp +++ b/Engine/Processing/matfilewriter.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/matfilewriter.h b/Engine/Processing/matfilewriter.h index c5b3d55..eb27000 100644 --- a/Engine/Processing/matfilewriter.h +++ b/Engine/Processing/matfilewriter.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/minmax.h b/Engine/Processing/minmax.h index 295c13c..1cc0aed 100644 --- a/Engine/Processing/minmax.h +++ b/Engine/Processing/minmax.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/probemapdatastructures.h b/Engine/Processing/probemapdatastructures.h index 50b837b..6d7b50e 100644 --- a/Engine/Processing/probemapdatastructures.h +++ b/Engine/Processing/probemapdatastructures.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/rhxdatareader.cpp b/Engine/Processing/rhxdatareader.cpp index 10ef59d..41fd63b 100644 --- a/Engine/Processing/rhxdatareader.cpp +++ b/Engine/Processing/rhxdatareader.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/rhxdatareader.h b/Engine/Processing/rhxdatareader.h index d8010ef..4c60151 100644 --- a/Engine/Processing/rhxdatareader.h +++ b/Engine/Processing/rhxdatareader.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/semaphore.h b/Engine/Processing/semaphore.h index 1375999..9f7c2ce 100644 --- a/Engine/Processing/semaphore.h +++ b/Engine/Processing/semaphore.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/signalsources.cpp b/Engine/Processing/signalsources.cpp index e2291d2..c95c2a8 100644 --- a/Engine/Processing/signalsources.cpp +++ b/Engine/Processing/signalsources.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/signalsources.h b/Engine/Processing/signalsources.h index b05fdfa..11d68a5 100644 --- a/Engine/Processing/signalsources.h +++ b/Engine/Processing/signalsources.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/softwarereferenceprocessor.cpp b/Engine/Processing/softwarereferenceprocessor.cpp index 0188946..cc2b2a6 100644 --- a/Engine/Processing/softwarereferenceprocessor.cpp +++ b/Engine/Processing/softwarereferenceprocessor.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/softwarereferenceprocessor.h b/Engine/Processing/softwarereferenceprocessor.h index 3b1c282..4861c4b 100644 --- a/Engine/Processing/softwarereferenceprocessor.h +++ b/Engine/Processing/softwarereferenceprocessor.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/stateitem.cpp b/Engine/Processing/stateitem.cpp index 05a136d..fee6fce 100644 --- a/Engine/Processing/stateitem.cpp +++ b/Engine/Processing/stateitem.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/stateitem.h b/Engine/Processing/stateitem.h index 63a0a5b..013d77a 100644 --- a/Engine/Processing/stateitem.h +++ b/Engine/Processing/stateitem.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/stimparameters.cpp b/Engine/Processing/stimparameters.cpp index a622ae1..bfe8086 100644 --- a/Engine/Processing/stimparameters.cpp +++ b/Engine/Processing/stimparameters.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/stimparameters.h b/Engine/Processing/stimparameters.h index 62e13e3..e0ee244 100644 --- a/Engine/Processing/stimparameters.h +++ b/Engine/Processing/stimparameters.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/stimparametersclipboard.cpp b/Engine/Processing/stimparametersclipboard.cpp index 46e4c1e..f6ce966 100644 --- a/Engine/Processing/stimparametersclipboard.cpp +++ b/Engine/Processing/stimparametersclipboard.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/stimparametersclipboard.h b/Engine/Processing/stimparametersclipboard.h index 6caa65c..ddbdf2b 100644 --- a/Engine/Processing/stimparametersclipboard.h +++ b/Engine/Processing/stimparametersclipboard.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/systemstate.cpp b/Engine/Processing/systemstate.cpp index a5aa9b1..8e0f296 100644 --- a/Engine/Processing/systemstate.cpp +++ b/Engine/Processing/systemstate.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -793,6 +793,10 @@ SystemState::SystemState(const AbstractRHXController* controller_, StimStepSize usePreviousDelay = new BooleanItem("UsePreviousDelay", globalItems, this, false, XMLGroupNone); previousDelaySelectedPort = new IntRangeItem("PreviousDelaySelectedPort", globalItems, this, 0, 7, 0, XMLGroupNone); lastDetectedChip = new IntRangeItem("LastDetectedChip", globalItems, this, -1, 1000, -1, XMLGroupNone); + lastDetectedNumStreams = new IntRangeItem("LastDetectedNumStreams", globalItems, this, -1, 1000, -1, XMLGroupNone); + + testAuxIns = new BooleanItem("TestAuxIns", globalItems, this, getControllerTypeEnum() != ControllerStimRecord, XMLGroupNone); + testingPort = new StringItem("TestingPort", globalItems, this, "A", XMLGroupNone); // Start timer timerId = startTimer(20); // Minimum time between two stateChanged() signals, in milliseconds. diff --git a/Engine/Processing/systemstate.h b/Engine/Processing/systemstate.h index 2672158..13835e8 100644 --- a/Engine/Processing/systemstate.h +++ b/Engine/Processing/systemstate.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -377,9 +377,13 @@ class SystemState : public QObject SingleItemList globalItems; FilenameItemList stateFilenameItems; + // Chip Testing BooleanItem *usePreviousDelay; IntRangeItem *previousDelaySelectedPort; IntRangeItem *lastDetectedChip; + IntRangeItem *lastDetectedNumStreams; + BooleanItem *testAuxIns; + StringItem *testingPort; int64_t getPlaybackBlocks(); void setLastTimestamp(int timestamp) { lastTimestamp = timestamp; } diff --git a/Engine/Processing/tcpcommunicator.cpp b/Engine/Processing/tcpcommunicator.cpp index fc2429b..e5f83e5 100644 --- a/Engine/Processing/tcpcommunicator.cpp +++ b/Engine/Processing/tcpcommunicator.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/tcpcommunicator.h b/Engine/Processing/tcpcommunicator.h index b4ebf47..afc01e8 100644 --- a/Engine/Processing/tcpcommunicator.h +++ b/Engine/Processing/tcpcommunicator.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/waveformfifo.cpp b/Engine/Processing/waveformfifo.cpp index 2946ea5..478d6cc 100644 --- a/Engine/Processing/waveformfifo.cpp +++ b/Engine/Processing/waveformfifo.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/waveformfifo.h b/Engine/Processing/waveformfifo.h index d2c836b..5111fa8 100644 --- a/Engine/Processing/waveformfifo.h +++ b/Engine/Processing/waveformfifo.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Processing/xmlinterface.cpp b/Engine/Processing/xmlinterface.cpp index 4613257..2fff4b3 100644 --- a/Engine/Processing/xmlinterface.cpp +++ b/Engine/Processing/xmlinterface.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -121,6 +121,7 @@ bool XMLInterface::parseByteArray(const QByteArray &byteArray, QString &errorMes state->releaseUpdate(); return false; } + parseSignalGroupsAttributes(byteArray, errorMessage); } if (state->getControllerTypeEnum() == ControllerStimRecord && !ignoreStimParameters && (includeParameters == XMLIncludeGlobalParameters || includeParameters == XMLIncludeStimParameters)) { @@ -879,6 +880,73 @@ bool XMLInterface::parseSignalGroups(const QByteArray &byteArray, QString &error return true; } +void XMLInterface::parseSignalGroupsAttributes(const QByteArray &byteArray, QString &errorMessage) const +{ + QXmlStreamReader stream(byteArray); + while (!stream.atEnd()) { + while (stream.name() != "SignalGroup") { + QXmlStreamReader::TokenType token = stream.readNext(); + if (token == QXmlStreamReader::EndDocument) { + return; + } + } + + QXmlStreamAttributes attributes = stream.attributes(); + QString portName(""); + for (auto attribute : attributes) { + if (attribute.name().toString().toLower() == "prefix") { + portName = "Port " + attribute.value().toString(); + break; + } + } + + SignalGroup* thisSignalGroup = state->signalSources->groupByName(portName); + if (!thisSignalGroup) { + stream.skipCurrentElement(); + continue; + } + + for (auto attribute : attributes) { + QString attributeName = attribute.name().toString(); + QString attributeValue = attribute.value().toString(); + + if (attributeValue != "N/A") { + StateSingleItem *singleItem = state->locateStateSingleItem(thisSignalGroup->portItems, attributeName); + + // If the attribute is a StateSingleItem, set it according to XMLIncludeParameters. + if (singleItem) { + bool changeItem = false; + XMLGroup xmlGroup = singleItem->getXMLGroup(); + + switch (includeParameters) { + case XMLIncludeSpikeSortingParameters: + if (xmlGroup == XMLGroupSpikeSettings) changeItem = true; + break; + case XMLIncludeGlobalParameters: + if (xmlGroup == XMLGroupSpikeSettings || xmlGroup == XMLGroupGeneral) changeItem = true; + break; + case XMLIncludeStimParameters: + case XMLIncludeProbeMapSettings: + cerr << "XMLIncludeStimParameters or XMLIncludeProbeMapSettings somehow reached within SignalGroup element"; + return; + } + + if (changeItem) { + if (!singleItem->setValue(attributeValue)) { + errorMessage.append("Error: Failed to parse " + singleItem->getParameterName()); + return; + } else { + continue; + } + } + } + } + } + stream.skipCurrentElement(); + stream.readNextStartElement(); + } +} + bool XMLInterface::parseStimParameters(const QByteArray &byteArray, QString &errorMessage) const { QXmlStreamReader stream(byteArray); diff --git a/Engine/Processing/xmlinterface.h b/Engine/Processing/xmlinterface.h index d5212b6..717d930 100644 --- a/Engine/Processing/xmlinterface.h +++ b/Engine/Processing/xmlinterface.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -70,6 +70,7 @@ class XMLInterface bool checkConsistentChannels(const QByteArray &byteArray, QString &errorMessage) const; bool parseGeneralConfig(const QByteArray &byteArray, QString &errorMessage) const; bool parseSignalGroups(const QByteArray &byteArray, QString &errorMessage) const; + void parseSignalGroupsAttributes(const QByteArray &byteArray, QString &errorMessage) const; bool parseStimParameters(const QByteArray &byteArray, QString &errorMessage) const; vector findUninitializedChannels(vector allChannels, vector channelInitializedFromXML) const; diff --git a/Engine/Threads/audiothread.cpp b/Engine/Threads/audiothread.cpp index fdb8099..78b7402 100644 --- a/Engine/Threads/audiothread.cpp +++ b/Engine/Threads/audiothread.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Threads/audiothread.h b/Engine/Threads/audiothread.h index 948833a..900db5b 100644 --- a/Engine/Threads/audiothread.h +++ b/Engine/Threads/audiothread.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Threads/savetodiskthread.cpp b/Engine/Threads/savetodiskthread.cpp index 30b1d4b..889d7bd 100644 --- a/Engine/Threads/savetodiskthread.cpp +++ b/Engine/Threads/savetodiskthread.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Threads/savetodiskthread.h b/Engine/Threads/savetodiskthread.h index d71a91e..54e0e72 100644 --- a/Engine/Threads/savetodiskthread.h +++ b/Engine/Threads/savetodiskthread.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Threads/tcpdataoutputthread.cpp b/Engine/Threads/tcpdataoutputthread.cpp index 89062e2..a33f99a 100644 --- a/Engine/Threads/tcpdataoutputthread.cpp +++ b/Engine/Threads/tcpdataoutputthread.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Threads/tcpdataoutputthread.h b/Engine/Threads/tcpdataoutputthread.h index 3e4f725..d251421 100644 --- a/Engine/Threads/tcpdataoutputthread.h +++ b/Engine/Threads/tcpdataoutputthread.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Threads/usbdatathread.cpp b/Engine/Threads/usbdatathread.cpp index c162e83..7d100db 100644 --- a/Engine/Threads/usbdatathread.cpp +++ b/Engine/Threads/usbdatathread.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Threads/usbdatathread.h b/Engine/Threads/usbdatathread.h index 2263354..f91a2cb 100644 --- a/Engine/Threads/usbdatathread.h +++ b/Engine/Threads/usbdatathread.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Threads/waveformprocessorthread.cpp b/Engine/Threads/waveformprocessorthread.cpp index 495840f..3941a95 100644 --- a/Engine/Threads/waveformprocessorthread.cpp +++ b/Engine/Threads/waveformprocessorthread.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/Engine/Threads/waveformprocessorthread.h b/Engine/Threads/waveformprocessorthread.h index 16ae5e2..e3aa090 100644 --- a/Engine/Threads/waveformprocessorthread.h +++ b/Engine/Threads/waveformprocessorthread.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/advancedstartupdialog.cpp b/GUI/Dialogs/advancedstartupdialog.cpp index 571ae7a..c1c27bd 100644 --- a/GUI/Dialogs/advancedstartupdialog.cpp +++ b/GUI/Dialogs/advancedstartupdialog.cpp @@ -76,7 +76,7 @@ AdvancedStartupDialog::AdvancedStartupDialog(bool &useOpenCL_, uint8_t &playback synthMaxChannelsCheckBox = new QCheckBox(tr("Maximum Number of Channels in Demonstration Mode"), this); testModeDescription = new QLabel(tr("When running in chip test mode, replace typical recording functionality with\n" - "automated testing."), this); + "automated testing.\n\nFor internal factory use only. Headstage users should not use this mode."), this); testModeCheckBox = new QCheckBox(tr("Chip Test Mode")); diff --git a/GUI/Dialogs/ampsettledialog.cpp b/GUI/Dialogs/ampsettledialog.cpp index fe87810..6876ca2 100644 --- a/GUI/Dialogs/ampsettledialog.cpp +++ b/GUI/Dialogs/ampsettledialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/ampsettledialog.h b/GUI/Dialogs/ampsettledialog.h index a3c2f36..7fa34df 100644 --- a/GUI/Dialogs/ampsettledialog.h +++ b/GUI/Dialogs/ampsettledialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/analogoutconfigdialog.cpp b/GUI/Dialogs/analogoutconfigdialog.cpp index 39cf86a..2d5dbbe 100644 --- a/GUI/Dialogs/analogoutconfigdialog.cpp +++ b/GUI/Dialogs/analogoutconfigdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/analogoutconfigdialog.h b/GUI/Dialogs/analogoutconfigdialog.h index ccae106..fb1cc99 100644 --- a/GUI/Dialogs/analogoutconfigdialog.h +++ b/GUI/Dialogs/analogoutconfigdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/anoutdialog.cpp b/GUI/Dialogs/anoutdialog.cpp index 9f6ea9d..15ab5b3 100644 --- a/GUI/Dialogs/anoutdialog.cpp +++ b/GUI/Dialogs/anoutdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/anoutdialog.h b/GUI/Dialogs/anoutdialog.h index 1a38212..669e513 100644 --- a/GUI/Dialogs/anoutdialog.h +++ b/GUI/Dialogs/anoutdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/autocolordialog.cpp b/GUI/Dialogs/autocolordialog.cpp index e25e453..74f6cea 100644 --- a/GUI/Dialogs/autocolordialog.cpp +++ b/GUI/Dialogs/autocolordialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/autocolordialog.h b/GUI/Dialogs/autocolordialog.h index bb9575e..5e7a058 100644 --- a/GUI/Dialogs/autocolordialog.h +++ b/GUI/Dialogs/autocolordialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/autogroupdialog.cpp b/GUI/Dialogs/autogroupdialog.cpp index 6a399f1..8cd0142 100644 --- a/GUI/Dialogs/autogroupdialog.cpp +++ b/GUI/Dialogs/autogroupdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/autogroupdialog.h b/GUI/Dialogs/autogroupdialog.h index a34a6c6..3df20d2 100644 --- a/GUI/Dialogs/autogroupdialog.h +++ b/GUI/Dialogs/autogroupdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/auxdigoutconfigdialog.cpp b/GUI/Dialogs/auxdigoutconfigdialog.cpp index c24b695..2377dea 100644 --- a/GUI/Dialogs/auxdigoutconfigdialog.cpp +++ b/GUI/Dialogs/auxdigoutconfigdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/auxdigoutconfigdialog.h b/GUI/Dialogs/auxdigoutconfigdialog.h index c56f9ad..f1fbea1 100644 --- a/GUI/Dialogs/auxdigoutconfigdialog.h +++ b/GUI/Dialogs/auxdigoutconfigdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/bandwidthdialog.cpp b/GUI/Dialogs/bandwidthdialog.cpp index 5a8b9ce..956cb13 100644 --- a/GUI/Dialogs/bandwidthdialog.cpp +++ b/GUI/Dialogs/bandwidthdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/bandwidthdialog.h b/GUI/Dialogs/bandwidthdialog.h index 498631d..906c74a 100644 --- a/GUI/Dialogs/bandwidthdialog.h +++ b/GUI/Dialogs/bandwidthdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/boardselectdialog.cpp b/GUI/Dialogs/boardselectdialog.cpp index 4b4bd19..5c79f3f 100644 --- a/GUI/Dialogs/boardselectdialog.cpp +++ b/GUI/Dialogs/boardselectdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/boardselectdialog.h b/GUI/Dialogs/boardselectdialog.h index 41b9867..c000829 100644 --- a/GUI/Dialogs/boardselectdialog.h +++ b/GUI/Dialogs/boardselectdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/cabledelaydialog.cpp b/GUI/Dialogs/cabledelaydialog.cpp index f83f942..b9665b2 100644 --- a/GUI/Dialogs/cabledelaydialog.cpp +++ b/GUI/Dialogs/cabledelaydialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/cabledelaydialog.h b/GUI/Dialogs/cabledelaydialog.h index d562b66..c4689f1 100644 --- a/GUI/Dialogs/cabledelaydialog.h +++ b/GUI/Dialogs/cabledelaydialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/chargerecoverydialog.cpp b/GUI/Dialogs/chargerecoverydialog.cpp index 954d84c..29e2843 100644 --- a/GUI/Dialogs/chargerecoverydialog.cpp +++ b/GUI/Dialogs/chargerecoverydialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/chargerecoverydialog.h b/GUI/Dialogs/chargerecoverydialog.h index cc02750..fbe9cee 100644 --- a/GUI/Dialogs/chargerecoverydialog.h +++ b/GUI/Dialogs/chargerecoverydialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/demodialog.cpp b/GUI/Dialogs/demodialog.cpp index 6f12430..f0bc448 100644 --- a/GUI/Dialogs/demodialog.cpp +++ b/GUI/Dialogs/demodialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/demodialog.h b/GUI/Dialogs/demodialog.h index de6ad06..d350019 100644 --- a/GUI/Dialogs/demodialog.h +++ b/GUI/Dialogs/demodialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/digoutdialog.cpp b/GUI/Dialogs/digoutdialog.cpp index cf8e7c2..6d866ca 100644 --- a/GUI/Dialogs/digoutdialog.cpp +++ b/GUI/Dialogs/digoutdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/digoutdialog.h b/GUI/Dialogs/digoutdialog.h index 1e04b57..7782e08 100644 --- a/GUI/Dialogs/digoutdialog.h +++ b/GUI/Dialogs/digoutdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/impedancefreqdialog.cpp b/GUI/Dialogs/impedancefreqdialog.cpp index d3381d4..9eafeaa 100644 --- a/GUI/Dialogs/impedancefreqdialog.cpp +++ b/GUI/Dialogs/impedancefreqdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/impedancefreqdialog.h b/GUI/Dialogs/impedancefreqdialog.h index 0ff5710..9495a88 100644 --- a/GUI/Dialogs/impedancefreqdialog.h +++ b/GUI/Dialogs/impedancefreqdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/isidialog.cpp b/GUI/Dialogs/isidialog.cpp index 4abb95c..4137adb 100644 --- a/GUI/Dialogs/isidialog.cpp +++ b/GUI/Dialogs/isidialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/isidialog.h b/GUI/Dialogs/isidialog.h index d021611..c230966 100644 --- a/GUI/Dialogs/isidialog.h +++ b/GUI/Dialogs/isidialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/keyboardshortcutdialog.cpp b/GUI/Dialogs/keyboardshortcutdialog.cpp index faa7457..d68fc19 100644 --- a/GUI/Dialogs/keyboardshortcutdialog.cpp +++ b/GUI/Dialogs/keyboardshortcutdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/keyboardshortcutdialog.h b/GUI/Dialogs/keyboardshortcutdialog.h index e231f7f..331eb01 100644 --- a/GUI/Dialogs/keyboardshortcutdialog.h +++ b/GUI/Dialogs/keyboardshortcutdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/performanceoptimizationdialog.cpp b/GUI/Dialogs/performanceoptimizationdialog.cpp index 49fddf5..d1cf9fc 100644 --- a/GUI/Dialogs/performanceoptimizationdialog.cpp +++ b/GUI/Dialogs/performanceoptimizationdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/performanceoptimizationdialog.h b/GUI/Dialogs/performanceoptimizationdialog.h index bfd8b18..d1c95df 100644 --- a/GUI/Dialogs/performanceoptimizationdialog.h +++ b/GUI/Dialogs/performanceoptimizationdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/playbackfilepositiondialog.cpp b/GUI/Dialogs/playbackfilepositiondialog.cpp index 48c33a7..3beea31 100644 --- a/GUI/Dialogs/playbackfilepositiondialog.cpp +++ b/GUI/Dialogs/playbackfilepositiondialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/playbackfilepositiondialog.h b/GUI/Dialogs/playbackfilepositiondialog.h index 3fc8008..38a2839 100644 --- a/GUI/Dialogs/playbackfilepositiondialog.h +++ b/GUI/Dialogs/playbackfilepositiondialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/psthdialog.cpp b/GUI/Dialogs/psthdialog.cpp index b597334..39aab94 100644 --- a/GUI/Dialogs/psthdialog.cpp +++ b/GUI/Dialogs/psthdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/psthdialog.h b/GUI/Dialogs/psthdialog.h index 42f47ee..430dbf9 100644 --- a/GUI/Dialogs/psthdialog.h +++ b/GUI/Dialogs/psthdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/referenceselectdialog.cpp b/GUI/Dialogs/referenceselectdialog.cpp index 2662e4a..d3aef92 100644 --- a/GUI/Dialogs/referenceselectdialog.cpp +++ b/GUI/Dialogs/referenceselectdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/referenceselectdialog.h b/GUI/Dialogs/referenceselectdialog.h index e19d64f..f836ffd 100644 --- a/GUI/Dialogs/referenceselectdialog.h +++ b/GUI/Dialogs/referenceselectdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/renamechanneldialog.cpp b/GUI/Dialogs/renamechanneldialog.cpp index 04254a8..9c8fd42 100644 --- a/GUI/Dialogs/renamechanneldialog.cpp +++ b/GUI/Dialogs/renamechanneldialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/renamechanneldialog.h b/GUI/Dialogs/renamechanneldialog.h index f3a0e87..9b96d72 100644 --- a/GUI/Dialogs/renamechanneldialog.h +++ b/GUI/Dialogs/renamechanneldialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/setfileformatdialog.cpp b/GUI/Dialogs/setfileformatdialog.cpp index 3d8e287..95971d0 100644 --- a/GUI/Dialogs/setfileformatdialog.cpp +++ b/GUI/Dialogs/setfileformatdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/setfileformatdialog.h b/GUI/Dialogs/setfileformatdialog.h index b5a7e19..3548e39 100644 --- a/GUI/Dialogs/setfileformatdialog.h +++ b/GUI/Dialogs/setfileformatdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/setthresholdsdialog.cpp b/GUI/Dialogs/setthresholdsdialog.cpp index 3dec931..68020bb 100644 --- a/GUI/Dialogs/setthresholdsdialog.cpp +++ b/GUI/Dialogs/setthresholdsdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/setthresholdsdialog.h b/GUI/Dialogs/setthresholdsdialog.h index 3a45510..47dd719 100644 --- a/GUI/Dialogs/setthresholdsdialog.h +++ b/GUI/Dialogs/setthresholdsdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/spectrogramdialog.cpp b/GUI/Dialogs/spectrogramdialog.cpp index c87ae7f..0463a4a 100644 --- a/GUI/Dialogs/spectrogramdialog.cpp +++ b/GUI/Dialogs/spectrogramdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/spectrogramdialog.h b/GUI/Dialogs/spectrogramdialog.h index 317464b..38b39ab 100644 --- a/GUI/Dialogs/spectrogramdialog.h +++ b/GUI/Dialogs/spectrogramdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/spikesortingdialog.cpp b/GUI/Dialogs/spikesortingdialog.cpp index 88ad0ba..6b5b5b9 100644 --- a/GUI/Dialogs/spikesortingdialog.cpp +++ b/GUI/Dialogs/spikesortingdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/spikesortingdialog.h b/GUI/Dialogs/spikesortingdialog.h index d8b5ffe..11202c7 100644 --- a/GUI/Dialogs/spikesortingdialog.h +++ b/GUI/Dialogs/spikesortingdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/startupdialog.cpp b/GUI/Dialogs/startupdialog.cpp index 89c7117..190a555 100644 --- a/GUI/Dialogs/startupdialog.cpp +++ b/GUI/Dialogs/startupdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/startupdialog.h b/GUI/Dialogs/startupdialog.h index bc8430d..e997de5 100644 --- a/GUI/Dialogs/startupdialog.h +++ b/GUI/Dialogs/startupdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/stimparamdialog.cpp b/GUI/Dialogs/stimparamdialog.cpp index 0c124e8..8272c06 100644 --- a/GUI/Dialogs/stimparamdialog.cpp +++ b/GUI/Dialogs/stimparamdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/stimparamdialog.h b/GUI/Dialogs/stimparamdialog.h index 167b0f3..2678819 100644 --- a/GUI/Dialogs/stimparamdialog.h +++ b/GUI/Dialogs/stimparamdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/triggerrecorddialog.cpp b/GUI/Dialogs/triggerrecorddialog.cpp index 3a6f7c6..b6f4a10 100644 --- a/GUI/Dialogs/triggerrecorddialog.cpp +++ b/GUI/Dialogs/triggerrecorddialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/triggerrecorddialog.h b/GUI/Dialogs/triggerrecorddialog.h index 04c18d7..3e60086 100644 --- a/GUI/Dialogs/triggerrecorddialog.h +++ b/GUI/Dialogs/triggerrecorddialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/waveformselectdialog.cpp b/GUI/Dialogs/waveformselectdialog.cpp index 46e1a9c..906ce55 100644 --- a/GUI/Dialogs/waveformselectdialog.cpp +++ b/GUI/Dialogs/waveformselectdialog.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Dialogs/waveformselectdialog.h b/GUI/Dialogs/waveformselectdialog.h index b1706d5..9f89982 100644 --- a/GUI/Dialogs/waveformselectdialog.h +++ b/GUI/Dialogs/waveformselectdialog.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/abstractfigure.cpp b/GUI/Widgets/abstractfigure.cpp index f8f4415..78313d7 100644 --- a/GUI/Widgets/abstractfigure.cpp +++ b/GUI/Widgets/abstractfigure.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/abstractfigure.h b/GUI/Widgets/abstractfigure.h index f001800..2322d68 100644 --- a/GUI/Widgets/abstractfigure.h +++ b/GUI/Widgets/abstractfigure.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/anoutfigure.cpp b/GUI/Widgets/anoutfigure.cpp index 3fd76a1..16bf223 100644 --- a/GUI/Widgets/anoutfigure.cpp +++ b/GUI/Widgets/anoutfigure.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/anoutfigure.h b/GUI/Widgets/anoutfigure.h index 16764ae..c2e4838 100644 --- a/GUI/Widgets/anoutfigure.h +++ b/GUI/Widgets/anoutfigure.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/controlpanel.cpp b/GUI/Widgets/controlpanel.cpp index 6dcccd8..8969c58 100644 --- a/GUI/Widgets/controlpanel.cpp +++ b/GUI/Widgets/controlpanel.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/controlpanel.h b/GUI/Widgets/controlpanel.h index 95bdf77..0fd39de 100644 --- a/GUI/Widgets/controlpanel.h +++ b/GUI/Widgets/controlpanel.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/controlpanelaudioanalogtab.cpp b/GUI/Widgets/controlpanelaudioanalogtab.cpp index 19eeef9..c2794e1 100644 --- a/GUI/Widgets/controlpanelaudioanalogtab.cpp +++ b/GUI/Widgets/controlpanelaudioanalogtab.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/controlpanelaudioanalogtab.h b/GUI/Widgets/controlpanelaudioanalogtab.h index ab6918d..29d81b7 100644 --- a/GUI/Widgets/controlpanelaudioanalogtab.h +++ b/GUI/Widgets/controlpanelaudioanalogtab.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/controlpanelbandwidthtab.cpp b/GUI/Widgets/controlpanelbandwidthtab.cpp index 7875b6f..e6fafa4 100644 --- a/GUI/Widgets/controlpanelbandwidthtab.cpp +++ b/GUI/Widgets/controlpanelbandwidthtab.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/controlpanelbandwidthtab.h b/GUI/Widgets/controlpanelbandwidthtab.h index d656756..d28ccdd 100644 --- a/GUI/Widgets/controlpanelbandwidthtab.h +++ b/GUI/Widgets/controlpanelbandwidthtab.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/controlpanelconfiguretab.cpp b/GUI/Widgets/controlpanelconfiguretab.cpp index 7522cab..2dbc8dc 100644 --- a/GUI/Widgets/controlpanelconfiguretab.cpp +++ b/GUI/Widgets/controlpanelconfiguretab.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -63,6 +63,8 @@ ControlPanelConfigureTab::ControlPanelConfigureTab(ControllerInterface* controll } manualDelayEnabledOld.resize(8, false); manualDelayOld.resize(8, 1); + auxDigOutEnabledOld.resize(8, false); + auxDigOutChannelOld.resize(8, 0); QVBoxLayout *configLayout = new QVBoxLayout; scanButton = new QPushButton(tr("Rescan Ports"), this); @@ -250,6 +252,41 @@ void ControlPanelConfigureTab::updateFromState() controllerInterface->setManualCableDelays(); } + bool digOutChanged = false; + for (int port = 0; port < (int) spiPort.size(); ++port) { + if (auxDigOutEnabledOld[port] != spiPort[port]->auxDigOutEnabled->getValue()) { + auxDigOutEnabledOld[port] = spiPort[port]->auxDigOutEnabled->getValue(); + digOutChanged = true; + } + if (auxDigOutChannelOld[port] != spiPort[port]->auxDigOutChannel->getValue()) { + auxDigOutChannelOld[port] = spiPort[port]->auxDigOutChannel->getValue(); + digOutChanged = true; + } + } + if (digOutChanged) { + controllerInterface->enableExternalDigOut(PortA, spiPort[0]->auxDigOutEnabled->getValue()); + controllerInterface->enableExternalDigOut(PortB, spiPort[1]->auxDigOutEnabled->getValue()); + controllerInterface->enableExternalDigOut(PortC, spiPort[2]->auxDigOutEnabled->getValue()); + controllerInterface->enableExternalDigOut(PortD, spiPort[3]->auxDigOutEnabled->getValue()); + if (state->numSPIPorts == 8) { + controllerInterface->enableExternalDigOut(PortE, spiPort[4]->auxDigOutEnabled->getValue()); + controllerInterface->enableExternalDigOut(PortF, spiPort[5]->auxDigOutEnabled->getValue()); + controllerInterface->enableExternalDigOut(PortG, spiPort[6]->auxDigOutEnabled->getValue()); + controllerInterface->enableExternalDigOut(PortH, spiPort[7]->auxDigOutEnabled->getValue()); + } + + controllerInterface->setExternalDigOutChannel(PortA, spiPort[0]->auxDigOutChannel->getValue()); + controllerInterface->setExternalDigOutChannel(PortB, spiPort[1]->auxDigOutChannel->getValue()); + controllerInterface->setExternalDigOutChannel(PortC, spiPort[2]->auxDigOutChannel->getValue()); + controllerInterface->setExternalDigOutChannel(PortD, spiPort[3]->auxDigOutChannel->getValue()); + if (state->numSPIPorts == 8) { + controllerInterface->setExternalDigOutChannel(PortE, spiPort[4]->auxDigOutChannel->getValue()); + controllerInterface->setExternalDigOutChannel(PortF, spiPort[5]->auxDigOutChannel->getValue()); + controllerInterface->setExternalDigOutChannel(PortG, spiPort[6]->auxDigOutChannel->getValue()); + controllerInterface->setExternalDigOutChannel(PortH, spiPort[7]->auxDigOutChannel->getValue()); + } + } + if (!state->testMode->getValue()) { if (state->recording) { liveNotesLineEdit->setEnabled(true); diff --git a/GUI/Widgets/controlpanelconfiguretab.h b/GUI/Widgets/controlpanelconfiguretab.h index d7e5855..f37f3eb 100644 --- a/GUI/Widgets/controlpanelconfiguretab.h +++ b/GUI/Widgets/controlpanelconfiguretab.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -91,6 +91,8 @@ private slots: vector spiPort; vector manualDelayEnabledOld; vector manualDelayOld; + vector auxDigOutEnabledOld; + vector auxDigOutChannelOld; bool fastSettleEnabledOld; bool externalFastSettleEnabledOld; int externalFastSettleChannelOld; diff --git a/GUI/Widgets/controlpanelimpedancetab.cpp b/GUI/Widgets/controlpanelimpedancetab.cpp index b0ba473..210b9a4 100644 --- a/GUI/Widgets/controlpanelimpedancetab.cpp +++ b/GUI/Widgets/controlpanelimpedancetab.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/controlpanelimpedancetab.h b/GUI/Widgets/controlpanelimpedancetab.h index cb67114..d307370 100644 --- a/GUI/Widgets/controlpanelimpedancetab.h +++ b/GUI/Widgets/controlpanelimpedancetab.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/controlpaneltriggertab.cpp b/GUI/Widgets/controlpaneltriggertab.cpp index 2229fd3..e9f7d52 100644 --- a/GUI/Widgets/controlpaneltriggertab.cpp +++ b/GUI/Widgets/controlpaneltriggertab.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/controlpaneltriggertab.h b/GUI/Widgets/controlpaneltriggertab.h index 13e397a..593add5 100644 --- a/GUI/Widgets/controlpaneltriggertab.h +++ b/GUI/Widgets/controlpaneltriggertab.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/digfigure.cpp b/GUI/Widgets/digfigure.cpp index c77b717..19202cd 100644 --- a/GUI/Widgets/digfigure.cpp +++ b/GUI/Widgets/digfigure.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/digfigure.h b/GUI/Widgets/digfigure.h index 9dd5a24..7e9940d 100644 --- a/GUI/Widgets/digfigure.h +++ b/GUI/Widgets/digfigure.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/displayedwaveform.cpp b/GUI/Widgets/displayedwaveform.cpp index d26a7c1..94bc96e 100644 --- a/GUI/Widgets/displayedwaveform.cpp +++ b/GUI/Widgets/displayedwaveform.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/displayedwaveform.h b/GUI/Widgets/displayedwaveform.h index 3663cb5..bcaa740 100644 --- a/GUI/Widgets/displayedwaveform.h +++ b/GUI/Widgets/displayedwaveform.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/displaylistmanager.cpp b/GUI/Widgets/displaylistmanager.cpp index 1689743..cd73b21 100644 --- a/GUI/Widgets/displaylistmanager.cpp +++ b/GUI/Widgets/displaylistmanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -294,7 +294,13 @@ int DisplayListManager::findSelectedWaveform(const QList& lis int length = list.size(); for (int i = 0; i < length; ++i) { - if (y >= list[i].yTop && y <= list[i].yBottom) return i; + if (y >= list[i].yTop && y <= list[i].yBottom) { + if (list[i].waveformType == WaveformDivider || list[i].waveformType == UnknownWaveform) { + // Return with no waveform found if WaveformDivider or UnknownWaveform cases apply. + return -1; + } + return i; + } } if (y < list[0].yTop) return -1; if (y > list[length - 1].yBottom) return -(length + 1); diff --git a/GUI/Widgets/displaylistmanager.h b/GUI/Widgets/displaylistmanager.h index edca0d5..8c68455 100644 --- a/GUI/Widgets/displaylistmanager.h +++ b/GUI/Widgets/displaylistmanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/filterdisplayselector.cpp b/GUI/Widgets/filterdisplayselector.cpp index a9cb75c..59b7535 100644 --- a/GUI/Widgets/filterdisplayselector.cpp +++ b/GUI/Widgets/filterdisplayselector.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/filterdisplayselector.h b/GUI/Widgets/filterdisplayselector.h index e7481c6..166f0ce 100644 --- a/GUI/Widgets/filterdisplayselector.h +++ b/GUI/Widgets/filterdisplayselector.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/filterplot.cpp b/GUI/Widgets/filterplot.cpp index 6bf0876..91e2f91 100644 --- a/GUI/Widgets/filterplot.cpp +++ b/GUI/Widgets/filterplot.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/filterplot.h b/GUI/Widgets/filterplot.h index 69a3d19..e49fd79 100644 --- a/GUI/Widgets/filterplot.h +++ b/GUI/Widgets/filterplot.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/impedancegradient.cpp b/GUI/Widgets/impedancegradient.cpp index 5907183..9eff982 100644 --- a/GUI/Widgets/impedancegradient.cpp +++ b/GUI/Widgets/impedancegradient.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/impedancegradient.h b/GUI/Widgets/impedancegradient.h index 80052d4..62c7e44 100644 --- a/GUI/Widgets/impedancegradient.h +++ b/GUI/Widgets/impedancegradient.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/isiplot.cpp b/GUI/Widgets/isiplot.cpp index 19e5305..c08afdb 100644 --- a/GUI/Widgets/isiplot.cpp +++ b/GUI/Widgets/isiplot.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/isiplot.h b/GUI/Widgets/isiplot.h index 2a6638a..a204ddd 100644 --- a/GUI/Widgets/isiplot.h +++ b/GUI/Widgets/isiplot.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/multicolumndisplay.cpp b/GUI/Widgets/multicolumndisplay.cpp index 8c5c561..9b128d5 100644 --- a/GUI/Widgets/multicolumndisplay.cpp +++ b/GUI/Widgets/multicolumndisplay.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -326,12 +326,12 @@ YScaleUsed MultiColumnDisplay::loadWaveformDataFromMemory(WaveformFifo* waveform return waveformManager->finishLoading(); } -YScaleUsed MultiColumnDisplay::loadWaveformDataDirectAmp(QVector>> &Data, QVector> &ChannelNames) +YScaleUsed MultiColumnDisplay::loadWaveformDataDirectAmp(QVector>> &Data, QVector> &ChannelNames, QVector> &auxInData) { waveformManager->resetAll(); waveformManager->prepForLoadingDataDirect(); for (int i = 0; i < numColumns(); ++i) { - displayColumns[i]->loadWaveformDataDirect(ampData, ampChannelNames); + displayColumns[i]->loadWaveformDataDirect(ampData, ampChannelNames, auxInData); } return waveformManager->finishLoading(); } @@ -341,9 +341,10 @@ YScaleUsed MultiColumnDisplay::loadWaveformDataDirectAmpDC(QVectorresetAll(); waveformManager->prepForLoadingDataDirect(); + QVector> dummyAuxInData; for (int i = 0; i < numColumns(); ++i) { - displayColumns[i]->loadWaveformDataDirect(ampData, ampChannelNames); - displayColumns[i]->loadWaveformDataDirect(dcData, dcChannelNames); + displayColumns[i]->loadWaveformDataDirect(ampData, ampChannelNames, dummyAuxInData); + displayColumns[i]->loadWaveformDataDirect(dcData, dcChannelNames, dummyAuxInData); } return waveformManager->finishLoading(); } diff --git a/GUI/Widgets/multicolumndisplay.h b/GUI/Widgets/multicolumndisplay.h index 6d0fa4e..007f9a0 100644 --- a/GUI/Widgets/multicolumndisplay.h +++ b/GUI/Widgets/multicolumndisplay.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -59,7 +59,7 @@ class MultiColumnDisplay : public QWidget YScaleUsed loadWaveformData(WaveformFifo* waveformFifo); YScaleUsed loadWaveformDataFromMemory(WaveformFifo* waveformFifo, int startTime, bool loadAll = false); - YScaleUsed loadWaveformDataDirectAmp(QVector>> &Data, QVector> &ChannelNames); + YScaleUsed loadWaveformDataDirectAmp(QVector>> &Data, QVector> &ChannelNames, QVector> &auxInData); YScaleUsed loadWaveformDataDirectAmpDC(QVector>> &Data, QVector> &ChannelNames, QVector>> &dcData, QVector> &dcChannelNames); void reset(); diff --git a/GUI/Widgets/multiwaveformplot.cpp b/GUI/Widgets/multiwaveformplot.cpp index cac5de0..f7121fe 100644 --- a/GUI/Widgets/multiwaveformplot.cpp +++ b/GUI/Widgets/multiwaveformplot.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -265,6 +265,10 @@ bool MultiWaveformPlot::event(QEvent* event) hoverWaveIndex = findSelectedWaveform(cursor.y()); if (hoverWaveIndex.index >= 0) { Channel* channel = listManager->displayedWaveform(hoverWaveIndex)->channel; + if (!channel) { + // Escape without attempting to use channel if it's a null pointer. + return true; + } QString toolTip = channel->getCustomName(); if (channel->getCustomName() != channel->getNativeName()) toolTip += " (" + channel->getNativeName() + ")"; if (channel->getSignalType() == AmplifierSignal) { @@ -1612,7 +1616,7 @@ void MultiWaveformPlot::loadWaveformDataFromMemory(WaveformFifo* waveformFifo, i update(); } -void MultiWaveformPlot::loadWaveformDataDirect(QVector>> &Data, QVector> &ChannelNames) +void MultiWaveformPlot::loadWaveformDataDirect(QVector>> &Data, QVector> &ChannelNames, QVector> &auxInData) { for (int i = 0; i < pinnedList.size(); ++i) { if (pinnedList.at(i).isCurrentlyVisible) { @@ -1647,6 +1651,21 @@ void MultiWaveformPlot::loadWaveformDataDirect(QVector>> } } } + + // If testing aux ins, plot them as well + if (state->testAuxIns->getValue()) { + QVector stretchedAuxData; + for (int channel = 0; channel < auxInData.size(); channel++) { + stretchedAuxData.resize(auxInData[channel].size() * 4); + for (int sample = 0; sample < auxInData[channel].size(); sample++) { + stretchedAuxData[4 * sample + 0] = auxInData[channel][sample]; + stretchedAuxData[4 * sample + 1] = auxInData[channel][sample]; + stretchedAuxData[4 * sample + 2] = auxInData[channel][sample]; + stretchedAuxData[4 * sample + 3] = auxInData[channel][sample]; + } + waveformManager->loadDataDirect(stretchedAuxData, state->testingPort->getValueString() + "-AUX" + QString::number(channel + 1)); + } + } update(); } diff --git a/GUI/Widgets/multiwaveformplot.h b/GUI/Widgets/multiwaveformplot.h index 18c7edd..4ae9c6d 100644 --- a/GUI/Widgets/multiwaveformplot.h +++ b/GUI/Widgets/multiwaveformplot.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -73,7 +73,7 @@ class MultiWaveformPlot : public QWidget void loadWaveformData(WaveformFifo* waveformFifo); void loadWaveformDataFromMemory(WaveformFifo* waveformFifo, int startTime, bool loadAll = false); - void loadWaveformDataDirect(QVector>> &Data, QVector> &ChannelNames); + void loadWaveformDataDirect(QVector>> &Data, QVector> &ChannelNames, QVector> &auxInData); inline void updateNow() { update(); } void enableSelectedWaveforms(bool enable) { listManager->enableSelectedWaveforms(enable); } diff --git a/GUI/Widgets/pageview.cpp b/GUI/Widgets/pageview.cpp index 4fd2c11..66cd247 100644 --- a/GUI/Widgets/pageview.cpp +++ b/GUI/Widgets/pageview.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/pageview.h b/GUI/Widgets/pageview.h index a57cd80..04ef68a 100644 --- a/GUI/Widgets/pageview.h +++ b/GUI/Widgets/pageview.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/plotutilities.cpp b/GUI/Widgets/plotutilities.cpp index 1f8aa8f..8ac6e46 100644 --- a/GUI/Widgets/plotutilities.cpp +++ b/GUI/Widgets/plotutilities.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/plotutilities.h b/GUI/Widgets/plotutilities.h index 99d519a..efa34b6 100644 --- a/GUI/Widgets/plotutilities.h +++ b/GUI/Widgets/plotutilities.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/psthplot.cpp b/GUI/Widgets/psthplot.cpp index fdf742e..eb3110c 100644 --- a/GUI/Widgets/psthplot.cpp +++ b/GUI/Widgets/psthplot.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/psthplot.h b/GUI/Widgets/psthplot.h index b824062..791b87f 100644 --- a/GUI/Widgets/psthplot.h +++ b/GUI/Widgets/psthplot.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/scrollbar.cpp b/GUI/Widgets/scrollbar.cpp index a024dd6..85f8844 100644 --- a/GUI/Widgets/scrollbar.cpp +++ b/GUI/Widgets/scrollbar.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/scrollbar.h b/GUI/Widgets/scrollbar.h index 57002a7..9c738a2 100644 --- a/GUI/Widgets/scrollbar.h +++ b/GUI/Widgets/scrollbar.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/smartspinbox.cpp b/GUI/Widgets/smartspinbox.cpp index 0615dc5..8a7b724 100644 --- a/GUI/Widgets/smartspinbox.cpp +++ b/GUI/Widgets/smartspinbox.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/smartspinbox.h b/GUI/Widgets/smartspinbox.h index 474f46b..8007b91 100644 --- a/GUI/Widgets/smartspinbox.h +++ b/GUI/Widgets/smartspinbox.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/spectrogramplot.cpp b/GUI/Widgets/spectrogramplot.cpp index 28284a3..c312dfb 100644 --- a/GUI/Widgets/spectrogramplot.cpp +++ b/GUI/Widgets/spectrogramplot.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/spectrogramplot.h b/GUI/Widgets/spectrogramplot.h index cf02407..dd3d9a8 100644 --- a/GUI/Widgets/spectrogramplot.h +++ b/GUI/Widgets/spectrogramplot.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/spikegradient.cpp b/GUI/Widgets/spikegradient.cpp index 6b36a37..7194bbf 100644 --- a/GUI/Widgets/spikegradient.cpp +++ b/GUI/Widgets/spikegradient.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/spikegradient.h b/GUI/Widgets/spikegradient.h index 81deeed..3b51d00 100644 --- a/GUI/Widgets/spikegradient.h +++ b/GUI/Widgets/spikegradient.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/spikeplot.cpp b/GUI/Widgets/spikeplot.cpp index 3b01e3a..d9931fd 100644 --- a/GUI/Widgets/spikeplot.cpp +++ b/GUI/Widgets/spikeplot.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/spikeplot.h b/GUI/Widgets/spikeplot.h index 6a6bb9e..b5f368b 100644 --- a/GUI/Widgets/spikeplot.h +++ b/GUI/Widgets/spikeplot.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/statusbars.cpp b/GUI/Widgets/statusbars.cpp index e35a4d5..14c7c02 100644 --- a/GUI/Widgets/statusbars.cpp +++ b/GUI/Widgets/statusbars.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/statusbars.h b/GUI/Widgets/statusbars.h index f083796..22f24c2 100644 --- a/GUI/Widgets/statusbars.h +++ b/GUI/Widgets/statusbars.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/stimfigure.cpp b/GUI/Widgets/stimfigure.cpp index 9ab1646..9da9031 100644 --- a/GUI/Widgets/stimfigure.cpp +++ b/GUI/Widgets/stimfigure.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/stimfigure.h b/GUI/Widgets/stimfigure.h index cc1f254..3b62199 100644 --- a/GUI/Widgets/stimfigure.h +++ b/GUI/Widgets/stimfigure.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/tcpdisplay.cpp b/GUI/Widgets/tcpdisplay.cpp index dc5a6c9..a34c769 100644 --- a/GUI/Widgets/tcpdisplay.cpp +++ b/GUI/Widgets/tcpdisplay.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/tcpdisplay.h b/GUI/Widgets/tcpdisplay.h index a7348bd..1a7ea24 100644 --- a/GUI/Widgets/tcpdisplay.h +++ b/GUI/Widgets/tcpdisplay.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/testcontrolpanel.cpp b/GUI/Widgets/testcontrolpanel.cpp index 06c64e1..9e3bdca 100644 --- a/GUI/Widgets/testcontrolpanel.cpp +++ b/GUI/Widgets/testcontrolpanel.cpp @@ -94,9 +94,21 @@ TestControlPanel::TestControlPanel(ControllerInterface *controllerInterface_, Ab helpDialogCheckInputWave(nullptr), helpDialogTestChip(nullptr), helpDialogUploadTestStimParameters(nullptr), - reportPresent(false), + previousDelay(-1), portComboBox(nullptr), - previousDelay(-1) + auxIn1Min(3.3), + auxIn1Max(0), + auxIn1Median(0), + auxIn2Min(3.3), + auxIn2Max(0), + auxIn2Median(0), + auxIn3Min(3.3), + auxIn3Max(0), + auxIn3Median(0), + auxInExpectedMin(1.0), + auxInExpectedMax(2.0), + auxInExpectedMedian(1.5), + acceptableDifference(0.2) { setFocusPolicy(Qt::StrongFocus); this->setFocus(); @@ -106,10 +118,20 @@ TestControlPanel::TestControlPanel(ControllerInterface *controllerInterface_, Ab if (state->numSPIPorts == 8) { portComboBox->addItems(QStringList({"Port E", "Port F", "Port G", "Port H"})); } + connect(portComboBox, SIGNAL(currentTextChanged(QString)), this, SLOT(changePortComboBoxSlot())); + + testAuxInsCheckBox = new QCheckBox(tr("Test Aux Ins"), this); + if (state->getControllerTypeEnum() == ControllerStimRecord) { + testAuxInsCheckBox->hide(); + } else { + connect(testAuxInsCheckBox, SIGNAL(toggled(bool)), this, SLOT(toggleTestAuxInsSlot())); + testAuxInsCheckBox->setChecked(true); + } QHBoxLayout *portRow = new QHBoxLayout; portRow->addWidget(portComboBox); portRow->addStretch(); + portRow->addWidget(testAuxInsCheckBox); QHBoxLayout *checkInputWaveRow = new QHBoxLayout; checkInputWaveButton = new QPushButton(tr("Check Input Waveform"), this); @@ -417,6 +439,16 @@ void TestControlPanel::uploadTestStimParametersHelp() helpDialogUploadTestStimParameters->activateWindow(); } +void TestControlPanel::toggleTestAuxInsSlot() +{ + state->testAuxIns->setValue(testAuxInsCheckBox->isChecked()); +} + +void TestControlPanel::changePortComboBoxSlot() +{ + state->testingPort->setValue(portComboBox->currentText().right(1)); +} + void TestControlPanel::updateFromState() { state->signalSources->getSelectedSignals(selectedSignals); @@ -629,10 +661,11 @@ void TestControlPanel::checkInputWave() QVector> channels; QVector>> ampData; QVector> ampChannelNames; - int numSamples = recordShortSegment(channels, 0.4, portIndex, ampData, ampChannelNames); + QVector> auxInData; + int numSamples = recordShortSegment(channels, 0.4, portIndex, ampData, ampChannelNames, auxInData); // Load this segment into plotter - multiColumnDisplay->loadWaveformDataDirectAmp(ampData, ampChannelNames); + multiColumnDisplay->loadWaveformDataDirectAmp(ampData, ampChannelNames, auxInData); // Determine median waveform of the channels QVector median; @@ -809,6 +842,19 @@ void TestControlPanel::allocateDoubleArray3D(QVector > > } } +// Allocates memory for a 2-D array of doubles. +void TestControlPanel::allocateDoubleArray2D(QVector > &array2D, + int xSize, int ySize) +{ + int i, j; + + if (xSize == 0) return; + array2D.resize(xSize); + for (i = 0; i < xSize; ++i) { + array2D[i].resize(ySize); + } +} + void TestControlPanel::updateConnectedChannels() { QString message; @@ -835,7 +881,8 @@ void TestControlPanel::updateConnectedChannels() // Record a short segment of 'duration' seconds, placing the data in 'channels' vector // A test is run for 64-channel chips (inside the load64() function) to determine if only the inner 32 channels should be considered, or only the outer 32, or all 64 -int TestControlPanel::recordShortSegment(QVector > &channels, double duration, int portIndex, QVector>> &Data, QVector> &ChannelNames) +int TestControlPanel::recordShortSegment(QVector > &channels, double duration, int portIndex, + QVector>> &Data, QVector> &ChannelNames, QVector> &auxInData) { // Disable external fast settling, since this interferes with DAC commands in AuxCmd1. rhxController->enableExternalFastSettle(false); @@ -858,6 +905,7 @@ int TestControlPanel::recordShortSegment(QVector > &channels, do // Determine number of channels and streams based on the type of chip plugged in int numChannels = state->signalSources->portGroupByIndex(portIndex)->numAmpChannels->getValue(); + int numAuxChannels = state->signalSources->portGroupByIndex(portIndex)->numAuxChannels->getValue(); int numStreams = 0; int channelsPerStream = RHXDataBlock::channelsPerStream(state->getControllerTypeEnum()); @@ -894,6 +942,7 @@ int TestControlPanel::recordShortSegment(QVector > &channels, do // BEGIN SIMPLIFY LOADAMPLIFIERDATA allocateDoubleArray3D(ampData, numStreams, channelsPerStream, numSamples); + allocateDoubleArray2D(auxInData, numAuxChannels, numSamples / 4); ampChannelNames.resize(numStreams); for (int i = 0; i < ampChannelNames.size(); ++i) { ampChannelNames[i].resize(channelsPerStream); @@ -906,7 +955,7 @@ int TestControlPanel::recordShortSegment(QVector > &channels, do } int block, t, channel, stream; - int indexAmp = 0; + int indexAmp = 0, indexAux = 0; for (block = 0; block < numBlocks; ++block) { // Load and scale amplifier waveforms (sampled at amplifier sampling rate) for (t = 0; t < samplesPerDataBlock; ++t) { @@ -918,6 +967,18 @@ int TestControlPanel::recordShortSegment(QVector > &channels, do } ++indexAmp; } + + // Load and scale aux waveforms (sampled at 1/4 amplifier sampling rate) + for (t = 0; t < samplesPerDataBlock / 4; ++t) { + // Aux waveform units = volts + // t + 0 returns 73 (read from ROM), t + 1 returns AuxIn1, t + 2 returns AuxIn2, t + 3 returns AuxIn3 + if (state->getControllerTypeEnum() != ControllerStimRecord) { + auxInData[0][indexAux] = 0.0000374F * (dataQueue.front()->auxiliaryData(0, 1, 4 * t + 1)); + auxInData[1][indexAux] = 0.0000374F * (dataQueue.front()->auxiliaryData(0, 1, 4 * t + 2)); + auxInData[2][indexAux] = 0.0000374F * (dataQueue.front()->auxiliaryData(0, 1, 4 * t + 3)); + } + ++indexAux; + } // We are done with this RHXDataBlock object; remove it from dataQueue dataQueue.pop_front(); } @@ -1823,6 +1884,8 @@ void TestControlPanel::testChip() QVector> ampChannelNames; QVector> fastSettleChannels; + QVector> auxInData; + QProgressDialog progress(QObject::tr("Testing Chip"), QString(), 0, 12); progress.setWindowTitle(tr("Progress")); progress.setMinimumDuration(0); @@ -1852,17 +1915,20 @@ void TestControlPanel::testChip() progress.setValue(2); //Run for 3 seconds for dummy data - //for (int i = 0; i < 30; i++) { - for (int i = 0; i < 5; i++) { + for (int i = 0; i < 30; i++) { + //for (int i = 0; i < 5; i++) { + //for (int i = 0; i < 20; i++) { recordDummySegment(0.1, portIndex); } progress.setValue(3); ampData.clear(); + auxInData.clear(); ampChannelNames.clear(); //Load short segment of data into 'channels' vector - int numSamples = recordShortSegment(channels, 0.4, portIndex, ampData, ampChannelNames); + int numSamples = recordShortSegment(channels, 0.4, portIndex, ampData, ampChannelNames, auxInData); + progress.setValue(4); //Subtract the average value from each of the waveforms (to eliminate transient offset) @@ -1884,6 +1950,28 @@ void TestControlPanel::testChip() allChannelsDead = true; } + auxIn1Min = auxIn2Min = auxIn3Min = 3.3; + auxIn1Max = auxIn2Max = auxIn3Max = 0; + // If testing aux ins is suitable, get median of each channel, and max-min of each channel + if (state->getControllerTypeEnum() != ControllerStimRecord) { + for (int index = 0; index < auxInData[0].size(); index++) { + double thisSample1 = auxInData[0][index]; + double thisSample2 = auxInData[1][index]; + double thisSample3 = auxInData[2][index]; + + if (thisSample1 > auxIn1Max) auxIn1Max = thisSample1; + if (thisSample1 < auxIn1Min) auxIn1Min = thisSample1; + + if (thisSample2 > auxIn2Max) auxIn2Max = thisSample2; + if (thisSample2 < auxIn2Min) auxIn2Min = thisSample2; + + if (thisSample3 > auxIn3Max) auxIn3Max = thisSample3; + if (thisSample3 < auxIn3Min) auxIn3Min = thisSample3; + } + auxIn1Median = median(auxInData[0]); + auxIn2Median = median(auxInData[1]); + auxIn3Median = median(auxInData[2]); + } //Determine median waveform of the channels QVector median; @@ -2039,7 +2127,7 @@ void TestControlPanel::testChip() } channels_report_settle[channel] = pow(sum/validFastSettleChannels[channel].size(), 0.5); } - multiColumnDisplay->loadWaveformDataDirectAmp(ampData, ampChannelNames); + multiColumnDisplay->loadWaveformDataDirectAmp(ampData, ampChannelNames, auxInData); } else { @@ -2134,7 +2222,7 @@ void TestControlPanel::generateReport(QVector > channels) int threshold = triangleErrorThresholdLineEdit->text().toDouble(); for (int channel = 0; channel < channels.size(); channel++) { - if (channels_report[channel] > threshold) { + if (channels_report[channel] > threshold || std::isnan(channels_report[channel])) { high_error = true; } if (state->getControllerTypeEnum() == ControllerStimRecord) { @@ -2148,11 +2236,29 @@ void TestControlPanel::generateReport(QVector > channels) } } + if (state->getControllerTypeEnum() != ControllerStimRecord && state->testAuxIns->getValue()) { + if (isOutsideExpectedValue(auxIn1Min, auxInExpectedMin)) high_error = true; + if (isOutsideExpectedValue(auxIn1Max, auxInExpectedMax)) high_error = true; + if (isOutsideExpectedValue(auxIn1Median, auxInExpectedMedian)) high_error = true; + + if (isOutsideExpectedValue(auxIn2Min, auxInExpectedMin)) high_error = true; + if (isOutsideExpectedValue(auxIn2Max, auxInExpectedMax)) high_error = true; + if (isOutsideExpectedValue(auxIn2Median, auxInExpectedMedian)) high_error = true; + + if (isOutsideExpectedValue(auxIn3Min, auxInExpectedMin)) high_error = true; + if (isOutsideExpectedValue(auxIn3Max, auxInExpectedMax)) high_error = true; + if (isOutsideExpectedValue(auxIn3Median, auxInExpectedMedian)) high_error = true; + } + viewReportButton->setStyleSheet(high_error ? "QPushButton {background-color: red; }" : "QPushButton {background-color: green; }"); reportLabel->setText(high_error ? "Bad" : "Good"); reportLabel->setStyleSheet(high_error ? "QLabel { color: red; }" : "QLabel { color : green; }"); } +bool TestControlPanel::isOutsideExpectedValue(double actualValue, double expectedValue) +{ + return (actualValue > (1.0 + acceptableDifference) * expectedValue || actualValue < (1.0 - acceptableDifference) * expectedValue); +} void TestControlPanel::checkDCWaveforms() { @@ -2610,6 +2716,43 @@ void TestControlPanel::viewReport() } } + else { + if (state->testAuxIns->getValue()) { + QString auxIn1MinHtml = isOutsideExpectedValue(auxIn1Min, auxInExpectedMin) ? redHtml : greenHtml; + QString auxIn1MaxHtml = isOutsideExpectedValue(auxIn1Max, auxInExpectedMax) ? redHtml : greenHtml; + QString auxIn1MedianHtml = isOutsideExpectedValue(auxIn1Median, auxInExpectedMedian) ? redHtml : greenHtml; + + QString auxIn2MinHtml = isOutsideExpectedValue(auxIn2Min, auxInExpectedMin) ? redHtml : greenHtml; + QString auxIn2MaxHtml = isOutsideExpectedValue(auxIn2Max, auxInExpectedMax) ? redHtml : greenHtml; + QString auxIn2MedianHtml = isOutsideExpectedValue(auxIn2Median, auxInExpectedMedian) ? redHtml : greenHtml; + + QString auxIn3MinHtml = isOutsideExpectedValue(auxIn3Min, auxInExpectedMin) ? redHtml : greenHtml; + QString auxIn3MaxHtml = isOutsideExpectedValue(auxIn3Max, auxInExpectedMax) ? redHtml : greenHtml; + QString auxIn3MedianHtml = isOutsideExpectedValue(auxIn3Median, auxInExpectedMedian) ? redHtml : greenHtml; + + report_string.append(blackHtml % "
AuxIn1: Min: "); + report_string.append(auxIn1MinHtml % QString::number(auxIn1Min, 'f', 2)); + report_string.append(blackHtml % ". Max: "); + report_string.append(auxIn1MaxHtml % QString::number(auxIn1Max, 'f', 2)); + report_string.append(blackHtml % ". Median: "); + report_string.append(auxIn1MedianHtml % QString::number(auxIn1Median, 'f', 2) % "."); + + report_string.append(blackHtml % "
AuxIn2: Min: "); + report_string.append(auxIn2MinHtml % QString::number(auxIn2Min, 'f', 2)); + report_string.append(blackHtml % ". Max: "); + report_string.append(auxIn2MaxHtml % QString::number(auxIn2Max, 'f', 2)); + report_string.append(blackHtml % ". Median: "); + report_string.append(auxIn2MedianHtml % QString::number(auxIn2Median, 'f', 2) % "."); + + report_string.append(blackHtml % "
AuxIn3: Min: "); + report_string.append(auxIn3MinHtml % QString::number(auxIn3Min, 'f', 2)); + report_string.append(blackHtml % ". Max: "); + report_string.append(auxIn3MaxHtml % QString::number(auxIn3Max, 'f', 2)); + report_string.append(blackHtml % ". Median: "); + report_string.append(auxIn3MedianHtml % QString::number(auxIn3Median, 'f', 2) % "."); + } + } + QTextEdit *report_te = new QTextEdit; report_te->setText(report_string); report_te->setReadOnly(true); diff --git a/GUI/Widgets/testcontrolpanel.h b/GUI/Widgets/testcontrolpanel.h index d54858a..02ee3ce 100644 --- a/GUI/Widgets/testcontrolpanel.h +++ b/GUI/Widgets/testcontrolpanel.h @@ -105,6 +105,8 @@ private slots: void checkInputWaveHelp(); void testChipHelp(); void uploadTestStimParametersHelp(); + void toggleTestAuxInsSlot(); + void changePortComboBoxSlot(); private: QHBoxLayout* createSelectionLayout() override final; @@ -146,6 +148,8 @@ private slots: QPushButton *saveReportButton; bool reportPresent; + QCheckBox* testAuxInsCheckBox; + QLabel *connectedChannelsLabel; ConnectedChannels connectedChannels; @@ -169,7 +173,12 @@ private slots: void recordDummySegment(double duration, int portIndex); void allocateDoubleArray3D(QVector > > &array3D, int xSize, int ySize, int zSize); - int recordShortSegment(QVector> &channels, double duration, int portIndex, QVector>> &Data, QVector> &ChannelNames); + void allocateDoubleArray2D(QVector > &array2D, + int xSize, int ySize); + + int recordShortSegment(QVector> &channels, double duration, int portIndex, + QVector>> &Data, QVector> &ChannelNames, QVector> &auxInData); + int recordDCSegment(QVector > &channels, double duration, int portIndex, QVector> &dcChannelNames); int recordFSSegment(QVector> &channels, double duration, int portIndex, QVector>> &Data, QVector> &ChannelNames); @@ -202,9 +211,31 @@ private slots: double vectorAvg(QVector vect); double vectorAvg(QVector vect, int start, int end); + bool isOutsideExpectedValue(double actualValue, double expectedValue); + int ttlOut[16]; int previousDelay; + + bool testAuxIns; + + double auxIn1Min; + double auxIn1Max; + double auxIn1Median; + + double auxIn2Min; + double auxIn2Max; + double auxIn2Median; + + double auxIn3Min; + double auxIn3Max; + double auxIn3Median; + + double auxInExpectedMin; + double auxInExpectedMax; + double auxInExpectedMedian; + + double acceptableDifference; }; #endif // TESTCONTROLPANEL_H diff --git a/GUI/Widgets/voltagespinbox.cpp b/GUI/Widgets/voltagespinbox.cpp index 5403d8d..81f8f21 100644 --- a/GUI/Widgets/voltagespinbox.cpp +++ b/GUI/Widgets/voltagespinbox.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/voltagespinbox.h b/GUI/Widgets/voltagespinbox.h index a3f9a4c..29e9303 100644 --- a/GUI/Widgets/voltagespinbox.h +++ b/GUI/Widgets/voltagespinbox.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/waveformdisplaycolumn.cpp b/GUI/Widgets/waveformdisplaycolumn.cpp index ccf8864..c586c4d 100644 --- a/GUI/Widgets/waveformdisplaycolumn.cpp +++ b/GUI/Widgets/waveformdisplaycolumn.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/waveformdisplaycolumn.h b/GUI/Widgets/waveformdisplaycolumn.h index 5983cb8..1fae3bb 100644 --- a/GUI/Widgets/waveformdisplaycolumn.h +++ b/GUI/Widgets/waveformdisplaycolumn.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // @@ -65,8 +65,8 @@ class WaveformDisplayColumn : public QWidget inline void loadWaveformData(WaveformFifo* waveformFifo) { waveformPlot->loadWaveformData(waveformFifo); } inline void loadWaveformDataFromMemory(WaveformFifo* waveformFifo, int startTime, bool loadAll = false) { waveformPlot->loadWaveformDataFromMemory(waveformFifo, startTime, loadAll); } - inline void loadWaveformDataDirect(QVector>> &Data, QVector> &ChannelNames) - { waveformPlot->loadWaveformDataDirect(ampData, ampChannelNames); } + inline void loadWaveformDataDirect(QVector>> &Data, QVector> &ChannelNames, QVector> &auxInData) + { waveformPlot->loadWaveformDataDirect(ampData, ampChannelNames, auxInData); } QString getSelectedPort() const { return portComboBox->currentText().section(" (", 0, 0); } void setSelectedPort(const QString& portName); diff --git a/GUI/Widgets/waveformdisplaymanager.cpp b/GUI/Widgets/waveformdisplaymanager.cpp index 1e0ae49..27c695a 100644 --- a/GUI/Widgets/waveformdisplaymanager.cpp +++ b/GUI/Widgets/waveformdisplaymanager.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Widgets/waveformdisplaymanager.h b/GUI/Widgets/waveformdisplaymanager.h index 41b23b2..01eb916 100644 --- a/GUI/Widgets/waveformdisplaymanager.h +++ b/GUI/Widgets/waveformdisplaymanager.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Windows/controlwindow.cpp b/GUI/Windows/controlwindow.cpp index 16b5575..66d22a4 100644 --- a/GUI/Windows/controlwindow.cpp +++ b/GUI/Windows/controlwindow.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Windows/controlwindow.h b/GUI/Windows/controlwindow.h index c1e662a..15cef14 100644 --- a/GUI/Windows/controlwindow.h +++ b/GUI/Windows/controlwindow.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Windows/probemapwindow.cpp b/GUI/Windows/probemapwindow.cpp index 85388eb..990bc01 100644 --- a/GUI/Windows/probemapwindow.cpp +++ b/GUI/Windows/probemapwindow.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Windows/probemapwindow.h b/GUI/Windows/probemapwindow.h index 1845877..0542387 100644 --- a/GUI/Windows/probemapwindow.h +++ b/GUI/Windows/probemapwindow.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Windows/viewfilterswindow.cpp b/GUI/Windows/viewfilterswindow.cpp index 7df75ff..aacfc43 100644 --- a/GUI/Windows/viewfilterswindow.cpp +++ b/GUI/Windows/viewfilterswindow.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/GUI/Windows/viewfilterswindow.h b/GUI/Windows/viewfilterswindow.h index 9a6b15e..4857910 100644 --- a/GUI/Windows/viewfilterswindow.h +++ b/GUI/Windows/viewfilterswindow.h @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/intan_rhx_release_notes.txt b/intan_rhx_release_notes.txt index 56da8e5..68266a8 100644 --- a/intan_rhx_release_notes.txt +++ b/intan_rhx_release_notes.txt @@ -109,4 +109,10 @@ Intan RHX release notes - Append date/timestamp to end of LiveNotes filename to avoid unintentional file overwriting for multi-file recording sessions - Improve TCP functionality to allow for multiple connections/disconnections to occur without having to restart software - Add TCP "execute" commands: SaveSettingsFile, LoadSettingsFile, SaveStimulationSettingsFile, LoadStimulationSettingsFile, analogous to already present UI elements. -- Improve test mode: wider acceptable input signal ranges, reduced likelihood of unintentionally entering test mode, and faster chip testing \ No newline at end of file +- Improve test mode: wider acceptable input signal ranges, reduced likelihood of unintentionally entering test mode, and faster chip testing + +* Version 3.3.2, 8 July 2024 +- Improve chip testing mode, and give a more direct warning against using chip test mode for headstages +- Flush livenotes file every time a livenote occurs (useful for real-time applications that rely on livenotes) +- Fix XML loading of Port-specific parameters (manual delay, auxiliary digital out assignment) failing after Port A +- Fix intermittent crashing that would occur from hovering cursor in tooltip mode over border between signal types in plot \ No newline at end of file diff --git a/kernel.cl b/kernel.cl index 94c754a..fa9a4fe 100644 --- a/kernel.cl +++ b/kernel.cl @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. // diff --git a/main.cpp b/main.cpp index ff386a2..413244e 100644 --- a/main.cpp +++ b/main.cpp @@ -1,9 +1,9 @@ //------------------------------------------------------------------------------ // // Intan Technologies RHX Data Acquisition Software -// Version 3.3.1 +// Version 3.3.2 // -// Copyright (c) 2020-2023 Intan Technologies +// Copyright (c) 2020-2024 Intan Technologies // // This file is part of the Intan Technologies RHX Data Acquisition Software. //