diff --git a/.gitignore b/.gitignore index d0713c6..5474b92 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ NatBrailleTools/BrailleLogger/bin/Braille2GcodeEncoder.class NatBrailleTools/BrailleLogger/bin/Braille6GcodeEncoding.class NatBrailleTools/BrailleLogger/bin/BrailleLogger.class NatBrailleTools/BrailleLogger/bin/GCodeGenerator.class +NatBrailleTools.zip diff --git a/NatBrailleTools/BrailleLogger/ant/braillelogger_ant_build.xml b/NatBrailleTools/BrailleLogger/ant/braillelogger_ant_build.xml index 63b6d2c..de6d866 100644 --- a/NatBrailleTools/BrailleLogger/ant/braillelogger_ant_build.xml +++ b/NatBrailleTools/BrailleLogger/ant/braillelogger_ant_build.xml @@ -5,9 +5,9 @@ - + - + @@ -15,7 +15,7 @@ - + diff --git a/NatBrailleTools/BrailleLogger/bin/.gitignore b/NatBrailleTools/BrailleLogger/bin/.gitignore new file mode 100644 index 0000000..b3f7a60 --- /dev/null +++ b/NatBrailleTools/BrailleLogger/bin/.gitignore @@ -0,0 +1,4 @@ +/Braille2GcodeEncoder.java.bak +/BrailleLogger.java.bak +/BrailleGcodeDot.class +/BrailleGcodeEncoding.class diff --git a/NatBrailleTools/BrailleLogger/bin/braillelogger_ant_build.xml b/NatBrailleTools/BrailleLogger/bin/braillelogger_ant_build.xml deleted file mode 100644 index ce8f352..0000000 --- a/NatBrailleTools/BrailleLogger/bin/braillelogger_ant_build.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/NatBrailleTools/BrailleLogger/src/Braille2GcodeEncoder.java b/NatBrailleTools/BrailleLogger/src/Braille2GcodeEncoder.java index 239d0a0..51fddbe 100644 --- a/NatBrailleTools/BrailleLogger/src/Braille2GcodeEncoder.java +++ b/NatBrailleTools/BrailleLogger/src/Braille2GcodeEncoder.java @@ -9,7 +9,7 @@ import javax.swing.JOptionPane; */ /** - * Braille encoder class + * Braille encoder class * * @author crocsg * @@ -70,9 +70,7 @@ public class Braille2GcodeEncoder { this.encoder = encoder; } - /** - * Start a new page - */ + public void startPage () { pagedot = new ArrayList (); @@ -166,7 +164,7 @@ public class Braille2GcodeEncoder { { this.position_y += Braille_line_padding; } - + /** * End Braille characters line @@ -207,7 +205,7 @@ public class Braille2GcodeEncoder { * Add a character in page buffer to encode in Braille * @param a character to add */ - private void addCharToBuffer (char a) + private void addCharToBuffer (char a) { bufline += a; } diff --git a/NatBrailleTools/BrailleLogger/src/Braille6GcodeEncoding.java b/NatBrailleTools/BrailleLogger/src/Braille6GcodeEncoding.java index 677623a..2211e89 100644 --- a/NatBrailleTools/BrailleLogger/src/Braille6GcodeEncoding.java +++ b/NatBrailleTools/BrailleLogger/src/Braille6GcodeEncoding.java @@ -4,7 +4,7 @@ import java.util.ArrayList; /** * */ - + /** * @author lenovo * diff --git a/NatBrailleTools/BrailleLogger/src/BrailleGcodeDot.java b/NatBrailleTools/BrailleLogger/src/BrailleGcodeDot.java index 94012a5..83553be 100644 --- a/NatBrailleTools/BrailleLogger/src/BrailleGcodeDot.java +++ b/NatBrailleTools/BrailleLogger/src/BrailleGcodeDot.java @@ -1,4 +1,4 @@ - + /** * diff --git a/NatBrailleTools/BrailleLogger/src/BrailleGcodeEncoding.java b/NatBrailleTools/BrailleLogger/src/BrailleGcodeEncoding.java index f10c434..e76b4a7 100644 --- a/NatBrailleTools/BrailleLogger/src/BrailleGcodeEncoding.java +++ b/NatBrailleTools/BrailleLogger/src/BrailleGcodeEncoding.java @@ -4,7 +4,7 @@ import java.util.ArrayList; /** * */ - + /** * @author lenovo * diff --git a/NatBrailleTools/BrailleLogger/src/BrailleLogger.java b/NatBrailleTools/BrailleLogger/src/BrailleLogger.java index 3dbd1b8..a330fe5 100644 --- a/NatBrailleTools/BrailleLogger/src/BrailleLogger.java +++ b/NatBrailleTools/BrailleLogger/src/BrailleLogger.java @@ -14,12 +14,12 @@ import java.util.ArrayList; */ public class BrailleLogger { - + ArrayList braillepoints = new ArrayList (); /** * @param args */ - public static void main(String[] args) { + public static void main(String[] args) { // TODO Auto-generated method stub System.out.println ("; BrailleRapSP GCODE generator"); int arg = 0; @@ -57,9 +57,7 @@ public class BrailleLogger { } catch (FileNotFoundException e) { // TODO Auto-generated catch block - System.out.println("File not found:" + args[0]); - System.out.println(e.getMessage()); - //e.printStackTrace(); + e.printStackTrace(); } catch (IOException e) { // TODO Auto-generated catch block diff --git a/NatBrailleTools/BrailleLogger/src/GCodeGenerator.java b/NatBrailleTools/BrailleLogger/src/GCodeGenerator.java index 54fbeca..1e69ef0 100644 --- a/NatBrailleTools/BrailleLogger/src/GCodeGenerator.java +++ b/NatBrailleTools/BrailleLogger/src/GCodeGenerator.java @@ -2,14 +2,14 @@ import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; /** - * + * */ /** * @author lenovo * */ -public class GCodeGenerator { +public class GCodeGenerator { public String Home () diff --git a/NatBrailleTools/bin/braillelogger.jar b/NatBrailleTools/bin/braillelogger.jar index 344c0ba..e8ed0b2 100644 Binary files a/NatBrailleTools/bin/braillelogger.jar and b/NatBrailleTools/bin/braillelogger.jar differ diff --git a/NatBrailleTools/bin/gcodestreamer.jar b/NatBrailleTools/bin/gcodestreamer.jar deleted file mode 100644 index 4ce227c..0000000 Binary files a/NatBrailleTools/bin/gcodestreamer.jar and /dev/null differ