School-DUT-info/M332-PT-NGCC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-iutinfo.unice.fr/rey/pt-s3t-g4

Browse Source
This commit is contained in:
Heraud.Antoine
2019-10-25 15:45:30 +02:00
parent 554b5e2789 dfb82d3ad2
commit c37adc36b4
21 changed files with 2971 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

157
src/commands/Read.java
View File

@@ -1,10 +1,5 @@
package commands;
import picocli.CommandLine;
import picocli.CommandLine.*;
import progressbar.ProgressBar;
import java.io.File;
import java.io.PrintStream;
import java.util.concurrent.Callable;
@@ -17,50 +12,42 @@ import org.apache.logging.log4j.core.config.Configurator;
import config.Config;
import csv.GenerateCSV;
import ocr.GestionnaireCopies;
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Model;
import picocli.CommandLine.Option;
import picocli.CommandLine.Parameters;
import picocli.CommandLine.Spec;
@SuppressWarnings("unused")
@Command(
name = "-r",
version = "Version 1.0",
sortOptions = false,
usageHelpWidth = 60,
header = "Read command - Automatic entry",
footer = "",
description = "\nAnalyzes all scanned copies (pdf files) provided to recognize student's name and mark.\n"
)
@Command(name = "-r", version = "Version 1.0", sortOptions = false, usageHelpWidth = 60, header = "Read command - Automatic entry", footer = "", description = "\nAnalyzes all scanned copies (pdf files) provided to recognize student's name and mark.\n")
public class Read implements Callable<Void> {
public Logger logger = LogManager.getLogger(Read.class);
public class Read implements Callable <Void> {
public Logger logger = LogManager.getLogger(Read.class);
@Spec
Model.CommandSpec spec;
@Option(names= {"-help"}, arity = "0", order = 1, description = "command help")
@Option(names = { "-help" }, arity = "0", order = 1, description = "command help")
boolean help;
@Option(names= {"-u"}, arity = "1", order = 2, description = "update mode")
@Option(names = { "-u" }, arity = "1", order = 2, description = "update mode")
int step;
@Option(names= {"-v"}, arity = "0..*", order = 3, defaultValue = "1", description ="verbose mode")
@Option(names = { "-v" }, arity = "0..*", order = 3, defaultValue = "1", description = "verbose mode")
public int vb_level;
@Option(names= {"-d"}, arity = "1", order = 4, defaultValue = "copies", description ="directory")
@Option(names = { "-d" }, arity = "1", order = 4, defaultValue = "copies", description = "directory")
String directory_name;
@Option(names= {"-o"}, arity = "1", order = 5, defaultValue = "result.csv", description ="result")
@Option(names = { "-o" }, arity = "1", order = 5, defaultValue = "result.csv", description = "result")
String result_name;
@Parameters(arity = "0..1", defaultValue = "./source.txt", description ="source path")
@Parameters(arity = "0..1", defaultValue = "config/source.txt", description = "source path")
String source_path;
// Flux de sortie si nécéssaire
public Read(PrintStream out) {
}
@@ -68,49 +55,42 @@ public class Read implements Callable <Void> {
// Check de l'extension csv (à améliorer)
public boolean isCsv(String file) {
return file.endsWith(".csv");
}
@Override
public Void call() throws Exception {
// Niveau de debug selon verbosite
if (vb_level >= 0 && vb_level <=2) {
if ((this.vb_level >= 0) && (this.vb_level <= 2)) {
Configurator.setLevel("commands", Level.FATAL);
Configurator.setLevel("csv", Level.FATAL);
}
else if (vb_level >= 3 && vb_level <=4) {
} else if ((this.vb_level >= 3) && (this.vb_level <= 4)) {
Configurator.setLevel("commands", Level.ERROR);
Configurator.setLevel("csv", Level.ERROR);
}
else if (vb_level >= 5 && vb_level <=6) {
} else if ((this.vb_level >= 5) && (this.vb_level <= 6)) {
Configurator.setLevel("commands", Level.WARN);
Configurator.setLevel("csv", Level.WARN);
}
else if (vb_level >= 7 && vb_level <=8) {
} else if ((this.vb_level >= 7) && (this.vb_level <= 8)) {
Configurator.setLevel("commands", Level.INFO);
Configurator.setLevel("csv", Level.INFO);
}
else {
} else {
Configurator.setLevel("commands", Level.DEBUG);
Configurator.setLevel("csv", Level.DEBUG);
}
// Help genere de la commande
if(help) {
logger.info("Help for 'read' command executed");
if (this.help) {
this.logger.info("Help for 'read' command executed");
CommandLine.usage(this.spec, System.out);
}
else {
} else {
//************* Progress Bar Prototype **************
// ProgressBar bar = new ProgressBar();
//
//
// System.out.println("\nReading pdf ...\n");
//
// bar.update(0, 1000);
@@ -122,46 +102,45 @@ public class Read implements Callable <Void> {
// // update the progress bar
// bar.update(i, 1000); // On ajoute 100/imgList.length à chaque temps estimé par image
// }
//
//
// System.out.println("\nCopies correction succeed !\n");
//***************************************************
// Log des parametres
logger.info("Read mode activated");
logger.debug("Update : "+step);
logger.debug("Verbose : "+vb_level);
logger.debug("Directory : "+directory_name);
logger.debug("Result : "+result_name);
logger.debug("Source : "+source_path);
if (!isCsv(result_name)) {
result_name = result_name+".csv";
logger.info("Result file name changed to '"+result_name+"'");
this.logger.info("Read mode activated");
this.logger.debug("Update : " + this.step);
this.logger.debug("Verbose : " + this.vb_level);
this.logger.debug("Directory : " + this.directory_name);
this.logger.debug("Result : " + this.result_name);
this.logger.debug("Source : " + this.source_path);
if (!this.isCsv(this.result_name)) {
this.result_name = this.result_name + ".csv";
this.logger.info("Result file name changed to '" + this.result_name + "'");
}
Config config = new Config(source_path); //Initialise le fichier de configuration selon le chemin donné
Config config = new Config(this.source_path); // Initialise le fichier de configuration selon le chemin
// donné
config.readConfig();
String filePath = new File("").getAbsolutePath();
// Instantie l'OCR
GestionnaireCopies ocr = new GestionnaireCopies(directory_name);
logger.debug("CSV initialized with : "+ocr.createHashMapforCSV()+" , "+config.getParam().get("Code")+" , "+result_name);
GenerateCSV csv = new GenerateCSV(ocr.createHashMapforCSV(),config.getParam().get("Code"),config.getParam().get("MarkFormat"), result_name);
csv.createFile(); //Génère le fichier csv à partir de la HMap retournée par l'OCR
//Done !
GestionnaireCopies ocr = new GestionnaireCopies(this.directory_name);
this.logger.debug("CSV initialized with : " + ocr.createHashMapforCSV() + " , "
+ config.getParam().get("Code") + " , " + this.result_name);
GenerateCSV csv = new GenerateCSV(ocr.createHashMapforCSV(), config.getParam().get("Code"),
config.getParam().get("MarkFormat"), this.result_name);
csv.createFile(); // Génère le fichier csv à partir de la HMap retournée par l'OCR
// Done !
}
return null;
return null;
}
}

29
src/ocr/OCR.java
View File

@@ -1,28 +1,27 @@
package ocr;
import java.awt.image.BufferedImage;
import net.sourceforge.tess4j.Tesseract;
import net.sourceforge.tess4j.TesseractException;
import net.sourceforge.tess4j.Tesseract;
import net.sourceforge.tess4j.TesseractException;
public abstract class OCR {
public static String applyOcrNumber(BufferedImage img) {
//FAIRE L'OCR
// FAIRE L'OCR
Tesseract tesseract = new Tesseract();
String str="";
String str = "";
try {
tesseract.setDatapath("Tess4J");
tesseract.setDatapath("config");
tesseract.setLanguage("eng");
//tesseract.setOcrEngineMode(2);
tesseract.setTessVariable("tessedit_char_whitelist",",0123456789");
str=tesseract.doOCR(img);
// tesseract.setOcrEngineMode(2);
tesseract.setTessVariable("tessedit_char_whitelist", ",0123456789");
str = tesseract.doOCR(img);
} catch (TesseractException e) {
e.printStackTrace();
}
return str;
return str;
}
}