Bug fix: Delete multiple SEEG electrodes with iEEG panel

brainstorm-tools · Mar 27, 2019 · 16b6bf9 · 16b6bf9
1 parent 3416421
commit 16b6bf9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/doc/license.html b/doc/license.html
@@ -3,7 +3,7 @@
 
 </head>
 <body alink="#fff000" link="#fff000" vlink="#fff000">
-<!-- LICENCE_START -->Version: 3.4 (26-Mar-2019)<br>
+<!-- LICENCE_START -->Version: 3.4 (27-Mar-2019)<br>
 <span style="font-style: italic;">COPYRIGHT &copy; 2000-2019
 USC &amp; McGill University.<br>
 </span>

diff --git a/doc/version.txt b/doc/version.txt
@@ -1,2 +1,2 @@
 % Brainstorm
-% v. 3.4 190326 (26-Mar-2019)
+% v. 3.4 190327 (27-Mar-2019)
diff --git a/toolbox/gui/panel_ieeg.m b/toolbox/gui/panel_ieeg.m
@@ -1058,10 +1058,10 @@ function RemoveElectrode()
     if ~java_dialog('confirm', strConfirm)
         return;
     end
-    % Loop on electrodes to delete
-    for iElec = 1:length(sSelElec)
-        % Loop on datasets
-        for iDS = unique(iDSall)
+    % Loop on datasets
+    for iDS = unique(iDSall)
+        % Loop on electrodes to delete
+        for iElec = 1:length(sSelElec)
             % If new implantation scheme: delete all the contacts for this electrode
             if isImplantation
                 % Get contacts for this electrode
@@ -1099,9 +1099,9 @@ function RemoveElectrode()
                 % Remove channels
                 GlobalData.DataSet(iDS).Channel(iChan) = [];
             end
-            % Delete electrode
-            GlobalData.DataSet(iDS).IntraElectrodes(iSelElec) = [];
         end
+        % Delete selected electrodes
+        GlobalData.DataSet(iDS).IntraElectrodes(iSelElec) = [];
     end
     % Mark channel file as modified (only the first one)
     GlobalData.DataSet(iDSall(1)).isChannelModified = 1;

diff --git a/toolbox/gui/panel_montage.m b/toolbox/gui/panel_montage.m
@@ -1211,7 +1211,7 @@ function DeleteMontage(MontageName)
                 continue;
             end
             % Not EEG or no 3D positions: Skip scalp current density
-            if strcmpi(GlobalData.ChannelMontages.Montages(i).Name, 'Scalp current density') && ~isempty(FigId.Modality) && ~ismember(FigId.Modality, {'EEG'}) && any(cellfun(@isempty, {FigChannels.Loc}))
+            if strcmpi(GlobalData.ChannelMontages.Montages(i).Name, 'Scalp current density') && ~isempty(FigId.Modality) && ~ismember(FigId.Modality, {'EEG'}) && any(cellfun(@isempty, {GlobalData.DataSet(iDS).Channel(iFigChannels).Loc}))
                 continue;
             end
             % Not CTF-MEG: Skip head motion distance