#2 memory leak - Tracker

Author: BobHanson

distribution/tracker.jar

@@ -766,7 +766,7 @@ public void mousePressed(MouseEvent e) {
 			defaultMemoryCheckbox.setOpaque(false);
 			memoryLabel = new JLabel("MB"); //$NON-NLS-1$
 			memoryField = new IntegerField(4);
-			memoryField.setMinValue(Tracker.minimumMemorySize);
+			memoryField.setMinValue(TrackerStarter.MINIMUM_MEMORY_SIZE);
 			memoryField.addFocusListener(new FocusAdapter() {
 				@Override
 				public void focusLost(FocusEvent e) {

resources/tracker-assets.zip

@@ -208,10 +208,10 @@ public static Icon getResourceIcon(String imageName, boolean resizable) {
 	static final Level DEFAULT_LOG_LEVEL = ConsoleLevel.OUT_CONSOLE;
 	static final int DEFAULT_TRAIL_LENGTH_INDEX = 2;
 
-	static final int MEMORY_OK = 0;
-	static final int MEMORY_LOW_IGNORE = 1;
-	static final int MEMORY_LOW_DONTIGNORE = 2;
-	static final int MEMORY_OUT = 3;
+    static final int MEMORY_OK             = 0;
+	static final int MEMORY_LOW_IGNORE     = 1;
+    static final int MEMORY_LOW_DONTIGNORE = 2;
+	static final int MEMORY_OUT            = 3;
 	static final int MEMORY_INCREASE       = 4;
 
 	// for testing
@@ -2851,14 +2851,14 @@ public static void askToSetMemory(TFrame frame) {
 			int n = (d < 0 ? -1 : (int) Math.max(d, 32)); // not less than 32MB
 			if (n != preferredMemorySize) {
 				preferredMemorySize = n;
-				int ans = JOptionPane.showConfirmDialog(frame,
+			int ans = JOptionPane.showConfirmDialog(frame,
 						TrackerRes.getString("TTrackBar.Dialog.Memory.Relaunch.Message"), //$NON-NLS-1$
-						TrackerRes.getString("TTrackBar.Dialog.Memory.Relaunch.Title"), //$NON-NLS-1$
-						JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
-				if (ans == JOptionPane.YES_OPTION) {
-					savePreferences();
-					frame.relaunchCurrentTabs();
-				}
+					TrackerRes.getString("TTrackBar.Dialog.Memory.Relaunch.Title"), //$NON-NLS-1$
+					JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+			if (ans == JOptionPane.YES_OPTION) {
+				savePreferences();
+				frame.relaunchCurrentTabs();
+			}
 			}
 		} catch (Exception ex) {
 		}

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

@@ -1916,6 +1916,12 @@ public int doInBackgroundAsync(int progress) {
 				cancelAsync();
 				return PROGRESS_COMPLETE;
 			}
+//			try {
+//				Thread.sleep(100);
+//			} catch (InterruptedException e) {
+//				// TODO Auto-generated catch block
+//				e.printStackTrace();
+//			}
 //			OSPLog.debug(Performance.timeCheckStr("TrackerIO.asyncLoad " + type + " start " + progress + " " + paths,
 //					Performance.TIME_MARK));
 			// type is set in setupLoader, from initAsync()
@@ -1972,7 +1978,6 @@ public int doInBackgroundAsync(int progress) {
 					cancelAsync();					
 					Tracker.askToSetMemory(frame);
 					break;
-
 				}
 			}
 			return progress;
@@ -2464,8 +2469,8 @@ public String getNote(int progress) {
 				return "Video frames loaded: " + getFrameCount();
 			case TYPE_TRK:
 				if (type == TYPE_TRK && progress > PROGRESS_VIDEO_PROCESSING && progress < PROGRESS_VIDEO_READY)
-					return "Video " + videoCount + " frames loaded: " + trackerPanel.framesLoaded;
-		    default:
+					return "Video " + videoCount + ": frames loaded " + trackerPanel.framesLoaded;
+		  default:
 				return String.format("Completed %d%%.\n", progressPercent);
 			}
 		}

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

@@ -72,6 +72,7 @@ public class TrackerStarter {
 	public static final String LOG_FILE_NAME = "tracker_start.log"; //$NON-NLS-1$
 	public static final String LOG_DIAGNOSTICS_NAME = "tracker_start_diagnostics.log"; //$NON-NLS-1$
   public static final int DEFAULT_MEMORY_SIZE = 1024;
+	public static final int MINIMUM_MEMORY_SIZE = 64;
 	public static final String PREFS_FILE_NAME = "tracker.prefs"; //$NON-NLS-1$
 	public static final int INDEX_XUGGLE_57 = 0;
 	public static final int INDEX_XUGGLE_34 = 1;

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

@@ -1751,11 +1751,14 @@ TMenuBar.MenuItem.Font=Font
 RGBRegion.Data.Description.10=red standard deviation
 RGBRegion.Data.Description.11=green standard deviation
 RGBRegion.Data.Description.12=blue standard deviation
-TrackerIO.Dialog.LowMemory.Message1=Tracker is getting low on memory.
-TrackerIO.Dialog.LowMemory.Remaining=Memory remaining: 
-TrackerIO.Dialog.LowMemory.Message2=Tracker may freeze if the memory limit is exceeded.
-TrackerIO.Dialog.LowMemory.Message3=Do you wish to continue loading?
-TrackerIO.Dialog.LowMemory.Title=Low Memory
-TrackerIO.Dialog.OutOfMemory.Message1=Tracker has reached the memory limit and will stop loading.
-TrackerIO.Dialog.OutOfMemory.Message2=Click the memory button to increase memory.
-TrackerIO.Dialog.OutOfMemory.Title=Almost Out of Memory
+Tracker.Dialog.LowMemory.Message1=Tracker is getting low on memory.
+Tracker.Dialog.LowMemory.Remaining=Memory remaining: 
+Tracker.Dialog.LowMemory.Message2=Tracker may freeze if its memory limit is reached.
+Tracker.Dialog.LowMemory.Message3=Do you wish to continue loading?
+Tracker.Dialog.LowMemory.Title=Low Memory
+Tracker.Dialog.OutOfMemory.Message1=Tracker has almost reached its memory limit of
+Tracker.Dialog.OutOfMemory.Message2=You can stop loading or increase memory.
+Tracker.Dialog.OutOfMemory.Increase=Increase Memory
+Tracker.Dialog.OutOfMemory.Stop=Stop Loading
+Tracker.Dialog.OutOfMemory.Title=Out of Memory
+TTrackBar.Dialog.Memory.Relaunch.Message2=Current tabs will be reloaded automatically.

src/org/opensourcephysics/cabrillo/tracker/deploy/TrackerStarter.java

@@ -960,7 +960,6 @@ org/opensourcephysics/media/core/MediaRes.js
 org/opensourcephysics/media/core/NegativeFilter.js
 org/opensourcephysics/media/core/NumberField.js
 org/opensourcephysics/media/core/PerspectiveFilter.js
-org/opensourcephysics/media/core/Playable.js
 org/opensourcephysics/media/core/RadialDistortionFilter.js
 org/opensourcephysics/media/core/ResizeFilter.js
 org/opensourcephysics/media/core/RotateFilter.js