Blimp

@@ -3,6 +3,11 @@ Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

 Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 a blinkenarea.org project

+version 1.3.4 date 2008-09-14

+-----------------------------

+ - also setting aspect when resizing to a known format

+ - support for Blinkenlights Stereoscope formats

+

 version 1.3.3 date 2008-08-10

 -----------------------------

  - new release due to new BlinkenLib 0.1.2 (bug in resizing)

@@ -1,5 +1,5 @@

 # BlinkenLightsInteractiveMovieProgram

-# version 1.3.3 date 2008-08-10

+# version 1.3.4 date 2008-09-14

 # Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

 # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 # a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.3 date 2008-08-10

+ * version 1.3.4 date 2008-09-14

  * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -28,20 +28,25 @@ public class Blimp extends JApplet

   //configuration constants

   static final int constColorCntX = 2, constColorCntY = 4;

   static final int constColorCnt = constColorCntX * constColorCntY;

-  static final int defHeight = 8, defWidth = 8, defChannels = 1, defMaxval = 127, defDuration = 100;

+  static final int defHeight = 12, defWidth = 30, defChannels = 1, defMaxval = 15, defDuration = 100;

+  static final double defAspect = 0.65;

   static final int ZoomAspectResolution = 30;

   //known formats

   static final String[] knownFormats =

   {

-    "Blinkenlights (18x8-1/2)",

-    "Blinkenlights Arcade (26x20-1/16)",

-    "Blinkenlights reloaded (18x8-1/16)",

-    "bluebox (98x7-1/128)",

-    "PixelCurtain (18x8-3/256)",

-    "TROIA big walls (104x32-1/128)",

-    "TROIA ceiling (104x80-1/128)",

-    "TROIA small walls (80x32-1/128)",

+    "Blinkenlights (18x8-1/2) [a=0.55]",

+    "Blinkenlights Arcade (26x20-1/16) [a=0.5]",

+    "Blinkenlights reloaded (18x8-1/16) [a=0.55]",

+    "Blinkenlights Stereoscope West upper (22x8-1/16) [a=0.65]",

+    "Blinkenlights Stereoscope West lower (22x7-1/16) [a=0.65]",

+    "Blinkenlights Stereoscope East upper (30x12-1/16) [a=0.65]",

+    "Blinkenlights Stereoscope East lower (30x9-1/16) [a=0.65]",

+    "bluebox (98x7-1/128) [a=0.32]",

+    "ColorCurtain (18x8-3/256) [a=1.0]",

+    "TROIA big walls (104x32-1/128) [a=1.0]",

+    "TROIA ceiling (104x80-1/128) [a=1.0]",

+    "TROIA small walls (80x32-1/128) [a=1.0]",

   };

   //known sizes

@@ -49,6 +54,10 @@ public class Blimp extends JApplet

   {

     "Blinkenlights (18x8)",

     "Blinkenlights Arcade (26x20)",

+    "Blinkenlights Stereoscope West upper (22x8)",

+    "Blinkenlights Stereoscope West lower (22x7)",

+    "Blinkenlights Stereoscope East upper (30x12)",

+    "Blinkenlights Stereoscope East lower (30x9)",

     "bluebox (98x7)",

     "TROIA big walls (104x32)",

     "TROIA ceiling (104x80)",

@@ -201,7 +210,7 @@ public class Blimp extends JApplet

     labelStatus.setText( "new movie..." );

     curFile = null;

     curMovie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval );

-    curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.3 date 2008-08-10)" );

+    curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.4 date 2008-09-14)" );

     curMovie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) );

     curMovieChanged = false;

@@ -437,6 +446,19 @@ public class Blimp extends JApplet

       return "";

   }

+  //get aspect from square bracket in string

+  private String getAspect( String str )

+  {

+    Pattern pattern;

+    Matcher matcher;

+

+    pattern = Pattern.compile( "^.*\\[([^\\[\\]]*)\\]$" );

+    if( (matcher = pattern.matcher( str )).find( ) )

+      return matcher.group( 1 );

+    else

+      return "";

+  }

+

   //resize to format

   private boolean actionEditResizeToFormat( String format )

   {

@@ -466,6 +488,36 @@ public class Blimp extends JApplet

     return true;

   }

+  //set aspect (in context of resizing movie)

+  private boolean actionEditResizeSetAspect( String aspect )

+  {

+    Pattern aspectPattern;

+    Matcher aspectMatcher;

+    double aspectValue;

+

+    //initialize aspect pattern

+    aspectPattern = Pattern.compile( "^a=([0-9.]+)$" );

+

+    //check aspect

+    if( ! (aspectMatcher = aspectPattern.matcher( aspect )).find( ) ) //abort and return error if aspect not valid

+      return false;

+

+    //parse aspect if specified

+    try

+    {

+      aspectValue = Double.parseDouble( aspectMatcher.group( 1 ) );

+    }

+    catch( NumberFormatException e )

+    {

+      return false;

+    }

+

+    //set new aspect

+    sliderAspect.setValue( aspectZoomToSliderValue( aspectValue ) );

+

+    return true;

+  }

