X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FWebserviceInfo.java;h=7a5d6933f14e8d2d952baea9d82d1366c496b0f4;hb=4a3def9f59cefe629c9a33d87483283aee085928;hp=162d2b0e26c265ca4e720b2a16d4350164c3f85e;hpb=9b74b98cc1471c8b2d221bde484f7cacd1c1d968;p=jalview.git diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java index 162d2b0..7a5d693 100644 --- a/src/jalview/gui/WebserviceInfo.java +++ b/src/jalview/gui/WebserviceInfo.java @@ -20,9 +20,7 @@ */ package jalview.gui; -import jalview.jbgui.GWebserviceInfo; -import jalview.util.MessageManager; -import jalview.ws.WSClientI; +import java.util.Locale; import java.awt.BorderLayout; import java.awt.Color; @@ -32,6 +30,7 @@ import java.awt.Graphics2D; import java.awt.GridLayout; import java.awt.Image; import java.awt.MediaTracker; +import java.awt.RenderingHints; import java.awt.event.ActionEvent; import java.awt.image.BufferedImage; import java.util.Vector; @@ -45,9 +44,16 @@ import javax.swing.JTabbedPane; import javax.swing.JTextArea; import javax.swing.event.HyperlinkEvent; import javax.swing.event.HyperlinkListener; +import javax.swing.event.InternalFrameAdapter; +import javax.swing.event.InternalFrameEvent; import javax.swing.text.html.HTMLEditorKit; import javax.swing.text.html.StyleSheet; +import jalview.jbgui.GWebserviceInfo; +import jalview.util.ChannelProperties; +import jalview.util.MessageManager; +import jalview.ws.WSClientI; + /** * Base class for web service client thread and gui TODO: create StAX parser to * extract html body content reliably when preparing html formatted job statuses @@ -81,7 +87,7 @@ public class WebserviceInfo extends GWebserviceInfo Image image; - int angle = 0; + float angle = 0f; String title = ""; @@ -98,7 +104,7 @@ public class WebserviceInfo extends GWebserviceInfo { super.setVisible(aFlag); frame.setVisible(aFlag); - }; + } JTabbedPane subjobs = null; @@ -327,9 +333,7 @@ public class WebserviceInfo extends GWebserviceInfo this.title = title; setInfoText(info); - java.net.URL url = getClass() - .getResource("/images/Jalview_Logo_small.png"); - image = java.awt.Toolkit.getDefaultToolkit().createImage(url); + image = ChannelProperties.getImage("rotatable_logo.48"); MediaTracker mt = new MediaTracker(this); mt.addImage(image, 0); @@ -342,28 +346,27 @@ public class WebserviceInfo extends GWebserviceInfo } AnimatedPanel ap = new AnimatedPanel(); - ap.setPreferredSize(new Dimension(60, 0)); - titlePanel.add(ap, BorderLayout.LINE_START); + ap.setPreferredSize(new Dimension(60, 60)); + titlePanel.add(ap, BorderLayout.WEST); titlePanel.add(titleText, BorderLayout.CENTER); + setStatus(currentStatus); - Thread thread = new Thread(ap); + Thread thread = new Thread(ap, "AnimatedPanel"); thread.start(); final WebserviceInfo thisinfo = this; - frame.addInternalFrameListener( - new javax.swing.event.InternalFrameAdapter() - { - @Override - public void internalFrameClosed( - javax.swing.event.InternalFrameEvent evt) - { - // System.out.println("Shutting down webservice client"); - WSClientI service = thisinfo.getthisService(); - if (service != null && service.isCancellable()) - { - service.cancelJob(); - } - }; - }); + frame.addInternalFrameListener(new InternalFrameAdapter() + { + @Override + public void internalFrameClosed(InternalFrameEvent evt) + { + // System.out.println("Shutting down webservice client"); + WSClientI service = thisinfo.getthisService(); + if (service != null && service.isCancellable()) + { + service.cancelJob(); + } + } + }); frame.validate(); } @@ -544,7 +547,7 @@ public class WebserviceInfo extends GWebserviceInfo { return null; } - String lowertxt = text.toLowerCase(); + String lowertxt = text.toLowerCase(Locale.ROOT); int htmlpos = leaveFirst ? -1 : lowertxt.indexOf("= STATE_STOPPED_OK) { + park(); angle = 0; } @@ -821,31 +837,67 @@ protected void cancel_actionPerformed(ActionEvent e) cancel.setEnabled(false); } + public void park() + { + startTime = System.currentTimeMillis(); + + while (angle < 360) + { + float invSpeed = 5f; + float factor = 1f; + try + { + Thread.sleep(25); + + float delta = (System.currentTimeMillis() - startTime) / invSpeed; + angle += delta * factor; + startTime = System.currentTimeMillis(); + + if (angle >= 360) + { + angle = 360; + } + + repaint(); + } catch (Exception ex) + { + } + } + + } + void drawPanel() { if (offscreen == null || offscreen.getWidth(this) != getWidth() || offscreen.getHeight(this) != getHeight()) { offscreen = new BufferedImage(getWidth(), getHeight(), - BufferedImage.TYPE_INT_ARGB); + BufferedImage.TYPE_INT_RGB); } Graphics2D g = (Graphics2D) offscreen.getGraphics(); + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); + g.setRenderingHint(RenderingHints.KEY_INTERPOLATION, + RenderingHints.VALUE_INTERPOLATION_BICUBIC); + g.setRenderingHint(RenderingHints.KEY_RENDERING, + RenderingHints.VALUE_RENDER_QUALITY); + g.setColor(Color.white); g.fillRect(0, 0, getWidth(), getHeight()); if (image != null) { int x = image.getWidth(this) / 2, y = image.getHeight(this) / 2; - g.rotate(Math.toRadians(angle), 10 + x, 10 + y); - g.drawImage(image, 10, 10, this); - g.rotate(-Math.toRadians(angle), 10 + x, 10 + y); + g.rotate(3.14159 / 180 * (angle), x, y); + g.drawImage(image, 0, 0, this); + g.rotate(-3.14159 / 180 * (angle), x, y); } } @Override - public void paintComponent(Graphics g1) + public void paintComponent(Graphics g1) { drawPanel(); @@ -861,7 +913,7 @@ protected void cancel_actionPerformed(ActionEvent e) } @Override -public void hyperlinkUpdate(HyperlinkEvent e) + public void hyperlinkUpdate(HyperlinkEvent e) { Desktop.hyperlinkUpdate(e); }