everything works

egolol · egolol · commit ad561c74d893 · 2020-09-22T13:27:14.000+02:00
diff --git a/braph2/analysis/GUIMeasurement.m b/braph2/analysis/GUIMeasurement.m
@@ -1,4 +1,3 @@
-
 function GUIMeasurement(measurement_class, analysis, measure_rules)
 % GUIMEASUREMENT creates a UI figure to specify Measurement settings
 %
diff --git a/braph2/analysis/test_GUIAnalysis.m b/braph2/analysis/test_GUIAnalysis.m
@@ -21,3 +21,14 @@
 
 set(gcf, 'CloseRequestFcn', 'closereq')
 close(gcf)
+
+%% INIT CON
+
+analysis_file = [fileparts(which('example_workflow_CON_WU.m')) filesep() 'example data CON (DTI)' filesep() 'analysis_example_CON_BUT.analysis'];
+temp = load(analysis_file, '-mat', 'ga', 'BUILD');
+ga = temp.ga;
+
+GUIAnalysis(ga)
+
+% set(gcf, 'CloseRequestFcn', 'closereq')
+% close(gcf)
diff --git a/braph2/analysis/test_GUIAnalysisSettings.m b/braph2/analysis/test_GUIAnalysisSettings.m
@@ -31,7 +31,7 @@
 temp = load(cohort_file, '-mat', 'cohort', 'selected_group', 'selected_subjects', 'BUILD');
 cohort = temp.cohort;
 
-GUIAnalysisSettings(cohort, 'AnalysisCON_BUD')
+GUIAnalysisSettings(cohort, 'AnalysisCON_BUT')
 
-% set(gcf, 'CloseRequestFcn', 'closereq')
-% close(gcf)
+set(gcf, 'CloseRequestFcn', 'closereq')
+close(gcf)
diff --git a/braph2/workflows/Connectivity/AnalysisCON_BUT.m b/braph2/workflows/Connectivity/AnalysisCON_BUT.m
@@ -44,7 +44,7 @@
         function analysis = AnalysisCON_BUT(id, label, notes, cohort, measurements, randomcomparisons, comparisons, varargin)
             % AnalysisCON_BUT(ID, LABEL, NOTES, COHORT, MEASUREMENTS, RANDOMCOMPARISON, COMPARISONS)
             % creates a connectivity analysis of fixed threshold with ID, LABEL,
-            % COHORT, MEASUREMENTS, RANDOMCOMPARISON and COMPARISONS. It 
+            % COHORT, MEASUREMENTS, RANDOMCOMPARISON and COMPARISONS. It
             % initializes the ANALYSISST_WU with default settings.
             %
             % AnalysisCON_BUT(ID, LABEL, NOTES, COHORT, MEASUREMENTS, RANDOMCOMPARISON, COMPARISONS, PROPERTY, VALUE, ...)
@@ -53,7 +53,7 @@
             % initializes the ANALYSISST_WU with specified settings VALUES.
             %
             % See also MeasurementCON_WU, RandomComparisonCON_WU, ComparisonCON_WU.
-                 
+            
             analysis = analysis@AnalysisCON_WU(id, label, notes, cohort, measurements, randomcomparisons, comparisons, varargin{:});
         end
     end
@@ -65,12 +65,12 @@
             % creates a measurement ID with the ANALYSIS class, the
             % MEASURE_CODE, the GROUP and the THRESHOLD.
             %
-            % See also getRandomComparisonID, getComparisonID.            
+            % See also getRandomComparisonID, getComparisonID.
             
             measurement_id = getMeasurementID@AnalysisCON_WU(analysis, measure_code, group, varargin{:});
             
             threshold = get_from_varargin(0, 'threshold', varargin{:});
-            measurement_id = [measurement_id ' threshold=' num2str(threshold)];          
+            measurement_id = [measurement_id ' threshold=' num2str(threshold)];
         end
         function randomcomparison_id = getRandomComparisonID(analysis, measure_code, group, varargin)
             % GETRANDOMCOMPARISONID returns a random comparison ID
@@ -79,8 +79,8 @@
             % creates a random comparison ID with the ANALYSIS class, the
             % MEASURE_CODE, the GROUP and the THRESHOLD.
             %
-            % See also getMeasurementID, getComparisonID.            
-         
+            % See also getMeasurementID, getComparisonID.
+            
             randomcomparison_id = getRandomComparisonID@AnalysisCON_WU(analysis, measure_code, group, varargin{:});
             
             threshold = get_from_varargin(0, 'threshold', varargin{:});
@@ -142,7 +142,7 @@
             
             graph_type = analysis.getGraphType();
             graph = Graph.getGraph(graph_type, A);
-        end  
+        end
     end
     methods (Static)  % Descriptive functions
         function analysis_class = getClass()
@@ -182,7 +182,7 @@
         function graph_type = getGraphType()
             % GETGRAPHTYPE returns the compatible type of graph
             %
-            % GRAPH_TYPE = GETGRAPHTYPE() returns the compatible type of 
+            % GRAPH_TYPE = GETGRAPHTYPE() returns the compatible type of
             % graph 'GraphBU'.
             %
             % See also getSubjectClass.
@@ -221,7 +221,7 @@
             comparison_class = 'ComparisonCON_BUT';
         end
     end
-     methods  % plot methods
+    methods  % plot methods
         function p = getGlobalMeasurePlot(analysis, ui_parent_panel, ui_parent_axes, measure_code, group, subject, varargin) %#ok<INUSL>
             % GETGLOBALMEASUREPLOT creates a uipanel to contain a plot
             %
