Skip to content

Commit 53e23fe

Browse files
committed
Removed some comments and command promt output, renamed tests
1 parent 8272c01 commit 53e23fe

File tree

6 files changed

+6
-17
lines changed

6 files changed

+6
-17
lines changed

+eui/ConditionPanel.m

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
% See also EUI.PARAMEDITOR, EUI.FIELDPANEL
4646
obj.ParamEditor = ParamEditor;
4747
obj.UIPanel = uix.VBox('Parent', f);
48-
% obj.UIPanel.BackgroundColor = 'white';
4948
% Create a child menu for the uiContextMenus
5049
c = uicontextmenu;
5150
obj.UIPanel.UIContextMenu = c;
@@ -71,7 +70,6 @@
7170
% Create button panel to hold condition control buttons
7271
obj.ButtonPanel = uix.HBox('Parent', obj.UIPanel);
7372
% Define some common properties
74-
% props.BackgroundColor = 'white';
7573
props.Style = 'pushbutton';
7674
props.Units = 'normalized';
7775
props.Parent = obj.ButtonPanel;
@@ -107,7 +105,6 @@ function onEdit(obj, src, eventData)
107105
% and eventData contains the table indices of the edited cell.
108106
%
109107
% See also FILLCONDITIONTABLE, EUI.PARAMEDITOR/UPDATE
110-
disp('updating table cell');
111108
row = eventData.Indices(1);
112109
col = eventData.Indices(2);
113110
assert(all(cellfun(@strcmpi, strrep(obj.ConditionTable.ColumnName, ' ', ''), ...
@@ -143,7 +140,6 @@ function delete(obj)
143140
% DELETE Deletes the UI container
144141
% Called when this object or its parant ParamEditor is deleted
145142
% See also CLEAR
146-
disp('delete called');
147143
delete(obj.UIPanel);
148144
end
149145

@@ -223,7 +219,6 @@ function setSelectedValues(obj)
223219
% false % Sets all selected rows to false
224220
%
225221
% See also SETNEWVALS, ONEDIT
226-
disp('updating table cells');
227222
cols = obj.SelectedCells(:,2); % selected columns
228223
uCol = unique(obj.SelectedCells(:,2));
229224
rows = obj.SelectedCells(:,1); % selected rows
@@ -307,7 +302,6 @@ function newCondition(obj)
307302
% Adds new row and populates it with sensible 'default' values.
308303
% These are mostly zeros or empty values.
309304
% See also eui.ParamEditor/addEmptyConditionToParam
310-
disp('adding new condition row');
311305
PE = obj.ParamEditor;
312306
cellfun(@PE.addEmptyConditionToParam, ...
313307
PE.Parameters.TrialSpecificNames);

+eui/FieldPanel.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
uimenu(obj.ContextMenu, 'Label', 'Make Conditional', ...
6666
'MenuSelectedFcn', @(~,~)obj.makeConditional);
6767
end
68-
% props.BackgroundColor = 'white';
6968
props.TooltipString = obj.ParamEditor.Parameters.description(name);
7069
props.HorizontalAlignment = 'left';
7170
props.UIContextMenu = obj.ContextMenu;
@@ -89,7 +88,6 @@ function onEdit(obj, src, id)
8988
% property of the label and control elements).
9089
%
9190
% See also ADDFIELD, EUI.PARAMEDITOR/UPDATE
92-
disp(id);
9391
switch get(src, 'style')
9492
case 'checkbox'
9593
newValue = logical(get(src, 'value'));
@@ -160,7 +158,6 @@ function delete(obj)
160158
% DELETE Deletes the UI container
161159
% Called when this object or its parant ParamEditor is deleted
162160
% See also CLEAR
163-
disp('delete called');
164161
delete(obj.UIPanel);
165162
end
166163

+eui/MControl.m

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,6 @@ function saveParamProfile(obj) % Called by 'Save...' button press, save a new pa
247247
end
248248

249249
function loadParamProfile(obj, profile)
250-
tic
251250
set(obj.ParamProfileLabel, 'String', 'loading...', 'ForegroundColor', [1 0 0]); % Red 'Loading...' while new set loads
252251
if ~isempty(obj.ParamEditor)
253252
% Clear existing parameters control
@@ -317,7 +316,6 @@ function loadParamProfile(obj, profile)
317316
if strcmp(obj.RemoteRigs.Selected.Status, 'idle')
318317
set(obj.BeginExpButton, 'Enable', 'on') % Re-enable start button
319318
end
320-
disp(toc)
321319
end
322320

323321
function paramChanged(obj)
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
classdef ParamEditorPerfTest < matlab.perftest.TestCase
1+
classdef ParamEditor_perf < matlab.perftest.TestCase
22

33
properties
44
% Figure visibility setting before running tests
@@ -23,7 +23,7 @@ function setup(testCase)
2323
% Loads validation data
2424
% Graph data is a cell array where each element is the graph number
2525
% (1:3) and within each element is a cell of X- and Y- axis values
26-
% respecively
26+
% respectively
2727
testCase.Parameters = exp.choiceWorldParams;
2828

2929
% Check paths file
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
classdef ParamEditorTest < matlab.unittest.TestCase
1+
classdef ParamEditor_test < matlab.unittest.TestCase
22

33
properties
44
% Figure visibility setting before running tests
@@ -29,7 +29,7 @@ function setup(testCase)
2929
% Loads validation data
3030
% Graph data is a cell array where each element is the graph number
3131
% (1:3) and within each element is a cell of X- and Y- axis values
32-
% respecively
32+
% respectively
3333
testCase.Parameters = exp.choiceWorldParams;
3434

3535
% Check paths file
@@ -242,7 +242,7 @@ function test_deleteCondition(testCase)
242242
function test_setValues(testCase)
243243
% TODO Add test for the set values button. For now let's fail this
244244
testCase.assertTrue(~testCase.Changed, 'Changed flag incorrect')
245-
PE = testCase.ParamEditor;
245+
% PE = testCase.ParamEditor;
246246
testCase.assertTrue(false, 'Test not implemented')
247247
end
248248

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
classdef ParametersTest < matlab.unittest.TestCase
1+
classdef Parameters_test < matlab.unittest.TestCase
22

33
properties
44
% Parameters object

0 commit comments

Comments
 (0)