rework of animation player and renderer

Author: ekatrukha

src/main/java/bigtrace/BigTraceControlPanel.java

@@ -84,7 +84,7 @@ public class BigTraceControlPanel< T extends RealType< T > & NativeType< T > > e
 	final RoiManager3D<T> roiManager;
 	final RoiMeasure3D<T> roiMeasure;
 	TrackingPanel<T> btTracksPanel;
-	public AnimationPanel <T> btAniPanel;
+	public AnimationPanel btAniPanel;
 
 	double [][] nDisplayMinMax;
 
@@ -111,7 +111,7 @@ public BigTraceControlPanel(final BigTrace<T> bt_,final BigTraceData<T> btd_, fi
 		btTracksPanel = new TrackingPanel<>(bt);
 		roiManager.setRoiMeasure3D(roiMeasure);
 		roiManager.setTracksPanel(btTracksPanel);
-		btAniPanel = new AnimationPanel<>(bt);
+		btAniPanel = new AnimationPanel(bt);
 
 		JTabbedPane tabPane = new JTabbedPane(SwingConstants.LEFT);
 

src/main/java/bigtrace/animation/AnimationPanel.java

@@ -39,10 +39,6 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-
-import net.imglib2.type.NativeType;
-import net.imglib2.type.numeric.RealType;
-
 import bigtrace.BigTrace;
 import bigtrace.gui.NumberField;
 import bigtrace.gui.PanelTitle;
@@ -54,9 +50,9 @@
 import ij.io.OpenDialog;
 import ij.io.SaveDialog;
 
-public class AnimationPanel < T extends RealType< T > & NativeType< T > > extends JPanel implements ListSelectionListener,  NumberField.Listener, ChangeListener, ActionListener
+public class AnimationPanel extends JPanel implements ListSelectionListener,  NumberField.Listener, ChangeListener, ActionListener
 {
-	final BigTrace<T> bt;
+	final BigTrace<?> bt;
 
 	final JButton butRecord;
 	final JButton butPlayStop;
@@ -82,7 +78,7 @@ public class AnimationPanel < T extends RealType< T > & NativeType< T > > extend
 
 	final public NumberField nfTotalTime;
 
-	public static final int ANIMTIME_START=0, ANIMTIME_END=1, ANIMTIME_STRETCH=2;
+	public static final int ANIMTIME_START = 0, ANIMTIME_END = 1, ANIMTIME_STRETCH = 2;
 
 	int nChangeTotalTimeMode = (int)Prefs.get("BigTrace.nChangeTotalTimeMode", ANIMTIME_END);
 
@@ -94,22 +90,20 @@ public class AnimationPanel < T extends RealType< T > & NativeType< T > > extend
 	int tsSpan = 100;
 
 	/** play preview **/
-	AnimationPlayer<T> player;
+	final AnimationPlayer player;
 
 	ImageIcon tabIconRecord;
 
 	ImageIcon tabIconPlay;
 
 	ImageIcon tabIconStop;
 
-	float fPlaySpeedFactor  = 1.0f ;
-	
 	boolean bPlayerBackForth = Prefs.get("BigTrace.bPlayerBackForth", false);
 
 	boolean bUpdateSlider = true;
 
 	/** keyframe render **/
-	AnimationRender<T> render;
+	AnimationRender render;
 
 	int nRenderFPS = (int)Prefs.get("BigTrace.nRenderFPS", 24.0);
 
@@ -125,13 +119,13 @@ public class AnimationPanel < T extends RealType< T > & NativeType< T > > extend
 
 	String sRenderSavePath = null;
 
-	final AnimationPanelDialogs<T> dialogsAnim;
+	final AnimationPanelDialogs dialogsAnim;
 
-	public AnimationPanel(final BigTrace<T> bt)
+	public AnimationPanel(final BigTrace<?> bt)
 	{
 		this.bt = bt;
 
-		dialogsAnim = new AnimationPanelDialogs<>(bt, this);
+		dialogsAnim = new AnimationPanelDialogs(bt, this);
 
 		int nInitialTotalTime = 5;
 
@@ -140,7 +134,7 @@ public AnimationPanel(final BigTrace<T> bt)
 
 		kfAnim = new KeyFrameAnimation(listModel);
 		kfAnim.setTotalTime( nInitialTotalTime );
-		this.player = null;
+		this.player = new AnimationPlayer(bt, this);
 
 		JPanel panAnimTools = new JPanel(new GridBagLayout());  
 		panAnimTools.setBorder(new PanelTitle(" Animation "));
@@ -423,7 +417,7 @@ void sortListModel()
 
 	void runRender()
 	{
-		render = new AnimationRender< >(bt, this);
+		render = new AnimationRender(bt, this);
 		bt.bInputLock = true;
 		bt.setLockMode(true);
 		render.addPropertyChangeListener( bt.btPanel );
@@ -436,21 +430,6 @@ void runRender()
 		render.execute();
 	}
 
-	void runPlayer()
-	{
-		player = new AnimationPlayer< >(bt, this);
-		bt.bInputLock = true;
-		bt.setLockMode(true);
-		player.addPropertyChangeListener( bt.btPanel );
-		
-		butPlayStop.setEnabled( true );
-		butPlayStop.setIcon( tabIconStop );
-		butPlayStop.setToolTipText( "Stop playing" );
-		player.butPlayStop = butPlayStop;
-		player.tabIconPlay = tabIconPlay; 
-		player.execute();
-	}
-	
 	@Override
 	public void actionPerformed( ActionEvent e )
 	{
@@ -460,7 +439,7 @@ public void actionPerformed( ActionEvent e )
 		{
 			if(listModel.size() > 0)
 			{
-				if(!bt.bInputLock )
+				if(!bt.bInputLock)
 				{
 					if(dialogsAnim.dialRenderSettings())
 					{
@@ -488,18 +467,12 @@ public void actionPerformed( ActionEvent e )
 			{
 				if(!bt.bInputLock )
 				{
-					runPlayer();
+					if(!player.isPlaying())
+						player.play();
 				}
 				else
 				{
-					if( bt.bInputLock && 
-							butPlayStop.isEnabled() && 
-							player!=null && 
-							!player.isCancelled() && 
-							!player.isDone())
-					{
-						player.cancel( false );
-					}
+					player.stop();
 				}
 			}
 			else
@@ -866,11 +839,10 @@ protected void paintComponent(Graphics g)
 	    }
 	}
 
-	public void updateScene()
+	public void updateScene(final float fTimePoint)
 	{			
 		if(listModel.size() > 1)
 		{
-			float fTimePoint = (kfAnim.getTotalTime())*(timeSlider.getValue()/(float)tsSpan);
 			bt.setScene( kfAnim.getScene( fTimePoint ) );
 		}
 	}
@@ -883,7 +855,8 @@ public void stateChanged( ChangeEvent e )
 		{
 			if(bUpdateSlider)
 			{
-				updateScene();
+				float fTimePoint = (kfAnim.getTotalTime())*(timeSlider.getValue()/(float)tsSpan);
+				updateScene(fTimePoint);
 			}
 		}
 
@@ -904,7 +877,7 @@ void dialStorylineSave()
 
 	        bt.setLockMode(true);
 	        bt.bInputLock = true;
-	        StorylineSave<T> stSave  = new StorylineSave<>(bt, this);
+	        StorylineSave stSave  = new StorylineSave(bt, this);
 	        stSave.saveAnimation( filename );
 	        bt.setLockMode(false);
 	        bt.bInputLock = false;
@@ -926,7 +899,7 @@ void dialStorylineLoad()
         filename = path + openDial.getFileName();	
         bt.setLockMode(true);
         bt.bInputLock = true;
-        StorylineLoad<T> stLoad  = new StorylineLoad<>(bt, this);
+        StorylineLoad stLoad  = new StorylineLoad(bt, this);
         stLoad.loadAnimation( filename );
         bt.setLockMode(false);
         bt.bInputLock = false;

src/main/java/bigtrace/animation/AnimationPanelDialogs.java

@@ -15,8 +15,6 @@
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import net.imglib2.type.NativeType;
-import net.imglib2.type.numeric.RealType;
 import net.imglib2.util.LinAlgHelpers;
 
 import bigtrace.BigTrace;
@@ -29,13 +27,13 @@
 import ij.Prefs;
 import ij.io.OpenDialog;
 
-public class AnimationPanelDialogs< T extends RealType< T > & NativeType< T > >
+public class AnimationPanelDialogs
 {
-	final BigTrace<T> bt;
+	final BigTrace<?> bt;
 
-	final AnimationPanel<T> pan;
+	final AnimationPanel pan;
 
-	public AnimationPanelDialogs(final BigTrace<T> bt_, final AnimationPanel<T> pan_)
+	public AnimationPanelDialogs(final BigTrace<?> bt_, final AnimationPanel pan_)
 	{
 		bt = bt_;
 		pan = pan_;
@@ -116,18 +114,18 @@ void dialPlayerSettings()
 		DecimalFormat df = new DecimalFormat("0.000", decimalFormatSymbols);
 
 		final NumberField nfSpeedFactor = new NumberField(4);
-		nfSpeedFactor.setText(df.format(pan.fPlaySpeedFactor));
+		nfSpeedFactor.setText(df.format(pan.player.getPlaybackSpeed()));
 
-		cd.gridx=0;
-		cd.gridy=0;	
+		cd.gridx = 0;
+		cd.gridy = 0;	
 		panPlayerSettings.add(new JLabel("Play speed (0.01-100):"),cd);
 		cd.gridx++;
 		panPlayerSettings.add(nfSpeedFactor, cd);	
 
 		JCheckBox cbBackForth = new JCheckBox();
 		cbBackForth.setSelected( Prefs.get("BigTrace.bPlayerBackForth", false) );
 		cd.gridy++;
-		cd.gridx=0;
+		cd.gridx = 0;
 		panPlayerSettings.add(new JLabel("Loop back and forth"),cd);
 		cd.gridx++;
 		panPlayerSettings.add(cbBackForth,cd);
@@ -136,14 +134,10 @@ void dialPlayerSettings()
 				JOptionPane.OK_CANCEL_OPTION, JOptionPane.PLAIN_MESSAGE);
 		if (reply == JOptionPane.OK_OPTION) 
 		{
-			
-			pan.fPlaySpeedFactor = ( float ) Math.min(Math.max( 0.01,Math.abs( Float.parseFloat( nfSpeedFactor.getText()))),100);
+			pan.player.setPlaybackSpeed( ( float ) Math.min(Math.max( 0.01,Math.abs( Float.parseFloat( nfSpeedFactor.getText()))),100));
 
 			pan.bPlayerBackForth = cbBackForth.isSelected();
-			Prefs.set("BigTrace.bPlayerBackForth", pan.bPlayerBackForth);
-			
-			
-		
+			Prefs.set("BigTrace.bPlayerBackForth", pan.bPlayerBackForth);	
 		}
 	}
 
@@ -300,7 +294,7 @@ public void dialUnCoilAnimation(final Roi3D roiIn)
 				}
 			}
 
-			UnCoilAnimation<T> unAnim = new UnCoilAnimation<>(bt);
+			UnCoilAnimation<?> unAnim = new UnCoilAnimation<>(bt);
 			unAnim.inputROI = ( AbstractCurve3D ) roiIn;
 			unAnim.nFrames = nTotFramesUnCoil;
 			unAnim.nUnCoilTask = nUnCoilTask;