refactorings

src/main/java/bdv/jogl/VolumeRenderer/VolumeRendererExtension.java

@@ -34,8 +34,8 @@ import bdv.jogl.VolumeRenderer.gui.DetailViewConfiguration;
 import bdv.jogl.VolumeRenderer.gui.SceneControlsWindow;
 import bdv.jogl.VolumeRenderer.gui.GLWindow.CameraMotionListener;
 import bdv.jogl.VolumeRenderer.gui.GLWindow.GLWindow;
-import bdv.jogl.VolumeRenderer.gui.VDataAggregationPanel.AggregatorManager;
-import bdv.jogl.VolumeRenderer.gui.VDataAggregationPanel.IVolumeAggregationListener;
+import bdv.jogl.VolumeRenderer.gui.VDataAccumulationPanel.AccumulatorManager;
+import bdv.jogl.VolumeRenderer.gui.VDataAccumulationPanel.IVolumeAccumulatorListener;
 import bdv.jogl.VolumeRenderer.gui.VolumeRendereActions.OpenVolumeRendererAction;
 import bdv.jogl.VolumeRenderer.utils.VolumeDataBlock;
 import bdv.jogl.VolumeRenderer.utils.VolumeDataManager;
@@ -65,7 +65,7 @@ public class VolumeRendererExtension {
 
 	private final TransferFunction1D transferFunction = new TransferFunction1D();
 
-	private final AggregatorManager aggManager = new AggregatorManager();
+	private final AccumulatorManager aggManager = new AccumulatorManager();
 
 	private final BigDataViewerDataSelector selector;
 	
@@ -116,7 +116,7 @@ public class VolumeRendererExtension {
 	private void createListeners() {
 		//source changes 
 		volumeRenderer.setAccumulator(aggManager.getAccumulator( aggManager.getActiveAccumulator()));
-		aggManager.addListener(new IVolumeAggregationListener() {
+		aggManager.addListener(new IVolumeAccumulatorListener() {
 
 			@Override
 			public void aggregationChanged(AbstractVolumeAccumulator acc) {

src/main/java/bdv/jogl/VolumeRenderer/gui/SceneControlsWindow.java

@@ -36,8 +36,8 @@ import bdv.jogl.VolumeRenderer.gui.GLWindow.GLWindow;
 import bdv.jogl.VolumeRenderer.gui.TFDataPanel.TransferFunctionDataPanel;
 import bdv.jogl.VolumeRenderer.gui.TFDrawPanel.TransferFunctionDrawPanel;
 import bdv.jogl.VolumeRenderer.gui.TFDrawPanel.VolumeLegend;
-import bdv.jogl.VolumeRenderer.gui.VDataAggregationPanel.AggregatorManager;
-import bdv.jogl.VolumeRenderer.gui.VDataAggregationPanel.VolumeDataAggregationPanel;
+import bdv.jogl.VolumeRenderer.gui.VDataAccumulationPanel.AccumulatorManager;
+import bdv.jogl.VolumeRenderer.gui.VDataAccumulationPanel.VolumeDataAccumulatorPanel;
 import bdv.jogl.VolumeRenderer.utils.VolumeDataManager;
 import bdv.jogl.VolumeRenderer.utils.VolumeDataManagerAdapter;
 import static bdv.jogl.VolumeRenderer.utils.WindowUtils.aligneLeft;
@@ -62,7 +62,7 @@ public class SceneControlsWindow extends JFrame {
 
 	private TransferFunction1D transferFunction;
 
-	private VolumeDataAggregationPanel aggregationPanel;
+	private VolumeDataAccumulatorPanel aggregationPanel;
 
 	private JCheckBox usePreIntegration = new JCheckBox("Use pre-integration",false);
 
@@ -124,7 +124,7 @@ public class SceneControlsWindow extends JFrame {
 	
 	public SceneControlsWindow(
 			final TransferFunction1D tf,
-			final AggregatorManager agm, 
+			final AccumulatorManager agm, 
 			final VolumeDataManager dataManager, 
 			final MultiVolumeRenderer mvr, 
 			final GLWindow win,
@@ -152,10 +152,10 @@ public class SceneControlsWindow extends JFrame {
 		mainPanel.add(c);
 	}
 
-	private void createTFWindow(final TransferFunction1D tf,final AggregatorManager agm,final VolumeDataManager dataManager){
+	private void createTFWindow(final TransferFunction1D tf,final AccumulatorManager agm,final VolumeDataManager dataManager){
 		tfpanel = new TransferFunctionDrawPanel(tf,dataManager);
 		tfDataPanel = new TransferFunctionDataPanel(tf);
-		aggregationPanel = new VolumeDataAggregationPanel(agm);
+		aggregationPanel = new VolumeDataAccumulatorPanel(agm);
 
 
 		setTitle("Transfer function configurations");

src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAggregationPanel/AggregatorManager.java → src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAccumulationPanel/AccumulatorManager.java

-package bdv.jogl.VolumeRenderer.gui.VDataAggregationPanel;
+package bdv.jogl.VolumeRenderer.gui.VDataAccumulationPanel;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,9 +22,9 @@ import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulato
  * @author michael
  *
  */
-public class AggregatorManager {
+public class AccumulatorManager {
 	
-	private List<IVolumeAggregationListener> listeners = new ArrayList<IVolumeAggregationListener>();
+	private List<IVolumeAccumulatorListener> listeners = new ArrayList<IVolumeAccumulatorListener>();
 	
 	private Map<String, AbstractVolumeAccumulator> accumulators = new HashMap<String, AbstractVolumeAccumulator>();
 	
@@ -32,12 +32,12 @@ public class AggregatorManager {
 	
 	private String activeAccumulatorName;
 	
-	private void notifyChanged(IVolumeAggregationListener listener){
+	private void notifyChanged(IVolumeAccumulatorListener listener){
 		listener.aggregationChanged(accumulators.get(activeAccumulatorName));
 	}
 	
 	private void notifyChangedAll(){
-		for(IVolumeAggregationListener listener: listeners){
+		for(IVolumeAccumulatorListener listener: listeners){
 			notifyChanged(listener);
 		}
 	}
@@ -63,7 +63,7 @@ public class AggregatorManager {
 		return beautified;
 	}
 
-	public AggregatorManager(){
+	public AccumulatorManager(){
 		MaximumVolumeAccumulator max =new MaximumVolumeAccumulator();
 	
 		addAccumulator(new MaximumVolumeAccumulator());
@@ -83,7 +83,7 @@ public class AggregatorManager {
 	 * Adds aggregation listener
 	 * @param listener
 	 */
-	public void addListener(IVolumeAggregationListener listener){
+	public void addListener(IVolumeAccumulatorListener listener){
 		this.listeners.add(listener);
 	} 
 

src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAggregationPanel/IVolumeAggregationListener.java → src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAccumulationPanel/IVolumeAccumulatorListener.java

-package bdv.jogl.VolumeRenderer.gui.VDataAggregationPanel;
+package bdv.jogl.VolumeRenderer.gui.VDataAccumulationPanel;
 
 import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.AbstractVolumeAccumulator;
 
@@ -7,7 +7,7 @@ import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulato
  * @author michael
  *
  */
-public interface IVolumeAggregationListener {
+public interface IVolumeAccumulatorListener {
 
 	/**
 	 * Is called if the accumulation changes

src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAggregationPanel/VolumeDataAggregationPanel.java → src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAccumulationPanel/VolumeDataAccumulatorPanel.java

-package bdv.jogl.VolumeRenderer.gui.VDataAggregationPanel;
+package bdv.jogl.VolumeRenderer.gui.VDataAccumulationPanel;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -16,7 +16,7 @@ import javax.swing.JRadioButton;
  * @author michael
  *
  */
-public class VolumeDataAggregationPanel extends JPanel {
+public class VolumeDataAccumulatorPanel extends JPanel {
 	
 	/**
 	 * default version
@@ -27,7 +27,7 @@ public class VolumeDataAggregationPanel extends JPanel {
 	
 	private List<JRadioButton> aggregationButtons = new LinkedList<JRadioButton>();
 	
-	private final AggregatorManager dataManager;
+	private final AccumulatorManager dataManager;
 	
 	private ActionListener radioListener = new ActionListener() {
 		@Override
@@ -37,7 +37,7 @@ public class VolumeDataAggregationPanel extends JPanel {
 	}; 
 	
 	private void initPanel(){
-		setBorder(BorderFactory.createTitledBorder("Volume data Aggregation types"));
+		setBorder(BorderFactory.createTitledBorder("Volume data accumulators"));
 		setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
 		
 		//create buttons
@@ -60,7 +60,7 @@ public class VolumeDataAggregationPanel extends JPanel {
 		}
 	}
 	
-	public VolumeDataAggregationPanel(final AggregatorManager manager){
+	public VolumeDataAccumulatorPanel(final AccumulatorManager manager){
 		this.dataManager = manager;
 		initPanel();
 	}