Merge branch 'origin/main' into recording-optimization

anjaldoshi · anjaldoshi · commit edae6f6ef933 · 2026-01-21T17:50:39.000-08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 #Open Ephys GUI main build file
 cmake_minimum_required(VERSION 3.15)
 
-set(GUI_VERSION 1.0.1)
+set(GUI_VERSION 1.0.2)
 
 string(REGEX MATCHALL "[0-9]+" VERSION_LIST ${GUI_VERSION})
 list(LENGTH VERSION_LIST num_version_components)
diff --git a/Plugins/LfpViewer/LfpDisplayOptions.cpp b/Plugins/LfpViewer/LfpDisplayOptions.cpp
@@ -1268,6 +1268,11 @@ void LfpDisplayOptions::comboBoxChanged (ComboBox* cb)
         selectedVoltageRange[selectedChannelType] = cb->getSelectedId();
         selectedVoltageRangeValues[selectedChannelType] = cb->getText();
         canvasSplit->redraw();
+
+        if (selectedChannelType == ContinuousChannel::Type::AUX && isAuxAutoScaleEnabled())
+            rangeSelectionLabel->setText ("Range", dontSendNotification);
+        else
+            rangeSelectionLabel->setText ("Range (" + rangeUnits[selectedChannelType] + ")", dontSendNotification);
     }
     else if (cb == spreadSelection.get())
     {
diff --git a/README.md b/README.md
@@ -36,11 +36,11 @@ Our primary user base is scientists performing electrophysiology experiments wit
 
 The easiest way to get started is to download the installer for your platform of choice:
 
-- [Windows](https://openephys.jfrog.io/artifactory/GUI-binaries/Release-Installer/windows/Install-Open-Ephys-GUI-v1.0.1.exe)
-- [Ubuntu/Debian](https://openephys.jfrog.io/artifactory/GUI-binaries/Release-Installer/linux/open-ephys-gui-v1.0.1.deb)
-- [macOS](https://openephys.jfrog.io/artifactory/GUI-binaries/Release-Installer/mac/Open_Ephys_GUI_v1.0.1.dmg)
+- [Windows](https://openephys.jfrog.io/artifactory/GUI-binaries/Release-Installer/windows/Install-Open-Ephys-GUI-v1.0.2.exe)
+- [Ubuntu/Debian](https://openephys.jfrog.io/artifactory/GUI-binaries/Release-Installer/linux/open-ephys-gui-v1.0.2.deb)
+- [macOS](https://openephys.jfrog.io/artifactory/GUI-binaries/Release-Installer/mac/Open_Ephys_GUI_v1.0.2.dmg)
 
-It’s also possible to obtain the binaries as a .zip file for [Windows](https://openephys.jfrog.io/artifactory/GUI-binaries/Release/windows/open-ephys-v1.0.1-windows.zip), [Linux](https://openephys.jfrog.io/artifactory/GUI-binaries/Release/linux/open-ephys-v1.0.1-linux.zip), or [Mac](https://openephys.jfrog.io/artifactory/GUI-binaries/Release/mac/open-ephys-v1.0.1-mac.zip).
+It’s also possible to obtain the binaries as a .zip file for [Windows](https://openephys.jfrog.io/artifactory/GUI-binaries/Release/windows/open-ephys-v1.0.2-windows.zip), [Linux](https://openephys.jfrog.io/artifactory/GUI-binaries/Release/linux/open-ephys-v1.0.2-linux.zip), or [Mac](https://openephys.jfrog.io/artifactory/GUI-binaries/Release/mac/open-ephys-v1.0.2-mac.zip).
 
 Detailed installation instructions can be found [here](https://open-ephys.github.io/gui-docs/User-Manual/Installing-the-GUI.html).
 
diff --git a/Resources/Installers/Linux/Open-Ephys_Installer/DEBIAN/control b/Resources/Installers/Linux/Open-Ephys_Installer/DEBIAN/control
@@ -1,9 +1,9 @@
 Package: open-ephys
-Version: 1.0.1
+Version: 1.0.2
 Architecture: amd64
 Installed-Size: 18644
 Section: science
 Priority: optional
-Maintainer: Open Ephys <info@open-ephys.com>
+Maintainer: Open Ephys <gui@open-ephys.org>
 Homepage: https://open-ephys.org/gui
 Description: Software for processing, recording, and visualizing multichannel electrophysiology data.
diff --git a/Resources/Installers/Linux/Open-Ephys_Installer/DEBIAN/copyright b/Resources/Installers/Linux/Open-Ephys_Installer/DEBIAN/copyright
@@ -3,7 +3,7 @@ Upstream-Name: Open Ephys GUI
 Source: https://github.com/open-ephys/plugin-GUI/
 
 Files: *
-Copyright: 2025 Open Ephys <info@open-ephys.com>
+Copyright: 2026 Open Ephys <gui@open-ephys.org>
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
diff --git a/Resources/Installers/Windows/windows_installer_script.iss b/Resources/Installers/Windows/windows_installer_script.iss
@@ -1,9 +1,9 @@
 [Setup]
 AppId=Open Ephys
 AppName=Open Ephys GUI
-AppVersion=1.0.1
-AppVerName=Open Ephys GUI 1.0.1
-AppCopyright=Copyright (C) 2010-2025, Open Ephys & Contributors
+AppVersion=1.0.2
+AppVerName=Open Ephys GUI 1.0.2
+AppCopyright=Copyright (C) 2010-2026, Open Ephys & Contributors
 AppPublisher=open-ephys.org
 AppPublisherURL=https://open-ephys.org/gui
 DefaultDirName={autopf}\Open Ephys
diff --git a/Source/MainWindow.cpp b/Source/MainWindow.cpp
@@ -142,7 +142,17 @@ MainWindow::MainWindow (const File& fileToLoad, bool isConsoleApp_) : isConsoleA
 #ifdef JUCE_WINDOWS
         documentWindow->setUsingNativeTitleBar (false);
 #ifdef NDEBUG
-        ShowWindow (GetConsoleWindow(), SW_HIDE);
+        // Only hide console if launched by double-clicking (not from CLI)
+        // Check if console is attached to a parent process (CLI) or standalone
+        DWORD processList[2];
+        DWORD processCount = GetConsoleProcessList (processList, 2);
+
+        // If only 1 process (this app), it was launched by double-clicking
+        // If more than 1, it was launched from an existing console (CLI)
+        if (processCount == 1)
+        {
+            ShowWindow (GetConsoleWindow(), SW_HIDE);
+        }
 #endif
 #else
         documentWindow->setUsingNativeTitleBar (true); // Use native title bar on Mac and Linux
diff --git a/Source/Processors/AudioMonitor/AudioMonitor.cpp b/Source/Processors/AudioMonitor/AudioMonitor.cpp
@@ -169,7 +169,8 @@ void AudioMonitor::updateSettings()
         CategoricalParameter* spikeChanParam = (CategoricalParameter*) stream->getParameter ("spike_channel");
         spikeChanParam->setCategories (spikeChannelNames);
 
-        parameterValueChanged (stream->getParameter ("spike_channel"));
+        if (spikeChanParam->getSelectedIndex() > 0)
+            parameterValueChanged (stream->getParameter ("spike_channel"));
     }
 }
 
diff --git a/Source/Processors/FileReader/BinaryFileSource/BinaryFileSource.cpp b/Source/Processors/FileReader/BinaryFileSource/BinaryFileSource.cpp
@@ -131,6 +131,21 @@ void BinaryFileSource::fillRecordInfo()
         }
 
         int numChannels = record[idNumChannels];
+
+        // if numchannels is not equal to the size of channels var, skip this record
+        if (numChannels != channels.size())
+        {
+            LOGE ("Number of channels mismatch in stream: ", streamName);
+            continue;
+        }
+
+        // if numSamples is not a whole number, skip this record
+        if (dataFile.getSize() % (numChannels * sizeof (int16)) != 0)
+        {
+            LOGE ("File size is not consistent with number of channels in stream: ", streamName);
+            continue;
+        }
+
         int64 numSamples = (dataFile.getSize() / numChannels) / sizeof (int16);
 
         info.name = streamName;
diff --git a/Source/Processors/FileReader/FileReader.cpp b/Source/Processors/FileReader/FileReader.cpp
@@ -286,7 +286,7 @@ bool FileReader::setFile (String fullpath, bool shouldUpdateSignalChain)
     if (isEmptyFile)
     {
         input = nullptr;
-        showWarningAsync ("Failed to open file", "Continuous data file is missing or empty.");
+        showWarningAsync ("Failed to open file", "Continuous data file is missing, empty, or invalid.");
         CoreServices::sendStatusMessage ("Empty file. Ignoring open operation");
 
         return false;
diff --git a/Source/Processors/Parameter/Parameter.cpp b/Source/Processors/Parameter/Parameter.cpp
@@ -857,15 +857,14 @@ void SelectedChannelsParameter::setChannelCount (int newCount)
 
             currentValue = values;
         }
-        else if (channelCount == 0 && currentValue.getArray()->size() == 0) // If the current count is 0, set the selected channels to the first maxSelectableChannels channels
+        else if (channelCount == 0
+                 && currentValue.getArray()->size() == 0
+                 && maxSelectableChannels < std::numeric_limits<int>::max()) // If the current count is 0, set the selected channels to the first maxSelectableChannels channels
         {
-            for (int i = 0; i < maxSelectableChannels; i++)
-            {
-                if (i < newCount)
-                {
-                    values.add (i);
-                }
-            }
+            const int limit = jmin (maxSelectableChannels, newCount);
+            values.ensureStorageAllocated (limit);
+            for (int i = 0; i < limit; ++i)
+                values.add (i);
 
             currentValue = values;
         }
diff --git a/Source/Processors/Parameter/ParameterCollection.cpp b/Source/Processors/Parameter/ParameterCollection.cpp
@@ -96,6 +96,7 @@ void ParameterCollection::copyParameterValuesTo (ParameterOwner* pOwner)
             {
                 MaskChannelsParameter* targetMaskParam = (MaskChannelsParameter*) targetParam;
                 int targetChannelCount = targetMaskParam->getChannelCount();
+                const int savedChannelCount = owner.channel_count;
 
                 Array<var> filteredValues;
                 for (int i = 0; i < parameter->getValue().getArray()->size(); i++)
@@ -104,6 +105,15 @@ void ParameterCollection::copyParameterValuesTo (ParameterOwner* pOwner)
                     if (channelIndex >= 0 && channelIndex < targetChannelCount)
                         filteredValues.add (channelIndex);
                 }
+
+                // Auto-include any channels that exist on the device but were absent in the
+                // saved configuration (e.g., saved with fewer channels than currently available).
+                if (targetChannelCount > savedChannelCount)
+                {
+                    for (int ch = savedChannelCount; ch < targetChannelCount; ++ch)
+                        filteredValues.addIfNotAlreadyThere (ch);
+                }
+
                 targetParam->currentValue = filteredValues;
             }
             else if (parameter->getType() == Parameter::SELECTED_CHANNELS_PARAM)

Original file line number	Diff line number	Diff line change
`@@ -1268,6 +1268,11 @@ void LfpDisplayOptions::comboBoxChanged (ComboBox* cb)`
`1268`	`1268`	`selectedVoltageRange[selectedChannelType] = cb->getSelectedId();`
`1269`	`1269`	`selectedVoltageRangeValues[selectedChannelType] = cb->getText();`
`1270`	`1270`	`canvasSplit->redraw();`
	`1271`	`+`
	`1272`	`+ if (selectedChannelType == ContinuousChannel::Type::AUX && isAuxAutoScaleEnabled())`
	`1273`	`+ rangeSelectionLabel->setText ("Range", dontSendNotification);`
	`1274`	`+ else`
	`1275`	`+ rangeSelectionLabel->setText ("Range (" + rangeUnits[selectedChannelType] + ")", dontSendNotification);`
`1271`	`1276`	`}`
`1272`	`1277`	`else if (cb == spreadSelection.get())`
`1273`	`1278`	`{`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,8 @@ void AudioMonitor::updateSettings()`
`169`	`169`	`CategoricalParameter* spikeChanParam = (CategoricalParameter*) stream->getParameter ("spike_channel");`
`170`	`170`	`spikeChanParam->setCategories (spikeChannelNames);`
`171`	`171`
`172`		`- parameterValueChanged (stream->getParameter ("spike_channel"));`
	`172`	`+ if (spikeChanParam->getSelectedIndex() > 0)`
	`173`	`+ parameterValueChanged (stream->getParameter ("spike_channel"));`
`173`	`174`	`}`
`174`	`175`	`}`
`175`	`176`
Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ bool FileReader::setFile (String fullpath, bool shouldUpdateSignalChain)`
`286`	`286`	`if (isEmptyFile)`
`287`	`287`	`{`
`288`	`288`	`input = nullptr;`
`289`		`- showWarningAsync ("Failed to open file", "Continuous data file is missing or empty.");`
	`289`	`+ showWarningAsync ("Failed to open file", "Continuous data file is missing, empty, or invalid.");`
`290`	`290`	`CoreServices::sendStatusMessage ("Empty file. Ignoring open operation");`
`291`	`291`
`292`	`292`	`return false;`