New features

README.md

@@ -5,6 +5,26 @@ Video analysis and modeling tool built on the Open Source Physics (OSP) framewor
 
 This code requires the OSP Core Library available in the <a href="https://github.com/OpenSourcePhysics/osp" target="_blank">OpenSourcePhysics/osp</a> repository.
 
-Optional Xuggle video engine support is available in the <a href="https://github.com/OpenSourcePhysics/video-engines" target="_blank">OpenSourcePhysics/video-engines</a> repository. Without a video engine Tracker will only open images (JPEG, PNG) and animated GIFs.
+Optional video engine support (FFMPeg on Win/OSX/linux, QuickTime on Win/OSX) is available in the <a href="https://github.com/OpenSourcePhysics/video-engines" target="_blank">OpenSourcePhysics/video-engines</a> repository. Without a video engine Tracker will only open images (JPEG, PNG) and animated GIFs.
 
 Note: Tracker includes classes to handle apple events that to compile require the Apple Java Extensions library (AppleJavaExtensions.jar) which can be downloaded <a href="http://www.cabrillo.edu/~dbrown/tracker/osx_services/AppleJavaExtensions.jar" target="_blank">here</a>.
+
+
+Installation
+============
+
+DEB-based:
+
+```
+sudo sh -c "echo 'deb http://download.opensuse.org/repositories/home:/NickKolok:/osptracker/xUbuntu_16.04/ /' > /etc/apt/sources.list.d/home:NickKolok:osptracker.list"
+wget -nv https://download.opensuse.org/repositories/home:NickKolok:osptracker/xUbuntu_16.04/Release.key -O Release.key
+sudo apt-key add - < Release.key
+sudo add-apt-repository ppa:jonathonf/ffmpeg-4
+sudo apt-get update
+sudo apt-get install osptracker
+```
+
+(you may need to enable `universe` repo in some Ubuntu versions to install `ffmpeg`).
+
+RPM-based:
+see https://software.opensuse.org//download.html?project=home%3ANickKolok%3Aosptracker&package=osptracker

src/org/opensourcephysics/cabrillo/tracker/AnalyticParticle.java

@@ -93,7 +93,7 @@ protected void reset() {
     	dt = trackerPanel.getPlayer().getMeanStepDuration() / (1000*tracePtsPerStep);
       VideoClip clip = trackerPanel.getPlayer().getVideoClip();
       // find last frame included in both model and clip
-  		int end = Math.min(getEndFrame(), clip.getLastFrameNumber());
+  		int end = Math.min(getEndFrame(), clip.getFrameCount()-1);
   		while (end>getStartFrame() && !clip.includesFrame(end)) {
   			end--;
   		}
@@ -119,7 +119,7 @@ protected void reset() {
     	// mark a step at firstFrameInClip
 	  	steps.setLength(firstFrameInClip+1);
 	    PositionStep step = (PositionStep)getStep(firstFrameInClip);
-	  	for (int i = 0; i<steps.array.length; i++) {
+	  	for (int i = 0; i<steps.length; i++) {
 	  		if (i<firstFrameInClip)
 	  			steps.setStep(i, null);
 	  		else if (step==null) {

src/org/opensourcephysics/cabrillo/tracker/AttachmentDialog.java

@@ -284,7 +284,6 @@ public Dimension getPreferredSize() {
     stepsButton = new JRadioButton();
     tracksButton = new JRadioButton();
     Action tracksOrStepsAction = new AbstractAction() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
       	if (refreshing) return;
       	CircleFitter fitter = (CircleFitter)TTrack.getTrack(trackID);
@@ -306,7 +305,6 @@ public void actionPerformed(ActionEvent e) {
     relativeCheckbox = new JCheckBox();
     relativeCheckbox.setSelected(false);
     relativeCheckbox.addActionListener(new ActionListener() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
       	if (refreshing) return;
       	CircleFitter fitter = (CircleFitter)TTrack.getTrack(trackID);
@@ -319,7 +317,6 @@ public void actionPerformed(ActionEvent e) {
 
     // range action, listener and fields
     final Action frameRangeAction = new AbstractAction() {
-			@Override
 			public void actionPerformed(ActionEvent e) {
       	CircleFitter fitter = (CircleFitter)TTrack.getTrack(trackID);
     		fitter.setAttachmentStartFrame(startField.getIntValue());