Blimp

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

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

 a blinkenarea.org project

+1.4.1 2011-09-11

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

+added FlexiPix output feature

+

 1.4.0 2011-09-10

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

 added MCUF output feature

@@ -3,11 +3,12 @@

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

 # a blinkenarea.org project

-BLINKEN_LIB=../BlinkenLibJava/BlinkenLib.jar

+BLINKENLIB=../BlinkenLibJava/BlinkenLib.jar

+JFLEXIPIX=../JFlexiPix/JFlexiPix.jar

 VERSION_MAJOR=1

 VERSION_MINOR=4

-VERSION_REVISION=0

+VERSION_REVISION=1

 JAVAC=javac

 JAR=jar

@@ -18,7 +19,7 @@ JAVA=java

 P=org/blinkenarea/Blimp

 IMG=$(P)/images

-CLASSPATH=.:$(BLINKEN_LIB)

+CLASSPATH=.:$(BLINKENLIB):$(JFLEXIPIX)

 CLASS_FILES=$(P)/BlinkenFileFilter.class $(P)/BlinkenFrameDisplay.class \

             $(P)/BlinkenFrameDisplayListener.class $(P)/BlinkenFrameDisplayInterceptor.class \

             $(P)/BlinkenFrameEditor.class $(P)/BlinkenFrameEditorListener.class \

@@ -89,7 +89,7 @@ public class Blimp extends JApplet

   JMenuItem menuPlayStart, menuPlayStop;

   JCheckBoxMenuItem menuPlayBegin, menuPlayLoop;

   ButtonGroup groupOutput;

-  JRadioButtonMenuItem menuOutputNone, menuOutputMcuf;

+  JRadioButtonMenuItem menuOutputNone, menuOutputMcuf, menuOutputFlexiPix;

   JMenuItem menuHelpAbout;

   JPanel panel, panelStatus, panelMain, panelFrames, panelOuterFrame; //panels of main window

   JPanel panelMiddleFrame, panelFrame, panelDuration, panelColors;

@@ -141,6 +141,9 @@ public class Blimp extends JApplet

   InetAddress outMcufHost; //host part of destination

   int outMcufPort; //port part of destination

   DatagramSocket outMcufSock; // UDP socket to send MCUF output on

+  File outFlexiPixCurDir = null;  //directory of config file

+  File outFlexiPixCurFile = null; //config file

+  org.blinkenarea.JFlexiPix.Display outFlexiPixDisplay; //FlexiPix display

   //other variables

   boolean noRecurseZoomAspect = false; //set when changing zoom or aspect value per program to inhibit recursion triggered by events

@@ -1102,6 +1105,10 @@ public class Blimp extends JApplet

       outMcufSock = null;

     }

+    //close FlexiPix output

+    if( outFlexiPixDisplay != null )

+      outFlexiPixDisplay = null;

+

     //set status to no output

     menuOutputNone.setSelected( true );

     labelStatus.setText( "output turned off..." );

@@ -1190,6 +1197,48 @@ public class Blimp extends JApplet

     outFrame( );

   }

+  //"Output FlexiPix" was chosen from menu

+  private void actionOutputFlexiPix( )

+  {

+    JFileChooser fileChooser;

+    String cfgFile;

+

+    //reset outputs

+    actionOutputNone( );

+

+    //ask for config file

+    fileChooser = new JFileChooser( );

+    fileChooser.setDialogTitle( "Blimp - Output FlexiPix..." );

+    if( outFlexiPixCurDir != null )

+      fileChooser.setCurrentDirectory( outFlexiPixCurDir );

+    if( fileChooser.showOpenDialog( dialogParent ) != JFileChooser.APPROVE_OPTION )

+      return;

+    //save current directory and current file

+    outFlexiPixCurDir = fileChooser.getCurrentDirectory( );

+    outFlexiPixCurFile = fileChooser.getSelectedFile( );

+    cfgFile = outFlexiPixCurFile.getPath( );

+

+    //create FlexiPix display

+    try

+    {

+      outFlexiPixDisplay = new org.blinkenarea.JFlexiPix.Display( cfgFile, null );

+    }

+    catch( Exception e )

+    {

+      //cannot create display -> turn off output

+      actionOutputNone( );

+      labelStatus.setText( "FlexiPix output: cannot create display: " + e.getMessage( ) );

+      return;

+    }

+

+    //set status to FlexiPix output

+    menuOutputFlexiPix.setSelected( true );

+    labelStatus.setText( "FlexiPix output using \"" + cfgFile + "\" ..." );

+

+    //output current frame

+    outFrame( );

+  }

