Christian Heimke commited on 2011-07-15 09:25:18
Showing 9 changed files, with 21 additions and 17 deletions.
... | ... |
@@ -3,6 +3,10 @@ Copyright (C) 2004-2008: Stefan Schuermans <stefan@schuermans.info> |
3 | 3 |
Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html |
4 | 4 |
a blinkenarea.org project |
5 | 5 |
|
6 |
+version 1.3.7 date 2009-08-15 |
|
7 |
+----------------------------- |
|
8 |
+ - fixed resizing to predefined formats |
|
9 |
+ |
|
6 | 10 |
version 1.3.6 date 2009-08-15 |
7 | 11 |
----------------------------- |
8 | 12 |
- new version including TroiCade format |
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
# BlinkenLightsInteractiveMovieProgram |
2 |
-# version 1.3.6 date 2009-08-15 |
|
2 |
+# version 1.3.7 date 2009-08-15 |
|
3 | 3 |
# Copyright (C) 2004-2009: Stefan Schuermans <stefan@schuermans.info> |
4 | 4 |
# Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html |
5 | 5 |
# a blinkenarea.org project |
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
/* BlinkenLightsInteractiveMovieProgram |
2 |
- * version 1.3.6 date 2009-08-15 |
|
2 |
+ * version 1.3.7 date 2009-08-15 |
|
3 | 3 |
* Copyright (C) 2004-2009: Stefan Schuermans <stefan@schuermans.info> |
4 | 4 |
* Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html |
5 | 5 |
* a blinkenarea.org project |
... | ... |
@@ -28,8 +28,8 @@ public class Blimp extends JApplet |
28 | 28 |
//configuration constants |
29 | 29 |
static final int constColorCntX = 2, constColorCntY = 4; |
30 | 30 |
static final int constColorCnt = constColorCntX * constColorCntY; |
31 |
- static final int defHeight = 12, defWidth = 30, defChannels = 1, defMaxval = 15, defDuration = 100; |
|
32 |
- static final double defAspect = 0.65; |
|
31 |
+ static final int defHeight = 24, defWidth = 32, defChannels = 1, defMaxval = 127, defDuration = 100; |
|
32 |
+ static final double defAspect = 1.0; |
|
33 | 33 |
static final int ZoomAspectResolution = 30; |
34 | 34 |
|
35 | 35 |
//known formats |
... | ... |
@@ -38,7 +38,7 @@ public class Blimp extends JApplet |
38 | 38 |
"Blinkenlights (18x8-1/2) [a=0.55]", |
39 | 39 |
"Blinkenlights Arcade (26x20-1/16) [a=0.5]", |
40 | 40 |
"Blinkenlights reloaded (18x8-1/16) [a=0.55]", |
41 |
- "Blinkenlights Stereoscope total (96x32-1/256)", |
|
41 |
+ "Blinkenlights Stereoscope total (96x32-1/256) [a=0.65]", |
|
42 | 42 |
"Blinkenlights Stereoscope West upper (22x8-1/16) [a=0.65]", |
43 | 43 |
"Blinkenlights Stereoscope West lower (22x7-1/16) [a=0.65]", |
44 | 44 |
"Blinkenlights Stereoscope East upper (30x12-1/16) [a=0.65]", |
... | ... |
@@ -214,7 +214,7 @@ public class Blimp extends JApplet |
214 | 214 |
labelStatus.setText( "new movie..." ); |
215 | 215 |
curFile = null; |
216 | 216 |
curMovie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval ); |
217 |
- curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.6 date 2009-08-15)" ); |
|
217 |
+ curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.7 date 2009-08-15)" ); |
|
218 | 218 |
curMovie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) ); |
219 | 219 |
curMovieChanged = false; |
220 | 220 |
|
... | ... |
@@ -443,7 +443,7 @@ public class Blimp extends JApplet |
443 | 443 |
Pattern pattern; |
444 | 444 |
Matcher matcher; |
445 | 445 |
|
446 |
- pattern = Pattern.compile( "^.*\\(([^()]*)\\)$" ); |
|
446 |
+ pattern = Pattern.compile( "^.*\\(([^()]*)\\)( \\[[^\\[\\]]*\\])?$" ); |
|
447 | 447 |
if( (matcher = pattern.matcher( str )).find( ) ) |
448 | 448 |
return matcher.group( 1 ); |
449 | 449 |
else |
... | ... |
@@ -1086,7 +1086,7 @@ public class Blimp extends JApplet |
1086 | 1086 |
{ |
1087 | 1087 |
JOptionPane.showMessageDialog( dialogParent, |
1088 | 1088 |
"BlinkenLightsInteractiveMovieProgram\n" + |
1089 |
- "version 1.3.6 date 2009-08-15\n" + |
|
1089 |
+ "version 1.3.7 date 2009-08-15\n" + |
|
1090 | 1090 |
"Copyright (C) 2004-2009: Stefan Schuermans <stefan@schuermans.info>\n" + |
1091 | 1091 |
"Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" + |
1092 | 1092 |
"a blinkenarea.org project", |
... | ... |
@@ -2082,7 +2082,7 @@ public class Blimp extends JApplet |
2082 | 2082 |
//initialize current movie, frame |
2083 | 2083 |
curDir = new File( "." ); |
2084 | 2084 |
curMovie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval ); |
2085 |
- curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.6 date 2009-08-15)" ); |
|
2085 |
+ curMovie.insertInfo( 0, "creator", "Blimp (version 1.3.7 date 2009-08-15)" ); |
|
2086 | 2086 |
curMovie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) ); |
2087 | 2087 |
curFrame = null; |
2088 | 2088 |
|
... | ... |
@@ -2737,7 +2737,7 @@ public class Blimp extends JApplet |
2737 | 2737 |
|
2738 | 2738 |
//running as command line tool |
2739 | 2739 |
System.out.println( "BlinkenLightsInteractiveMovieProgram\n" + |
2740 |
- "version 1.3.6 date 2009-08-15\n" + |
|
2740 |
+ "version 1.3.7 date 2009-08-15\n" + |
|
2741 | 2741 |
"Copyright (C) 2004-2009: Stefan Schuermans <stefan@schuermans.info>\n" + |
2742 | 2742 |
"Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html\n" + |
2743 | 2743 |
"a blinkenarea.org project\n" ); |
... | ... |
@@ -2748,7 +2748,7 @@ public class Blimp extends JApplet |
2748 | 2748 |
|
2749 | 2749 |
//get initial movie |
2750 | 2750 |
movie = new BlinkenMovie( defHeight, defWidth, defChannels, defMaxval ); |
2751 |
- movie.insertInfo( 0, "creator", "Blimp (version 1.3.6 date 2009-08-15)" ); |
|
2751 |
+ movie.insertInfo( 0, "creator", "Blimp (version 1.3.7 date 2009-08-15)" ); |
|
2752 | 2752 |
movie.insertFrame( 0, new BlinkenFrame( defHeight, defWidth, defChannels, defMaxval, defDuration ) ); |
2753 | 2753 |
|
2754 | 2754 |
//process parameters |
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
/* BlinkenLightsInteractiveMovieProgram |
2 |
- * version 1.3.6 date 2009-08-15 |
|
2 |
+ * version 1.3.7 date 2009-08-15 |
|
3 | 3 |
* Copyright (C) 2004-2009: Stefan Schuermans <stefan@schuermans.info> |
4 | 4 |
* Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html |
5 | 5 |
* a blinkenarea.org project |
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
/* BlinkenLightsInteractiveMovieProgram |
2 |
- * version 1.3.6 date 2009-08-15 |
|
2 |
+ * version 1.3.7 date 2009-08-15 |
|
3 | 3 |
* Copyright (C) 2004-2009: Stefan Schuermans <stefan@schuermans.info> |
4 | 4 |
* Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html |
5 | 5 |
* a blinkenarea.org project |
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
/* BlinkenLightsInteractiveMovieProgram |
2 |
- * version 1.3.6 date 2009-08-15 |
|
2 |
+ * version 1.3.7 date 2009-08-15 |
|
3 | 3 |
* Copyright (C) 2004-2009: Stefan Schuermans <stefan@schuermans.info> |
4 | 4 |
* Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html |
5 | 5 |
* a blinkenarea.org project |
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
/* BlinkenLightsInteractiveMovieProgram |
2 |
- * version 1.3.6 date 2009-08-15 |
|
2 |
+ * version 1.3.7 date 2009-08-15 |
|
3 | 3 |
* Copyright (C) 2004-2009: Stefan Schuermans <stefan@schuermans.info> |
4 | 4 |
* Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html |
5 | 5 |
* a blinkenarea.org project |
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
/* BlinkenLightsInteractiveMovieProgram |
2 |
- * version 1.3.6 date 2009-08-15 |
|
2 |
+ * version 1.3.7 date 2009-08-15 |
|
3 | 3 |
* Copyright (C) 2004-2009: Stefan Schuermans <stefan@schuermans.info> |
4 | 4 |
* Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html |
5 | 5 |
* a blinkenarea.org project |
... | ... |
@@ -1,5 +1,5 @@ |
1 | 1 |
/* BlinkenLightsInteractiveMovieProgram |
2 |
- * version 1.3.6 date 2009-08-15 |
|
2 |
+ * version 1.3.7 date 2009-08-15 |
|
3 | 3 |
* Copyright (C) 2004-2009: Stefan Schuermans <stefan@schuermans.info> |
4 | 4 |
* Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html |
5 | 5 |
* a blinkenarea.org project |
6 | 6 |