Online filters: Removed mirror option + disabled matrix filter by def…

…ault
brainstorm-tools · Jun 25, 2019 · be1cadd · be1cadd
1 parent 7c2b00b
commit be1cadd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 18 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.190620 (20-Jun-2019)<br>
+<!-- LICENCE_START -->Version: 3.190625 (25-Jun-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.190620 (20-Jun-2019)
+% v. 3.190625 (25-Jun-2019)
diff --git a/toolbox/core/bst_memory.m b/toolbox/core/bst_memory.m
@@ -889,7 +889,8 @@ function LoadRecordingsMatrix(iDS)
     isLowPass     = GlobalData.VisualizationFilters.LowPassEnabled;
     isHighPass    = GlobalData.VisualizationFilters.HighPassEnabled;
     isSinRemoval  = GlobalData.VisualizationFilters.SinRemovalEnabled;
-    isMirror      = GlobalData.VisualizationFilters.MirrorEnabled;
+    % isMirror      = GlobalData.VisualizationFilters.MirrorEnabled;
+    isMirror = 0;
     % Get time vector
     nTime = size(F,2);
     % Band-pass filter is active: apply it (only if real recordings => ignore time averages)

diff --git a/toolbox/gui/panel_filter.m b/toolbox/gui/panel_filter.m
@@ -22,7 +22,7 @@
 % For more information type "brainstorm license" at command prompt.
 % =============================================================================@
 %
-% Authors: Francois Tadel, 2008-2017
+% Authors: Francois Tadel, 2008-2019
 
 eval(macro_method);
 end
@@ -74,9 +74,9 @@
         jTextSinRem.setEnabled(0);
         jLabelSinRem = gui_component('label', jPanelFilter, [], ' Hz');
         % === MIRROR ===
-        jCheckMirror = gui_component('checkbox', jPanelFilter, 'br', 'Mirror signal before filtering', [], [], @CheckMirror_Callback);
+        % jCheckMirror = gui_component('checkbox', jPanelFilter, 'br', 'Mirror signal before filtering', [], [], @CheckMirror_Callback);
         % === FILTER SOURCES ===
-        jCheckFullSources = gui_component('checkbox', jPanelFilter, 'br', 'Filter full source files', [], [], @CheckFullSources_Callback);
+        jCheckFullSources = gui_component('checkbox', jPanelFilter, 'br', 'Filter all results', [], [], @CheckFullSources_Callback);
     jPanelTop.add(jPanelFilter, BorderLayout.CENTER);
 
     % Create the BstPanel object that is returned by the function
@@ -92,7 +92,7 @@
                                   'jCheckSinRem',    jCheckSinRem, ...
                                   'jTextSinRem',     jTextSinRem, ...
                                   'jLabelSinRem',    jLabelSinRem, ...
-                                  'jCheckMirror',    jCheckMirror, ...
+                                  ... 'jCheckMirror',    jCheckMirror, ...
                                   'jCheckFullSources', jCheckFullSources));
 
 
@@ -120,14 +120,14 @@ function CheckSinRemoval_Callback(varargin)
         UpdatePanel();
         ApplyFilters();
     end
-    % ===== MIRROR CHECK BOX =====
-    function CheckMirror_Callback(varargin)
-        global GlobalData;
-        GlobalData.VisualizationFilters.MirrorEnabled = jCheckMirror.isSelected();
-        if GlobalData.VisualizationFilters.SinRemovalEnabled || GlobalData.VisualizationFilters.LowPassEnabled || GlobalData.VisualizationFilters.HighPassEnabled
-            ApplyFilters();
-        end
-    end
+%     % ===== MIRROR CHECK BOX =====
+%     function CheckMirror_Callback(varargin)
+%         global GlobalData;
+%         GlobalData.VisualizationFilters.MirrorEnabled = jCheckMirror.isSelected();
+%         if GlobalData.VisualizationFilters.SinRemovalEnabled || GlobalData.VisualizationFilters.LowPassEnabled || GlobalData.VisualizationFilters.HighPassEnabled
+%             ApplyFilters();
+%         end
+%     end
     % ===== FULL SOURCES CHECKBOX =====
     function CheckFullSources_Callback(varargin)
         global GlobalData;
@@ -231,7 +231,7 @@ function UpdatePanel()
     ctrl.jCheckHighpass.setSelected(Filters.HighPassEnabled);
     ctrl.jCheckLowpass.setSelected(Filters.LowPassEnabled);
     ctrl.jCheckSinRem.setSelected(Filters.SinRemovalEnabled);
-    ctrl.jCheckMirror.setSelected(Filters.MirrorEnabled);
+    % ctrl.jCheckMirror.setSelected(Filters.MirrorEnabled);
     ctrl.jCheckFullSources.setSelected(Filters.FullSourcesEnabled);
     % Change tab color
     if (Filters.HighPassEnabled || Filters.LowPassEnabled || (Filters.SinRemovalEnabled && ~isempty(Filters.SinRemovalValue)))

diff --git a/toolbox/gui/view_matrix.m b/toolbox/gui/view_matrix.m
@@ -31,7 +31,9 @@
 % For more information type "brainstorm license" at command prompt.
 % =============================================================================@
 %
-% Authors: Francois Tadel, 2010-2015
+% Authors: Francois Tadel, 2010-2019
+
+global GlobalData;
 
 % ===== READ INPUTS =====
 % Read matrix file
@@ -70,7 +72,7 @@
     Value = sMat.Value;
     Std   = sMat.Std;
     % Apply online filters
-    if (size(Value,2) > 50)
+    if (size(Value,2) > 50) && GlobalData.VisualizationFilters.FullSourcesEnabled
         sfreq = 1 ./ (sMat.Time(2) - sMat.Time(1));
         Value = bst_memory('FilterLoadedData', Value, sfreq);
     end