+

   //output timer elapsed

   private void actionOutTimer( )

   {

@@ -1206,10 +1255,14 @@ public class Blimp extends JApplet

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

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

                                    "a blinkenarea.org project\n\n" +

-                                   String.format( "contains BlinkenLibJava %d.%d.%d",

+                                   String.format( "contains BlinkenLibJava %d.%d.%d\n",

                                                   org.blinkenarea.BlinkenLib.Version.Major,

                                                   org.blinkenarea.BlinkenLib.Version.Minor,

-                                                  org.blinkenarea.BlinkenLib.Version.Revision ),

+                                                  org.blinkenarea.BlinkenLib.Version.Revision ) +

+                                   String.format( "contains JFlexiPix %d.%d.%d\n",

+                                                  org.blinkenarea.JFlexiPix.Version.Major,

+                                                  org.blinkenarea.JFlexiPix.Version.Minor,

+                                                  org.blinkenarea.JFlexiPix.Version.Revision ),

                                    "Blimp - About...",

                                    JOptionPane.INFORMATION_MESSAGE );

   }

@@ -1983,6 +2036,8 @@ public class Blimp extends JApplet

       actionOutputNone( );

     else if( e.getSource( ) == menuOutputMcuf )

       actionOutputMcuf( );

+    else if( e.getSource( ) == menuOutputFlexiPix )

+      actionOutputFlexiPix( );

     else if( e.getSource( ) == timerOut )

       actionOutTimer( );

     else if( e.getSource( ) == menuHelpAbout )

@@ -2217,6 +2272,10 @@ public class Blimp extends JApplet

     if( menuOutputMcuf.isSelected( ) )

       outMcuf( );

+    //FlexiPix output

+    if( menuOutputFlexiPix.isSelected( ) )

+      outFlexiPix( );

+

     //re-output after 1 s

     timerOut.setInitialDelay( 1000 );

     timerOut.restart( );

@@ -2228,7 +2287,7 @@ public class Blimp extends JApplet

     byte [] data;

     DatagramPacket pack;

-    // exit if nos socket

+    // exit if no socket

     if( outMcufSock == null )

       return;

@@ -2247,6 +2306,39 @@ public class Blimp extends JApplet

     }

   }

+  //output current frame to FlexiPix

+  private void outFlexiPix( )

+  {

+    BlinkenFrame frame;

+    int width, height;

+    byte [] data;

+

+    // exit if no FlexiPix display

+    if( outFlexiPixDisplay == null )

+      return;

+

+    //convert current frame to 24bit RGB and FlexiPix display size

+    frame = new BlinkenFrame( curFrame );

+    frame.resize( frame.getHeight( ), frame.getWidth( ), 3, 255 );

+    width = outFlexiPixDisplay.getWidth( );

+    height = outFlexiPixDisplay.getHeight( );

+    frame.scale( height, width );

+

+    //convert frame into MCUF data

+    data = frame.toNetwork( BlinkenConstants.BlinkenProtoMcuf );

+    if( data == null || data.length == 0 )

+      return;

+

+    //transfer data to FlexiPix display object

+    outFlexiPixDisplay.data(data,

+                            3, width * 3,         // x stride, y stride

+                            12,                   // index of top-left pixel

+                            0, 0, width, height); // whole area

+

+    //send packets to real FlexiPix display

+    outFlexiPixDisplay.send( );

+  }

+

   //entry point of main thread

   public void run( )

   {

@@ -2495,6 +2587,11 @@ public class Blimp extends JApplet

     menuOutputMcuf.addActionListener( this );

     menuOutput.add( menuOutputMcuf );

     groupOutput.add( menuOutputMcuf );

+    menuOutputFlexiPix = new JRadioButtonMenuItem( "FlexiPix", false );

+    menuOutputFlexiPix.setMnemonic( KeyEvent.VK_F );

+    menuOutputFlexiPix.addActionListener( this );

+    menuOutput.add( menuOutputFlexiPix );

+    groupOutput.add( menuOutputFlexiPix );

     menuOutputNone.setSelected( true );

     //help menu

     menuHelp = new JMenu( "Help" );