Blimp

@@ -4,7 +4,7 @@

 # a blinkenarea.org project

 BLINKENLIB:=../BlinkenLibJava/BlinkenLib.jar

-JFLEXIPIX:=../JFlexiPix/JFlexiPix.jar

+JETHERPIX:=../JEtherPix/JEtherPix.jar

 VERSION_MAJOR:=1

 VERSION_MINOR:=4

@@ -21,7 +21,7 @@ IMG:=$(P)/images

 GENJAVA:=$(P)/Version.java

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

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

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

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

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

   JMenuItem menuPlayStart, menuPlayStop;

   JCheckBoxMenuItem menuPlayBegin, menuPlayLoop;

   ButtonGroup groupOutput;

-  JRadioButtonMenuItem menuOutputNone, menuOutputMcuf, menuOutputMcufFile, menuOutputFlexiPix;

+  JRadioButtonMenuItem menuOutputNone, menuOutputMcuf, menuOutputMcufFile, menuOutputEtherPix;

   JMenuItem menuHelpAbout;

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

   JPanel panelMiddleFrame, panelFrame, panelDuration, panelColors;

@@ -144,9 +144,9 @@ public class Blimp extends JApplet

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

   String outMcufFileName; // name of MCUF output file

   FileOutputStream outMcufFile; // file/device to output MCUF to

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

-  File outFlexiPixCurFile = null; //config file

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

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

+  File outEtherPixCurFile = null; //config file

+  org.blinkenarea.JEtherPix.Display outEtherPixDisplay; //EtherPix display

   //other variables

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

@@ -1309,9 +1309,9 @@ public class Blimp extends JApplet

       outMcufFile = null;

     }

-    //close FlexiPix output

-    if( outFlexiPixDisplay != null )

-      outFlexiPixDisplay = null;

+    //close EtherPix output

+    if( outEtherPixDisplay != null )

+      outEtherPixDisplay = null;

     //set status to no output

     menuOutputNone.setSelected( true );

@@ -1458,8 +1458,8 @@ public class Blimp extends JApplet

     outFrame( );

   }

-  //"Output FlexiPix" was chosen from menu

-  private void actionOutputFlexiPix( )

+  //"Output EtherPix" was chosen from menu

+  private void actionOutputEtherPix( )

   {

     JFileChooser fileChooser;

     String cfgFile;

@@ -1469,32 +1469,32 @@ public class Blimp extends JApplet

     //ask for config file

     fileChooser = new JFileChooser( );

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

-    if( outFlexiPixCurDir != null )

-      fileChooser.setCurrentDirectory( outFlexiPixCurDir );

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

+    if( outEtherPixCurDir != null )

+      fileChooser.setCurrentDirectory( outEtherPixCurDir );

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

       return;

     //save current directory and current file

-    outFlexiPixCurDir = fileChooser.getCurrentDirectory( );

-    outFlexiPixCurFile = fileChooser.getSelectedFile( );

-    cfgFile = outFlexiPixCurFile.getPath( );

+    outEtherPixCurDir = fileChooser.getCurrentDirectory( );

+    outEtherPixCurFile = fileChooser.getSelectedFile( );

+    cfgFile = outEtherPixCurFile.getPath( );

-    //create FlexiPix display

+    //create EtherPix display

     try

     {

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

+      outEtherPixDisplay = new org.blinkenarea.JEtherPix.Display( cfgFile, null );

     }

     catch( Exception e )

     {

       //cannot create display -> turn off output

       actionOutputNone( );

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

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

       return;

     }

-    //set status to FlexiPix output

-    menuOutputFlexiPix.setSelected( true );

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

+    //set status to EtherPix output

+    menuOutputEtherPix.setSelected( true );

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

     //output current frame

     outFrame( );

@@ -1520,10 +1520,10 @@ public class Blimp extends JApplet

                                                   org.blinkenarea.BlinkenLib.Version.Major,

                                                   org.blinkenarea.BlinkenLib.Version.Minor,

                                                   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 ),

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

+                                                  org.blinkenarea.JEtherPix.Version.Major,

+                                                  org.blinkenarea.JEtherPix.Version.Minor,

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

                                    "Blimp - About...",

                                    JOptionPane.INFORMATION_MESSAGE );

   }

@@ -2301,8 +2301,8 @@ public class Blimp extends JApplet

       actionOutputMcuf( );

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

       actionOutputMcufFile( );

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

-      actionOutputFlexiPix( );

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

+      actionOutputEtherPix( );

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

       actionOutTimer( );

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

@@ -2541,9 +2541,9 @@ public class Blimp extends JApplet

     if( menuOutputMcufFile.isSelected( ) )

       outMcufFile( );

-    //FlexiPix output

-    if( menuOutputFlexiPix.isSelected( ) )

-      outFlexiPix( );

+    //EtherPix output

+    if( menuOutputEtherPix.isSelected( ) )

+      outEtherPix( );

     //re-output after 1 s

     timerOut.setInitialDelay( 1000 );

@@ -2599,22 +2599,22 @@ public class Blimp extends JApplet

     }

   }

-  //output current frame to FlexiPix

-  private void outFlexiPix( )

+  //output current frame to EtherPix

+  private void outEtherPix( )

   {

     BlinkenFrame frame;

     int width, height;

     byte [] data;

-    // exit if no FlexiPix display

-    if( outFlexiPixDisplay == null )

+    // exit if no EtherPix display

+    if( outEtherPixDisplay == null )

       return;

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

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

     frame = new BlinkenFrame( curFrame );

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

-    width = outFlexiPixDisplay.getWidth( );

-    height = outFlexiPixDisplay.getHeight( );

+    width = outEtherPixDisplay.getWidth( );

+    height = outEtherPixDisplay.getHeight( );

     frame.scale( height, width );

     //convert frame into MCUF data

@@ -2622,14 +2622,14 @@ public class Blimp extends JApplet

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

       return;

-    //transfer data to FlexiPix display object

-    outFlexiPixDisplay.data(data,

+    //transfer data to EtherPix display object

+    outEtherPixDisplay.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( );

+    //send packets to real EtherPix display

+    outEtherPixDisplay.send( );

   }

   //entry point of main thread

@@ -2893,11 +2893,11 @@ public class Blimp extends JApplet

     menuOutputMcufFile.addActionListener( this );

     menuOutput.add( menuOutputMcufFile );

     groupOutput.add( menuOutputMcufFile );

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

-    menuOutputFlexiPix.setMnemonic( KeyEvent.VK_F );

-    menuOutputFlexiPix.addActionListener( this );

-    menuOutput.add( menuOutputFlexiPix );

-    groupOutput.add( menuOutputFlexiPix );

+    menuOutputEtherPix = new JRadioButtonMenuItem( "EtherPix", false );

+    menuOutputEtherPix.setMnemonic( KeyEvent.VK_E );

+    menuOutputEtherPix.addActionListener( this );

+    menuOutput.add( menuOutputEtherPix );

+    groupOutput.add( menuOutputEtherPix );

     menuOutputNone.setSelected( true );

     //help menu

     menuHelp = new JMenu( "Help" );