diff --git a/.gitignore b/.gitignore index 858f7a8..106c67c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /target/ *.png +.DS_Store diff --git a/images/Screen Shot 2021-06-03 at 17.47.08.png b/images/Screen Shot 2021-06-03 at 17.47.08.png deleted file mode 100644 index af4bccb..0000000 Binary files a/images/Screen Shot 2021-06-03 at 17.47.08.png and /dev/null differ diff --git a/images/Screen Shot 2021-06-09 at 19.18.04.png b/images/Screen Shot 2021-06-09 at 19.18.04.png deleted file mode 100644 index c67a44f..0000000 Binary files a/images/Screen Shot 2021-06-09 at 19.18.04.png and /dev/null differ diff --git a/src/main/java/org/clas/detectors/Acronyms.java b/src/main/java/org/clas/detectors/Acronyms.java index efb84f6..a93e20f 100644 --- a/src/main/java/org/clas/detectors/Acronyms.java +++ b/src/main/java/org/clas/detectors/Acronyms.java @@ -38,9 +38,10 @@ public Acronyms() { + "TDC:\t\tTime to Digital Converter \n" + "PMT:\t\tPhoto Multiplier Tube\n" + "SiPM:\t\tSilicon Photomultiplier\n"); - this.acronymsPanel.add(acronymsDefinitions,BorderLayout.CENTER); + this.acronymsPanel.add(acronymsDefinitions,BorderLayout.WEST); acronymsDefinitions.setFont(new Font("Avenir",Font.PLAIN,16)); acronymsDefinitions.setEditable(false); + this.acronymsPanel.add(Util.getImage("/images/clas12-design.jpg",0.3),BorderLayout.CENTER); } } diff --git a/src/main/java/org/clas/detectors/Util.java b/src/main/java/org/clas/detectors/Util.java new file mode 100644 index 0000000..8fc4f94 --- /dev/null +++ b/src/main/java/org/clas/detectors/Util.java @@ -0,0 +1,27 @@ +package org.clas.detectors; + +import java.awt.Image; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.imageio.ImageIO; +import javax.swing.ImageIcon; +import javax.swing.JLabel; + +public class Util { + + public static JLabel getImage(String path, double scale) { + try { + Image image = ImageIO.read(Util.class.getResourceAsStream(path)); + ImageIcon imageIcon = new ImageIcon(image); + double width = imageIcon.getIconWidth() * scale; + double height = imageIcon.getIconHeight() * scale; + imageIcon = new ImageIcon(image.getScaledInstance((int) width, (int) height, Image.SCALE_SMOOTH)); + return new JLabel(imageIcon); + } catch (Exception ex) { + Logger.getLogger(Util.class.getName()).log(Level.SEVERE, null, ex); + System.err.println("Picture upload from " + path + " failed"); + return new JLabel(); + } + } + +} diff --git a/src/main/java/org/clas/viewer/EventViewer.java b/src/main/java/org/clas/viewer/EventViewer.java index 24127d1..b2a3237 100755 --- a/src/main/java/org/clas/viewer/EventViewer.java +++ b/src/main/java/org/clas/viewer/EventViewer.java @@ -2,24 +2,21 @@ import java.awt.BorderLayout; import java.awt.Font; -import java.awt.Image; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.io.File; import java.io.IOException; -import java.net.URL; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.LinkedHashMap; import java.util.Map; +import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; -import javax.imageio.ImageIO; -import javax.swing.ImageIcon; import javax.swing.JCheckBoxMenuItem; import javax.swing.JFileChooser; import javax.swing.JFrame; @@ -308,9 +305,16 @@ public void initSummary() { JSplitPane splitPanel = new JSplitPane(); splitPanel.setLeftComponent(CLAS12View); splitPanel.setRightComponent(this.CLAS12Canvas); - JTextPane clas12Text = new JTextPane(); - clas12Text.setText("CLAS12\n monitoring plots\n V7.11\n"); - clas12Text.setEditable(false); + JTextPane clas12Text = new JTextPane(); + clas12Text.setEditable(false); + try { + Properties p = new Properties(); + p.load(EventViewer.class.getResourceAsStream("/META-INF/maven/org.clas.detector/clas12mon/pom.properties")); + clas12Text.setText("MON12 v"+p.getProperty("version")); + } catch (IOException ex) { + Logger.getLogger(EventViewer.class.getName()).log(Level.SEVERE, null, ex); + clas12Text.setText("MON12 v?.??\n"); + } this.clas12Textinfo.setEditable(false); this.clas12Textinfo.setFont(new Font("Avenir",Font.PLAIN,16)); this.clas12Textinfo.setBackground(CLAS12View.getBackground()); @@ -320,11 +324,12 @@ public void initSummary() { styledDoc.setParagraphAttributes(0, styledDoc.getLength(), center, false); clas12Text.setBackground(CLAS12View.getBackground()); clas12Text.setFont(new Font("Avenir",Font.PLAIN,20)); - JLabel clas12Design = this.getImage("https://www.jlab.org/Hall-B/clas12-web/sidebar/clas12-design.jpg",0.08); - CLAS12View.add(this.clas12Textinfo,BorderLayout.BEFORE_FIRST_LINE ); - CLAS12View.add(clas12Design); - CLAS12View.add(clas12Text,BorderLayout.PAGE_END); - + JLabel clas12Design = Util.getImage("/images/CLAS-frame-high.jpg",0.1); + CLAS12View.add(this.clas12Textinfo,BorderLayout.NORTH ); + JPanel x = new JPanel(new BorderLayout()); + x.add(clas12Design,BorderLayout.NORTH); + x.add(clas12Text,BorderLayout.SOUTH); + CLAS12View.add(x,BorderLayout.SOUTH); this.tabbedpane.add(splitPanel,"Summary"); } @@ -533,22 +538,6 @@ public void chooseUpdateInterval() { } } } - - private JLabel getImage(String path, double scale) { - Image image = null; - try { - URL url = new URL(path); - image = ImageIO.read(url); - } catch (IOException e) { - e.printStackTrace(); - System.out.println("Picture upload from " + path + " failed"); - } - ImageIcon imageIcon = new ImageIcon(image); - double width = imageIcon.getIconWidth() * scale; - double height = imageIcon.getIconHeight() * scale; - imageIcon = new ImageIcon(image.getScaledInstance((int) width, (int) height, Image.SCALE_SMOOTH)); - return new JLabel(imageIcon); - } private int getEventNumber(DataEvent event) { DataBank bank = event.getBank("RUN::config"); diff --git a/images/CLAS-frame-high.jpg b/src/main/resources/images/CLAS-frame-high.jpg similarity index 100% rename from images/CLAS-frame-high.jpg rename to src/main/resources/images/CLAS-frame-high.jpg diff --git a/images/clas12-design.jpg b/src/main/resources/images/clas12-design.jpg similarity index 100% rename from images/clas12-design.jpg rename to src/main/resources/images/clas12-design.jpg diff --git a/src/main/resources/jlog.jar b/src/main/resources/jlog.jar deleted file mode 100644 index e8d1507..0000000 Binary files a/src/main/resources/jlog.jar and /dev/null differ