New features

src/org/opensourcephysics/controls/OSPLog.java

@@ -1079,9 +1079,6 @@ public void publish(LogRecord record) {
     } else if(val==ConsoleLevel.OUT_CONSOLE.intValue()) {
     	if (msg.indexOf("ERROR org.ffmpeg")>-1) //$NON-NLS-1$
     		ospLog.firePropertyChange("ffmpeg_error", null, msg); //$NON-NLS-1$
-    	else if (msg.indexOf("JNILibraryLoader")>-1) {//$NON-NLS-1$
-    		ospLog.firePropertyChange("xuggle_error", null, msg); //$NON-NLS-1$
-    	}
     	if (!OSPLog.logConsole) return;
       style = OSPLog.gray;
     } else if(val>=Level.WARNING.intValue()) {

src/org/opensourcephysics/display/OSPRuntime.java

@@ -121,6 +121,9 @@ public class OSPRuntime {
   /** The preferred decimal separator, if any */
   private static String preferredDecimalSeparator;
 
+  /** The additional decimal separators to be replaced with preferredDecimalSeparator, if any */
+  private static String additionalDecimalSeparators;
+
   /** File Chooser starting directory. */
   public static String chooserDir;
 
@@ -859,20 +862,37 @@ public static void setDefaultDecimalSeparator(char c) {
 	 * @param separator a decimal separator
 	 */
   public static void setPreferredDecimalSeparator(String separator) {
-  	if (separator==null || COMMA_DECIMAL_SEPARATOR.equals(separator) || PERIOD_DECIMAL_SEPARATOR.equals(separator)) {
-    	preferredDecimalSeparator = separator;
-  	}
+    if (separator == null || COMMA_DECIMAL_SEPARATOR.equals(separator) || PERIOD_DECIMAL_SEPARATOR.equals(separator)) {
+      preferredDecimalSeparator = separator;
+    }
   }
-
+    /**
+     * Sets the additional decimal separators.
+     *
+     * @param separator a decimal separator
+     */
+    public static void setAdditionalDecimalSeparators(String separator) {
+        additionalDecimalSeparators = separator;
+    }
+
 	/**
 	 * Gets the preferred decimal separator. May return null.
 	 * 
 	 * @return the separator, if any
 	 */
-  public static String getPreferredDecimalSeparator() {
-  	return preferredDecimalSeparator;
+    public static String getPreferredDecimalSeparator() {
+    	return preferredDecimalSeparator;
+    }
+
+  /**
+   * Gets the string containing additional decimal separators. May return null.
+   *
+   * @return the separators, if any
+   */
+  public static String getAdditionalDecimalSeparators() {
+    return additionalDecimalSeparators;
   }
-  
+
 	/**
 	 * Gets the default search paths, typically used for autoloading.
 	 * Search paths are platform-specific "appdata", user home and code base, in that order.

src/org/opensourcephysics/display/ResizableIcon.java

@@ -51,7 +51,6 @@ public ResizableIcon(Icon icon) {
     baseHeight = h = icon.getIconHeight();
   }
 
-  @Override
   public synchronized void paintIcon(Component c, Graphics g, int x, int y) {
     if (icon == null) {
       return;
@@ -67,12 +66,10 @@ public synchronized void paintIcon(Component c, Graphics g, int x, int y) {
     g.drawImage(baseImage, x, y, w, h, c);
   }
 
-  @Override
   public int getIconWidth() {
     return w;
   }
 
-  @Override
   public int getIconHeight() {
     return h;
   }

src/org/opensourcephysics/display/TextLineLabel.java

@@ -0,0 +1,91 @@
+package org.opensourcephysics.display;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * A DrawingPanel that mimics the look of a JLabel but can display subscripts.
+ */
+public class TextLineLabel extends DrawingPanel {
+	DrawableTextLine textLine;
+	JLabel label;
+	int w;
+
+	/**
+	 * Constructor
+	 */
+	public TextLineLabel() {
+		textLine = new DrawableTextLine("", 0, -4.5); //$NON-NLS-1$
+		textLine.setJustification(TextLine.CENTER);
+		addDrawable(textLine);
+		label = new JLabel();
+		textLine.setFont(label.getFont());
+		textLine.setColor(label.getForeground());
+	}
+
+	/**
+	 * Constructor with initial text
+	 */
+	public TextLineLabel(String text) {
+		this();
+		setText(text);
+	}
+
+	/**
+	 * Sets the text to be displayed. Accepts subscript notation eg v_{x}.
+	 *
+	 * @param text the text
+	 */
+	public void setText(String text) {
+		if (text == null) text = ""; //$NON-NLS-1$
+		if (text.equals(textLine.getText())) return;
+		w = -1;
+		textLine.setText(text);
+		if (text.contains("_{")) { //$NON-NLS-1$
+			text = TeXParser.removeSubscripting(text);
+		}
+		// use label to set initial preferred size
+		label.setText(text);
+		java.awt.Dimension dim = label.getPreferredSize();
+		dim.width += 4;
+		setPreferredSize(dim);
+	}
+
+	@Override
+	public Font getFont() {
+		if (textLine != null) return textLine.getFont();
+		return super.getFont();
+	}
+
+	@Override
+	public void setFont(Font font) {
+		if (textLine != null) {
+			textLine.setFont(font);
+			w = -1;
+		} else super.setFont(font);
+	}
+
+	@Override
+	public void paintComponent(Graphics g) {
+		setPixelScale(); // sets the pixel scale and the world-to-pixel AffineTransform
+		((Graphics2D) g).setRenderingHint(
+				RenderingHints.KEY_TEXT_ANTIALIASING,
+				RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+		textLine.draw(this, g);
+		if (w == -1) {
+			// check preferred size and adjust if needed
+			w = textLine.getWidth(g);
+			Dimension dim = getPreferredSize();
+			if (dim.width > w + 4 || dim.width < w + 4) {
+				dim.width = w + 4;
+				setPreferredSize(dim);
+				processParent(getParent());
+			}
+		}
+	}
+
+	public void processParent(Container c){
+		/*To be overridden*/
+	}
+
+}

src/org/opensourcephysics/media/core/BrightnessFilter.java

@@ -42,7 +42,6 @@
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
 import java.awt.image.BufferedImage;
-
 import javax.swing.BorderFactory;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -52,10 +51,8 @@
 import javax.swing.JTextField;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-
 import org.opensourcephysics.controls.XML;
 import org.opensourcephysics.controls.XMLControl;
-import org.opensourcephysics.controls.XMLControlElement;
 
 /**
  * This is a Filter that changes the brightness and contrast of a source image.
@@ -97,12 +94,6 @@ public BrightnessFilter() {
    * @param contrast the contrast.
    */
   public void setContrast(double contrast) {
-    if (previousState==null) {
-    	previousState = new XMLControlElement(this).toXML();
-    	previousBrightness = brightness;
-    	previousContrast = contrast;
-    }
-    changed = changed || this.contrast!=contrast;
     Double prev = new Double(this.contrast);
     this.contrast = contrast;
     updateFactors();
@@ -124,12 +115,6 @@ public double getContrast() {
    * @param brightness the brightness.
    */
   public void setBrightness(int brightness) {
-    if (previousState==null) {
-    	previousState = new XMLControlElement(this).toXML();
-    	previousBrightness = this.brightness;
-    	previousContrast = this.contrast;
-    }
-    changed = changed || this.brightness!=brightness;
     Integer prev = new Integer(this.brightness);
     this.brightness = brightness;
     updateFactors();
@@ -145,18 +130,6 @@ public int getBrightness() {
     return brightness;
   }
 
-  /**
-   * Determines if the filter settings have changed.
-   * 
-   * @return true if changed
-   */
-  @Override
-  public boolean isChanged() {
-  	if (!changed) return false;
-  	// changes have occurred so compare final and initial states
-  	return previousBrightness!=brightness || previousContrast!=contrast;
-  }
-
   /**
    * Applies the filter to a source image and returns the result.
    *
@@ -217,6 +190,10 @@ public void refresh() {
     brightnessSlider.setToolTipText(MediaRes.getString("Filter.Brightness.ToolTip.Brightness")); //$NON-NLS-1$
     contrastLabel.setText(MediaRes.getString("Filter.Brightness.Label.Contrast"));               //$NON-NLS-1$
     contrastSlider.setToolTipText(MediaRes.getString("Filter.Brightness.ToolTip.Contrast"));     //$NON-NLS-1$
+    if(inspector!=null) {
+      inspector.setTitle(MediaRes.getString("Filter.Brightness.Title")); //$NON-NLS-1$
+      inspector.pack();
+    }
     boolean enabled = isEnabled();
     brightnessLabel.setEnabled(enabled);
     brightnessSlider.setEnabled(enabled);
@@ -323,17 +300,6 @@ public Inspector() {
      */
     void createGUI() {
       setTitle(MediaRes.getString("Filter.Brightness.Title")); //$NON-NLS-1$
-      addWindowFocusListener(new java.awt.event.WindowAdapter() {
-      	@Override
-      	public void windowLostFocus(java.awt.event.WindowEvent e) {
-          if (isChanged() && previousState!=null) {
-          	changed = false;
-            support.firePropertyChange("filterChanged", previousState, BrightnessFilter.this); //$NON-NLS-1$
-            previousState = null;
-          }
-      	}
-      });
-
       // create brightness components
       brightnessLabel = new JLabel();
       brightnessField = new IntegerField(3);
@@ -524,11 +490,6 @@ public Object loadObject(XMLControl control, Object obj) {
       }
       filter.inspectorX = control.getInt("inspector_x"); //$NON-NLS-1$
       filter.inspectorY = control.getInt("inspector_y"); //$NON-NLS-1$
-      filter.previousState = null;
-      filter.changed = false;
-      if (filter.inspector!=null) {
-        filter.inspector.updateDisplay();
-      }
       return obj;
     }