Merge branch 'dev' of https://github.com/e0404/matRad into dev

amitantony · Jan 29, 2025 · b18964f · b18964f
2 parents f5a52e2 + e828dff
commit b18964f
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 7 deletions.
diff --git a/matRad/bioModels/matRad_BiologicalModel.m b/matRad/bioModels/matRad_BiologicalModel.m
@@ -126,7 +126,13 @@
             %Use the root folder and the biomodel folder only
             folders = {fileparts(mfilename('fullpath'))};
             folders = [folders matRad_cfg.userfolders];
-            metaBioModels = matRad_findSubclasses(meta.class.fromName(mfilename('class')),'folders',folders,'includeSubfolders',true);
+
+            persistent metaBioModels lastOptionalPaths
+            if isempty(metaBioModels) || (~isempty(lastOptionalPaths) && ~isequal(lastOptionalPaths, folders))
+                lastOptionalPaths = folders;
+                metaBioModels = matRad_findSubclasses(meta.class.fromName(mfilename('class')),'folders',folders,'includeSubfolders',true);
+            end
+
             classList = matRad_identifyClassesByConstantProperties(metaBioModels,'model','defaults',{'none'});
 
             if nargin > 0 

diff --git a/matRad/doseCalc/+DoseEngines/@matRad_DoseEngineBase/getAvailableEngines.m b/matRad/doseCalc/+DoseEngines/@matRad_DoseEngineBase/getAvailableEngines.m
@@ -36,7 +36,13 @@
 
 %Get available, valid classes through call to matRad helper function
 %for finding subclasses
-availableDoseEngines = matRad_findSubclasses('DoseEngines.matRad_DoseEngineBase','packages',{'DoseEngines'},'folders',optionalPaths,'includeAbstract',false);
+persistent allAvailableDoseEngines lastOptionalPaths
+if isempty(allAvailableDoseEngines) || (~isempty(lastOptionalPaths) && ~isequal(lastOptionalPaths, optionalPaths))
+    lastOptionalPaths = optionalPaths;
+    allAvailableDoseEngines = matRad_findSubclasses('DoseEngines.matRad_DoseEngineBase','packages',{'DoseEngines'},'folders',optionalPaths,'includeAbstract',false);
+end
+
+availableDoseEngines = allAvailableDoseEngines;
 
 %Now filter for pln
 ix = [];

diff --git a/matRad/gui/widgets/matRad_PlanWidget.m b/matRad/gui/widgets/matRad_PlanWidget.m
@@ -804,7 +804,7 @@
 
             matRad_cfg = MatRad_Config.instance();
 
-            stfGen = matRad_StfGeneratorBase.getGeneratorFromPln(pln);
+            stfGen = matRad_StfGeneratorBase.getGeneratorFromPln(pln, false);
 
             set(handles.editBixelWidth,'String',num2str(stfGen.bixelWidth));
             set(handles.editGantryAngle,'String',num2str(stfGen.gantryAngles));

diff --git a/matRad/scenarios/matRad_ScenarioModel.m b/matRad/scenarios/matRad_ScenarioModel.m
@@ -232,7 +232,12 @@ function listAllScenarios(this)
             %Use the root folder and the scenarios folder only
             folders = {fileparts(mfilename('fullpath'))};
             folders = [folders matRad_cfg.userfolders];
-            metaScenarioModels = matRad_findSubclasses(meta.class.fromName(mfilename('class')),'folders',folders,'includeSubfolders',true);
+
+            persistent metaScenarioModels lastOptionalPaths
+            if isempty(metaScenarioModels) || (~isempty(lastOptionalPaths) && ~isequal(lastOptionalPaths, folders))
+                lastOptionalPaths = folders;
+                metaScenarioModels = matRad_findSubclasses(meta.class.fromName(mfilename('class')),'folders',folders,'includeSubfolders',true);
+            end
             classList = matRad_identifyClassesByConstantProperties(metaScenarioModels,'shortName','defaults',{'nomScen'});
 
             if isempty(classList)

diff --git a/matRad/steering/matRad_StfGeneratorBase.m b/matRad/steering/matRad_StfGeneratorBase.m
@@ -337,10 +337,14 @@ function createPatientGeometry(this)
     end
 
     methods (Static)
-        function generator = getGeneratorFromPln(pln)
+        function generator = getGeneratorFromPln(pln, warnDefault)
             %GETENGINE Summary of this function goes here
             %   Detailed explanation goes here
 
+            if nargin < 2
+                warnDefault = true;
+            end
+
             matRad_cfg = MatRad_Config.instance();
 
             generator = [];
@@ -384,7 +388,9 @@ function createPatientGeometry(this)
                         generatorHandle = generatorHandle{1};
                     end
                     generator = generatorHandle(pln);
-                    matRad_cfg.dispWarning('Using default stf generator %s!', generator.name);
+                    if warnDefault
+                        matRad_cfg.dispWarning('Using default stf generator %s!', generator.name);
+                    end
                 elseif ~isempty(classList)
                     generatorHandle = classList(1).handle;
                     generator = generatorHandle(pln);
@@ -439,7 +445,13 @@ function createPatientGeometry(this)
 
             %Get available, valid classes through call to matRad helper function
             %for finding subclasses
-            availableStfGenerators = matRad_findSubclasses(mfilename('class'),'folders',optionalPaths,'includeAbstract',false);
+            persistent allAvailableStfGenerators lastOptionalPaths
+            if isempty(allAvailableStfGenerators) || (~isempty(lastOptionalPaths) && ~isequal(lastOptionalPaths, optionalPaths))
+                lastOptionalPaths = optionalPaths;
+                allAvailableStfGenerators = matRad_findSubclasses(mfilename('class'),'folders',optionalPaths,'includeAbstract',false);
+            end
+
+            availableStfGenerators = allAvailableStfGenerators;
 
             %Now filter for pln
             ix = [];