@@ -231,10 +231,10 @@
             %
             % See also getGraphPanel, getGlobalPanel.
             
-            X = analysis.selectMeasurements(measure_code, group, '.getThreshold()');            
+            X = analysis.selectMeasurements(measure_code, group, '.getThreshold()');
             if subject == 1
                 Y = analysis.selectMeasurements(measure_code, group, '.getGroupAverageValue()');
-            else 
+            else
                 measurements = analysis.selectMeasurements(measure_code, group, '.getMeasureValues()');
                 Y = cellfun(@(x) x(subject-1), measurements);
             end
diff --git a/braph2/workflows/Connectivity/AnalysisCON_WU.m b/braph2/workflows/Connectivity/AnalysisCON_WU.m
@@ -182,8 +182,8 @@
                 measure_code, ...
                 group,  ...
                 'MeasurementCON.values', measures, ...
-                'MeasurementCON.average_value', measure_average ...
-                );
+                'MeasurementCON.average_value', measure_average, ...
+                varargin{:});
         end
         function randomcomparison = calculate_random_comparison(analysis, measure_code, group, varargin)
             % CALCULATE_RANDOM_COMPARISON returns a random comparison
@@ -366,8 +366,8 @@
                 'ComparisonCON.p1', p1, ...
                 'ComparisonCON.p2', p2, ...
                 'ComparisonCON.confidence_min', ci_lower, ...
-                'ComparisonCON.confidence_max', ci_upper ...
-                );
+                'ComparisonCON.confidence_max', ci_upper, ...
+                varargin{:});
         end
     end
     methods (Static)  % Descriptive functions
diff --git a/braph2/workflows/Connectivity/MeasurementCON_BUT.m b/braph2/workflows/Connectivity/MeasurementCON_BUT.m
@@ -21,25 +21,25 @@
     % MeasurementCON_BUT plot methods (Static):
     %  getMeasurementSettingsPanel  - returns a UIPanel
     %
-    % See also Comparison, AnalysisCON_BUT, ComparisonCON_BUT, RandomComparisonCON_BUT. 
-   
+    % See also Comparison, AnalysisCON_BUT, ComparisonCON_BUT, RandomComparisonCON_BUT.
+    
     properties (Access = protected)
         threshold  % threshold of the values
     end
     methods  % Constructor
         function m =  MeasurementCON_BUT(id, label, notes, atlas, measure_code, group, varargin)
             % MEASUREMENTCON_BUT(ID, LABEL, NOTES, ATLAS, MEASURE_CODE, GROUP, 'threshold',  THRESHOLD)
             % creates a measurement with ID, LABEL, ATLAS and MEASURE_CODE
-            % with the data from GROUP, this data will have a fixed THRESHOLD. 
+            % with the data from GROUP, this data will have a fixed THRESHOLD.
             %
-            % MeasurementCON_BUT(ID, LABEL, NOTES, ATLAS, MEASURE_CODE, GROUP) 
+            % MeasurementCON_BUT(ID, LABEL, NOTES, ATLAS, MEASURE_CODE, GROUP)
             % creates a comparison with ID, LABEL, ATLAS, MEASURE_CODE,
             % with the data from GROUP, this data will have a fixed default threshold.
             %
             % See also ComparisonCON_BUT, RandomComparisonCON_BUT, AnalysisCON_BUT.
             
             m = m@MeasurementCON_WU(id, label, notes, atlas, measure_code, group, varargin{:});
-
+            
             threshold = get_from_varargin(0, 'threshold', varargin{:});
             m.setThreshold(threshold)
         end
@@ -48,9 +48,9 @@
         function setThreshold(m, threshold)
             % SETTHRESHOLD sets the measure value of the group
             %
-            % SETTHRESHOLD(M, THRESHOLD) sets the measure value of 
+            % SETTHRESHOLD(M, THRESHOLD) sets the measure value of
             % the group.
-            % 
+            %
             % See also getThreshold.
             
             m.threshold = threshold;
@@ -71,7 +71,7 @@ function setThreshold(m, threshold)
         function class = getClass()
             % GETCLASS returns the class of connectivity measurement BUT
             %
-            % ANALYSIS_CLASS = GETCLASS(ANALYSIS) returns the class of 
+            % ANALYSIS_CLASS = GETCLASS(ANALYSIS) returns the class of
             % measurement. In this case 'MeasurementCON_BUT'.
             %
             % See also getList, getName, getDescription.
@@ -102,17 +102,17 @@ function setThreshold(m, threshold)
                 ];
         end
         function analysis_class = getAnalysisClass()
-            % GETANALYSISCLASS returns the class of the analsysis 
+            % GETANALYSISCLASS returns the class of the analsysis
             %
             % ANALYSIS_CLASS = GETANALYSISCLASS() returns the class of the
             % analysis the measurement is part of, 'AnalysisCON_BUT'.
             %
             % See also getClass, getName, getDescription.
             
             analysis_class = 'AnalysisCON_BUT';
-        end     
+        end
     end
-     methods (Static)  % Plot functions
+    methods (Static)  % Plot functions
         function handle = getMeasurementSettingsPanel(analysis, uiparent) %#ok<INUSL>
             % GETCHILDPANEL returns a dynamic UIPanel
             %
@@ -179,4 +179,4 @@ function cb_measurement_max(src, ~)
                 str2double(get(ui_threshold_max_edit, 'String')))
         end
     end
-end 
+end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-`
`2`	`1`	`function GUIMeasurement(measurement_class, analysis, measure_rules)`
`3`	`2`	`% GUIMEASUREMENT creates a UI figure to specify Measurement settings`
`4`	`3`	`%`