+

   //"Edit Resize Movie user defined format..." was chosen from menu

   private void actionEditResizeUser( )

   {

@@ -1030,7 +1082,7 @@ public class Blimp extends JApplet

   {

     JOptionPane.showMessageDialog( dialogParent,

                                    "BlinkenLightsInteractiveMovieProgram\n" +

-                                   "version 1.3.3 date 2008-08-10\n" +

+                                   "version 1.3.4 date 2008-09-14\n" +

                                    "Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>\n" +

                                    "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" +

                                    "a blinkenarea.org project",

@@ -1144,6 +1196,18 @@ public class Blimp extends JApplet

     menuFrameSelDelete.setEnabled( valid );

   }

+  //convert aspect or zoom to aspect or zoom slider value

+  private int aspectZoomToSliderValue( double aspectZoom )

+  {

+    double value = Math.log( aspectZoom ) / Math.log( 2.0 );

+    value *= (double)ZoomAspectResolution;

+    if( value >= 0.0 )

+      value += 0.5;

+    else

+      value -= 0.5;

+    return (int)value;

+  }

+

   //set zoom and aspect value of frame

   private void setZoomAspect( )

   {

@@ -1202,7 +1266,7 @@ public class Blimp extends JApplet

       //set new zoom value without triggering events

       noRecurseZoomAspect = true;

-      sliderZoom.setValue( (int)((Math.log( zoom ) / Math.log( 2.0 )) * (double)ZoomAspectResolution + 0.5) );

+      sliderZoom.setValue( aspectZoomToSliderValue( zoom ) );

       noRecurseZoomAspect = false;

       //set zoom and aspect value of frame

@@ -1270,7 +1334,7 @@ public class Blimp extends JApplet

       //set new aspect value without triggering events

       noRecurseZoomAspect = true;

-      sliderAspect.setValue( (int)((Math.log( aspect ) / Math.log( 2.0 )) * (double)ZoomAspectResolution + 0.5) );

+      sliderAspect.setValue( aspectZoomToSliderValue( aspect ) );

       noRecurseZoomAspect = false;

       //set zoom and aspect value of frame

@@ -1870,6 +1934,7 @@ public class Blimp extends JApplet

         if( i < menuEditResizeKnown.length )

         {

           actionEditResizeToFormat( getFormatOrSize( knownFormats[i] ) );

+          actionEditResizeSetAspect( getAspect( knownFormats[i] ) );

           break;

         }

@@ -2013,7 +2078,7 @@ public class Blimp extends JApplet

     //initialize current movie, frame

     curDir = new File( "." );

     curMovie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval );

-    curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.3 date 2008-08-10)" );

+    curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.4 date 2008-09-14)" );

     curMovie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) );

     curFrame = null;

@@ -2308,7 +2373,7 @@ public class Blimp extends JApplet

     panelAspectName.add( labelAspectName );

     labelAspect = new JLabel( "", JLabel.CENTER );

     panelAspectName.add( labelAspect );

-    sliderAspect = new JSlider( JSlider.VERTICAL, -3 * ZoomAspectResolution, 3 * ZoomAspectResolution, 0 );

+    sliderAspect = new JSlider( JSlider.VERTICAL, -3 * ZoomAspectResolution, 3 * ZoomAspectResolution, aspectZoomToSliderValue( defAspect ) );

     sliderAspect.setSnapToTicks( true );

     sliderAspect.addChangeListener( this );

     sliderAspect.setToolTipText( "aspect" );

@@ -2668,7 +2733,7 @@ public class Blimp extends JApplet

     //running as command line tool

     System.out.println( "BlinkenLightsInteractiveMovieProgram\n" +

-                        "version 1.3.3 date 2008-08-10\n" +

+                        "version 1.3.4 date 2008-09-14\n" +

                         "Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>\n" +

                         "Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" +

                         "a blinkenarea.org project\n" );

@@ -2679,7 +2744,7 @@ public class Blimp extends JApplet

     //get initial movie

     movie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval );

-    movie.insertInfo( 0, "creator", "Blimp (version 1.3.3 date 2008-08-10)" );

+    movie.insertInfo( 0, "creator", "Blimp (version 1.3.4 date 2008-09-14)" );

     movie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) );

     //process parameters

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.3 date 2008-08-10

+ * version 1.3.4 date 2008-09-14

  * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.3 date 2008-08-10

+ * version 1.3.4 date 2008-09-14

  * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.3 date 2008-08-10

+ * version 1.3.4 date 2008-09-14

  * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.3 date 2008-08-10

+ * version 1.3.4 date 2008-09-14

  * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.3 date 2008-08-10

+ * version 1.3.4 date 2008-09-14

  * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project

@@ -1,5 +1,5 @@

 /* BlinkenLightsInteractiveMovieProgram

- * version 1.3.3 date 2008-08-10

+ * version 1.3.4 date 2008-09-14

  * Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info>

  * Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

  * a blinkenarea.org project