Changeset 196

Timestamp:

09/14/11 16:58:17 (13 years ago)

Author:

vmipsl

Message:

Servlet _ 2D ok

Location:

ether_megapoli/trunk/service

Files:

• implementation/com/ether/EtherPlotContentServiceImpl.java (modified) (1 diff)
• implementation/com/ether/EtherPlotServiceImpl.java (modified) (3 diffs)
• interface/com/ether/ServiceException.java (modified) (1 diff)

ether_megapoli/trunk/service/implementation/com/ether/EtherPlotContentServiceImpl.java

@@ -227 +227 @@
         try
         {
-            jPlotLayout.setKeyLayerSizeP( new Dimension2D( 6.0, 1.02 ) );
-            jPlotLayout.setKeyBoundsP( new Rectangle2D.Double( 0.01, 1.01, 5.98, 1.0 ) );
+//            jPlotLayout.setKeyLayerSizeP( new Dimension2D( 12.0, 24.0 ) );
+//            jPlotLayout.setKeyBoundsP( new Rectangle2D.Double( 0.01, 1.01, 5.98, 1.0 ) );
             final Layer keyLayer = jPlotLayout.getKeyPane().getLayer( "Key Layer" );
             jPlotLayout.add( keyLayer );
-
         }
         catch( LayerNotFoundException e )
         {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
+            throw new ServiceException( ServiceException.ServiceCode.LEGEND_LAYER_NOT_FOUND, new Throwable( ServiceException.ServiceCode.LEGEND_LAYER_NOT_FOUND.toString() ) );
         }
 

ether_megapoli/trunk/service/implementation/com/ether/EtherPlotServiceImpl.java

@@ -87 +87 @@
             else
             {
-                if( megapoliPlot.isTimeSerie() )
-                {
-                    final JLabel jLabelPlot = transformJPaneToJLabel( jPaneCenter, true );
-
-                    final JPane jPaneCenterToImage = new JPane( "Center jPane", new Dimension( jLabelPlot.getWidth(), jLabelPlot.getHeight() ) );
-                    jPaneCenterToImage.setLayout( new GridBagLayout() );
-                    jPaneCenterToImage.add( jLabelPlot,
-                            new GridBagConstraints( 0, 0, 1, 1, 0, 0,
-                                    GridBagConstraints.CENTER,
-                                    GridBagConstraints.CENTER,
-                                    new Insets( 0, 0, 0, 0 ), 0, 0 ) );
-
-                    jPane.add( jPaneCenterToImage, BorderLayout.CENTER );
-                }
-                else
-                {
-                    final JLabel jLabelPlot2D = transformJPaneToJLabel( jPaneCenter, true );
-//                    final JPane keyPane = ( (JPlotLayout) jPaneCenter ).getKeyPane();
-//                    final JLabel jLabelPlotLegend = transformJPaneToJLabel( keyPane, false );
-//                    final JPane jPane2D = new JPane( "2D jPane", new Dimension( jPaneCenter.getWidth(), jPaneCenter.getHeight() + keyPane.getHeight() ) );
-//                    jPane2D.setLayout( new BorderLayout() );
-//                    jPane2D.setBackground( Color.white );
-//                    jPane2D.add( jLabelPlot2D, BorderLayout.SOUTH );
-//                    jPane2D.add( jLabelPlotLegend, BorderLayout.NORTH );
-//                    jPane2D.setVisible( true );
-//                    jPane2D.setOpaque( true );
-//                    jPane2D.validate();
-
-//                    final JPanelToImageManager jPanelToImageManager = new JPanelToImageManager( jPane2D );
-//                    final BufferedImage bufferedImage = jPanelToImageManager.saveAsImage();
-//
-//                    final ImageIcon imageIcon = new ImageIcon( bufferedImage );
-//                    final JLabel jLabelPlot = new JLabel( imageIcon, JLabel.CENTER );
-//                    jLabelPlot.setBorder( BorderFactory.createLineBorder( Color.black, 1 ) );
-//
-                    final JPane jPaneCenterToImage = new JPane( "Center jPane", new Dimension( jLabelPlot2D.getWidth(), jLabelPlot2D.getHeight() ) );
-                    jPaneCenterToImage.setLayout( new GridBagLayout() );
-                    jPaneCenterToImage.add( jLabelPlot2D,
-                            new GridBagConstraints( 0, 0, 1, 1, 0, 0,
-                                    GridBagConstraints.CENTER,
-                                    GridBagConstraints.CENTER,
-                                    new Insets( 0, 0, 0, 0 ), 0, 0 ) );
-
-                    jPane.add( jPaneCenterToImage, BorderLayout.CENTER );
-                }
+                final JLabel jLabelPlot = transformJPaneToJLabel( jPaneCenter );
+
+                final JPane jPaneCenterToImage = new JPane();
+                jPaneCenterToImage.setLayout( new GridBagLayout() );
+                jPaneCenterToImage.add( jLabelPlot,
+                        new GridBagConstraints( 0, 0, 1, 1, 0, 0,
+                                GridBagConstraints.CENTER,
+                                GridBagConstraints.CENTER,
+                                new Insets( 0, 0, 0, 0 ), 0, 0 ) );
+
+                jPane.add( jPaneCenterToImage, BorderLayout.CENTER );
             }
         }
@@ -144 +110 @@
     }
 
-    private JLabel transformJPaneToJLabel( final JPane jPane, final boolean needeBorder )
-    {
-        final BufferedImage jPaneBufferedImage = new BufferedImage( jPane.getWidth(), jPane.getHeight(), BufferedImage.TYPE_INT_ARGB );
-        final Graphics2D graphics2D = jPaneBufferedImage.createGraphics();
-        jPane.addNotify();
-        jPane.validate();
-        jPane.draw( graphics2D );
-
-        final ImageIcon imageIcon = new ImageIcon( jPaneBufferedImage );
-        final JLabel jLabelPlot = new JLabel( imageIcon, JLabel.CENTER );
-        if( needeBorder )
-            jLabelPlot.setBorder( BorderFactory.createLineBorder( Color.black, 1 ) );
-        return jLabelPlot;
-    }
-
     /**
      * Create the top JPane with the logos and title
@@ -314 +265 @@
     }
 
+    /**
+     * This method transform a jPane to a jLabel with a BufferedImage inside and a black border
+     *
+     * @param jPane
+     * @return
+     */
+    @NotNull
+    private JLabel transformJPaneToJLabel( @NotNull final JPane jPane )
+    {
+        final BufferedImage jPaneBufferedImage = new BufferedImage( jPane.getWidth(), jPane.getHeight(), BufferedImage.TYPE_INT_ARGB );
+        final Graphics2D graphics2D = jPaneBufferedImage.createGraphics();
+        jPane.addNotify();
+        jPane.validate();
+        jPane.draw( graphics2D );
+
+        final ImageIcon imageIcon = new ImageIcon( jPaneBufferedImage );
+        final JLabel jLabelPlot = new JLabel( imageIcon, JLabel.CENTER );
+        jLabelPlot.setBorder( BorderFactory.createLineBorder( Color.black, 1 ) );
+        return jLabelPlot;
+    }
+
     @NotNull
     private String formatTitle( @Nullable final String title )

ether_megapoli/trunk/service/interface/com/ether/ServiceException.java

@@ -28 +28 @@
         PARAMETER_IS_NULL,
         VALUE_NOT_FOUND,
-        PANEL_MODEL_NOT_FOUND;
+        PANEL_MODEL_NOT_FOUND,
+        LEGEND_LAYER_NOT_FOUND;
     }
 }