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

fixed too variing tf

parent a5df1979
No related branches found
No related tags found
No related merge requests found
......@@ -690,9 +690,9 @@ public class BigDataViewer
{
// final String fn = "http://tomancak-mac-17.mpi-cbg.de:8080/openspim/";
// final String fn = "/Users/Pietzsch/Desktop/openspim/datasetHDF.xml";
final String fn = "/Users/pietzsch/workspace/data/111010_weber_full.xml";
final String fn = "/home/michael/Dokumente/Uni/Masterarbeit/data/HisYFP-SPIM.xml";
//final String fn = "/home/michael/Dokumente/Uni/Masterarbeit/data/drosophila.xml";
// final String fn = "/Users/pietzsch/workspace/data/111010_weber_full.xml";
// final String fn = "/home/michael/Dokumente/Uni/Masterarbeit/data/HisYFP-SPIM.xml";
final String fn = "/home/michael/Dokumente/Uni/Masterarbeit/data/drosophila.xml";
// final String fn = "/Users/Pietzsch/Desktop/spimrec2/dataset.xml";
// final String fn = "/Users/pietzsch/Desktop/HisYFP-SPIM/dataset.xml";
// final String fn = "/Users/Pietzsch/Desktop/bdv example/drosophila 2.xml";
......
......@@ -73,6 +73,7 @@ public class InteraktionAnimator {
renderer.setOpacity3D((float)(currentAnimationPercentage)/ 100f);
renderWindow.getGlCanvas().repaint();
}
......
......@@ -43,7 +43,6 @@ public class VertexBuffer {
public void memcopyData(GL4 gl2, final Buffer data, int elementSize, int offset){
bind(gl2);
gl2.glBufferSubData(
GL4.GL_ARRAY_BUFFER,
offset,
......
......@@ -54,6 +54,8 @@ public class SceneControlsWindow extends JFrame {
*/
private static final long serialVersionUID = 1L;
private Point2D.Float addedTransfeFunctionPoint = null;
private TransferFunctionDrawPanel tfpanel = null;
private final JPanel mainPanel = new JPanel();
......@@ -391,9 +393,14 @@ public class SceneControlsWindow extends JFrame {
transferFunction.setMaxOrdinates(new Point2D.Float(dataManager.getGlobalMaxVolumeValue(), 1.0f));
float lowestDataPoint = dataManager.getGlobalLowestVolumeValue();
transferFunction.resetColors();
transferFunction.setColor(new Point2D.Float((maxVolume/dataManager.getGlobalMaxVolumeValue())*lowestDataPoint, 0.001f),
transferFunction.getColors().firstEntry().getValue());
if(addedTransfeFunctionPoint != null){
if(transferFunction.getColors().containsKey(addedTransfeFunctionPoint)){
transferFunction.removeColor(addedTransfeFunctionPoint);
}
}
addedTransfeFunctionPoint = new Point2D.Float((maxVolume/dataManager.getGlobalMaxVolumeValue())*lowestDataPoint, 0.001f);
transferFunction.setColor(addedTransfeFunctionPoint, transferFunction.getColors().firstEntry().getValue());
}
@Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment