Skip to content
Snippets Groups Projects
Commit 7e7d7ba1 authored by Michael Heyde's avatar Michael Heyde
Browse files

Merge branch 'michael_heyde_masterarbeit' of...

Merge branch 'michael_heyde_masterarbeit' of github.com:mheyde/bigdataviewer-core into michael_heyde_masterarbeit

Conflicts:
	src/main/java/bdv/jogl/VolumeRenderer/VolumeRendererExtension.java
	src/main/java/bdv/jogl/VolumeRenderer/gui/SceneControlsWindow.java
	src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAccumulationPanel/AccumulatorManager.java
	src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAccumulationPanel/IVolumeAccumulatorListener.java
	src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAccumulationPanel/VolumeDataAccumulatorPanel.java
	src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAggregationPanel/AccumulatorManager.java
	src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAggregationPanel/AggregatorManager.java
	src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAggregationPanel/IVolumeAccumulatorListener.java
	src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAggregationPanel/IVolumeAggregationListener.java
	src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAggregationPanel/VolumeDataAccumulatorPanel.java
	src/main/java/bdv/jogl/VolumeRenderer/gui/VDataAggregationPanel/VolumeDataAggregationPanel.java
parents 9639b98d d1827093
No related branches found
No related tags found
No related merge requests found
......@@ -32,8 +32,8 @@ import com.jogamp.opengl.GL4;
* @author michael
*
*/
public class MaxCurvatureDifference extends AbstractVolumeAccumulator {
public MaxCurvatureDifference() {
public class MaxCurvatureDifferenceAccumulator extends AbstractVolumeAccumulator {
public MaxCurvatureDifferenceAccumulator() {
super("difference_total_curvature");
}
......
......@@ -12,9 +12,9 @@ import java.util.List;
* @author michael
*
*/
public class MidmapMaxDifference extends AbstractVolumeAccumulator {
public class MidmapMaxDifferenceAccumulator extends AbstractVolumeAccumulator {
public MidmapMaxDifference(){
public MidmapMaxDifferenceAccumulator(){
super("difference_of_midmap_area");
}
......
......@@ -4,18 +4,17 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.AbstractVolumeAccumulator;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.AverageVolumeAccumulator;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.MaxCurvatureDifference;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.MaxCurvatureDifferenceAccumulator;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.MaxDifferenceAccumulator;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.MaximumVolumeAccumulator;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.MidmapMaxDifference;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.MidmapMaxDifferenceAccumulator;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.MinimumVolumeAccumulator;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.SharpnessVolumeAccumulator;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.ViewDirectionAccumulator;
import bdv.jogl.VolumeRenderer.ShaderPrograms.ShaderSources.functions.accumulator.VoxelDistanceAccumulator;
/**
* Stores aggregators and calls listeners
......@@ -72,8 +71,8 @@ public class AccumulatorManager {
addAccumulator(new ViewDirectionAccumulator());
addAccumulator(new SharpnessVolumeAccumulator());
addAccumulator(new MaxDifferenceAccumulator());
addAccumulator(new MidmapMaxDifference());
addAccumulator(new MaxCurvatureDifference());
addAccumulator(new MidmapMaxDifferenceAccumulator());
addAccumulator(new MaxCurvatureDifferenceAccumulator());
// addAccumulator(new VoxelDistanceAccumulator());
setActiveAcumulator( beautifyaccumulatorFuncName(max.getFunctionName()));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment