Pre-release 1.3

impactcentre · Feb 2, 2014 · f6b8791 · f6b8791
2 parents 718e81f + dd8be3d
commit f6b8791
Show file tree

Hide file tree

Showing 98 changed files with 5,292 additions and 504 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,4 @@
+all:
+	mvn clean package -DskipTests
+tar: 
+	tar cvf ocrevaluation.tgz  .
diff --git a/ocrevaluation.jar b/ocrevaluation.jar
diff --git a/ocrevaluation.tgz b/ocrevaluation.tgz
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
     <groupId>eu.digitisation</groupId>
     <artifactId>ocrevalUAtion</artifactId>
     <name>ocrevalUAtion</name>
-    <version>1.2.7</version>
+    <version>1.3.0-pre</version>
     <packaging>jar</packaging>
     <description>OCR Evaluation Tool</description>
     <organization>
@@ -58,7 +58,7 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <mainClass>eu.digitisation.MainGUI</mainClass>
+                            <mainClass>eu.digitisation.input.GUI</mainClass>
                         </manifest>
                     </archive>
                 </configuration>
@@ -75,7 +75,7 @@
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
-                            <mainClass>eu.digitisation.MainGUI</mainClass>
+                            <mainClass>eu.digitisation.input.GUI</mainClass>
                         </manifest>
                     </archive>
                 </configuration>

diff --git a/src/main/java/eu/digitisation/File2Text.java b/src/main/java/eu/digitisation/File2Text.java
@@ -17,9 +17,9 @@
  */
 package eu.digitisation;
 
-import eu.digitisation.io.CharFilter;
-import eu.digitisation.io.TextContent;
-import eu.digitisation.io.UnsupportedFormatException;
+import eu.digitisation.text.CharFilter;
+import eu.digitisation.text.TextContent;
+import eu.digitisation.input.WarningException;
 import java.io.File;
 
 /**
@@ -28,7 +28,7 @@
  */
 public class File2Text {
 
-    public static void main(String[] args) throws UnsupportedFormatException {
+    public static void main(String[] args) throws WarningException {
         if (args.length > 0) {
             File file = new File(args[0]);
             CharFilter filter = null;

diff --git a/src/main/java/eu/digitisation/Main.java b/src/main/java/eu/digitisation/Main.java
@@ -1,9 +1,9 @@
 package eu.digitisation;
 
-import eu.digitisation.io.Batch;
-import eu.digitisation.io.CharFilter;
-import eu.digitisation.io.UnsupportedFormatException;
-import eu.digitisation.ocrevaluation.Report;
+import eu.digitisation.input.Batch;
+import eu.digitisation.text.CharFilter;
+import eu.digitisation.input.WarningException;
+import eu.digitisation.output.Report;
 import java.io.File;
 import java.io.InvalidObjectException;
 import java.util.logging.Level;
@@ -27,7 +27,7 @@ private static void exit_gracefully() {
     /**
      * @param args the command line arguments
      */
-    public static void main(String[] args) throws UnsupportedFormatException {
+    public static void main(String[] args) throws WarningException {
 
         File repfile = null;     // char filter
         File gtfile = null;      // ground-truth

diff --git a/src/main/java/eu/digitisation/MainGUI.java b/src/main/java/eu/digitisation/MainGUI.java
@@ -21,16 +21,15 @@
 import eu.digitisation.gui.HelpButton;
 import eu.digitisation.gui.InputFileSelector;
 import eu.digitisation.gui.JLink;
-import eu.digitisation.gui.OutputFileSelector;
-import eu.digitisation.io.Batch;
-import eu.digitisation.io.CharFilter;
-import eu.digitisation.io.UnsupportedFormatException;
-import eu.digitisation.ocrevaluation.Report;
+import eu.digitisation.output.OutputFileSelector;
+import eu.digitisation.input.Batch;
+import eu.digitisation.text.CharFilter;
+import eu.digitisation.input.WarningException;
+import eu.digitisation.output.Report;
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
-import java.awt.Dimension;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -59,7 +58,7 @@ public class MainGUI extends JFrame implements ActionListener {
     static final int height = 250;
     Container pane;            // main panel
     JPanel basic;              // basic inputs
-    JPanel info;              // link to info
+    JPanel info;               // link to info
     JPanel advanced;           // more options panel
     JPanel actions;            // actions panel
     InputFileSelector gtinput; // GT file
@@ -71,9 +70,8 @@ public class MainGUI extends JFrame implements ActionListener {
     JCheckBox more;            // Checkbox for more options
 
     public MainGUI() {
-
+        // Main panel
         pane = getContentPane();
-        trigger = new JButton("Generate report");
 
         // JFrame attributes
         setTitle("ocrevalUAtion");
@@ -92,12 +90,14 @@ public MainGUI() {
                 border, "ocr file");
         basic.add(gtinput);
         basic.add(ocrinput);
+
         // Link to on-line help
         info = new JPanel();
         info.setLayout(new BoxLayout(info, BoxLayout.X_AXIS));
         info.add(new JLink("Info:",
                 "https://sites.google.com/site/textdigitisation/ocrevaluation",
                 forecolor));
+
         // Advanced options subpanel
         advanced = new JPanel();
         advanced.setLayout(new GridLayout(0, 1));
@@ -111,24 +111,15 @@ public MainGUI() {
         compatibility.setForeground(forecolor);
         compatibility.setBackground(bgcolor);
         compatibility.setAlignmentX(Component.LEFT_ALIGNMENT);
-        help = new HelpButton();
-        help.setPreferredSize(new Dimension(10, 10));
-        help.setForeground(forecolor);
-        help.setBackground(bgcolor);
-        help.addActionListener(this);
+        help = new HelpButton(null,
+                "http://unicode.org/reports/tr15/#Canon_Compat_Equivalence", forecolor, bgcolor);
         JPanel cpanel = new JPanel();
         cpanel.setLayout(new BoxLayout(cpanel, BoxLayout.X_AXIS));
         cpanel.add(compatibility);
         cpanel.add(help);
 
-        /*
-         String[] options = {"unknown", "utf8", "iso8859-1", "windows-1252"};
-         Pulldown encoding = new Pulldown(forecolor, bgcolor, null,
-         "Text encoding:", options);
-         */
         advanced.add(eqinput);
         advanced.add(cpanel);
-        //advanced.add(encoding);
         advanced.setVisible(false);
 
         // Actions subpanel
@@ -143,7 +134,8 @@ public MainGUI() {
         actions.add(more, BorderLayout.WEST);
         // Space between checkbox and button
         actions.add(Box.createHorizontalGlue());
-        // Button with inverted colors
+        // Button with inverted colors 
+        trigger = new JButton("Generate report");
         trigger.setForeground(bgcolor);
         trigger.setBackground(forecolor);
         trigger.addActionListener(this);
@@ -203,7 +195,7 @@ public void actionPerformed(ActionEvent e) {
                             report = new Report(batch, null, null, filter);
                             report.write(outfile);
                             Browser.open(url);
-                        } catch (UnsupportedFormatException ex) {
+                        } catch (WarningException ex) {
                             warning(ex.getMessage());
                         } catch (IOException ex) {
                             warning("Input/Output Error");
@@ -224,10 +216,6 @@ public void actionPerformed(ActionEvent e) {
                 setSize(width, height);
             }
             advanced.setVisible(marked);
-        } else if (e.getSource() == help) {
-            String s
-                    = "http://unicode.org/reports/tr15/#Canon_Compat_Equivalence";
-            Browser.open(s);
         }
     }