Register all used ds generator with Renderer

When using a generator it needs to be added to the renderer in order to be able to use its parameters Also filter the parameters from generator extension to just call the registered ones.
bioclipse · Aug 8, 2013 · 8541fc4 · 8541fc4
1 parent 36588b1
commit 8541fc4
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/plugins/net.bioclipse.ds.ui/src/net/bioclipse/ds/ui/ImageHelper.java b/plugins/net.bioclipse.ds.ui/src/net/bioclipse/ds/ui/ImageHelper.java
@@ -18,6 +18,7 @@
 import java.awt.image.BufferedImage;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -115,10 +116,9 @@ public static Image createImage( net.bioclipse.core.domain.IMolecule bcmol,
         generators.add(new BasicSceneGenerator());
 
         //Add all generators, we turn them on/off by a parameter now
-        BlueRedColorScaleGenerator generator=new BlueRedColorScaleGenerator();
-        PosNegIncColorGenerator gen2=new PosNegIncColorGenerator();
-        generators.add(generator);
-        generators.add( gen2 );
+        List<IGenerator<IAtomContainer>> extendsionGens = ChoiceGenerator
+                        .getGeneratorsFromExtension();
+        generators.addAll( extendsionGens );
 
         generators.add(new BasicBondGenerator());
         BasicAtomGenerator agen = new BasicAtomGenerator();
@@ -157,13 +157,14 @@ private static void enableSelectedExternalGenerators(ITestResult match,
 			RendererModel model) {
 
 		//Get all external generators and filter the ones registered in the model
-    	List<IGeneratorParameter<?>> parameters = model.getRenderingParameters();
+    	List<IGeneratorParameter<?>> parameters = new ArrayList<IGeneratorParameter<?>>();
     	List<IGenerator<IAtomContainer>> generators = ChoiceGenerator.getGeneratorsFromExtension();
 
     	for(IGenerator<IAtomContainer> gen:generators) {
     		List<IGeneratorParameter<?>> params = gen.getParameters();
-    		parameters.removeAll(params);
+    		parameters.addAll( params );
     	}
+        parameters.retainAll( model.getRenderingParameters() );
 
     	for(IGeneratorParameter<?> param : parameters) {
     			if (param.getDefault() instanceof Boolean) {