From 2bb467163d34b2d5002bd65b5b57db80a9e1b190 Mon Sep 17 00:00:00 2001
From: Hugo <hugo.poissonnier@etu.unice.fr>
Date: Fri, 27 Sep 2019 09:00:19 +0200
Subject: [PATCH] Modif ocr

---
 NGCC/src/ocr/Copie.java              |  6 +-
 NGCC/src/ocr/GestionnaireCopies.java |  5 ++
 NGCC/src/ocr/ImagesCopie.java        |  2 +-
 NGCC/src/ocr/diag.ucls               | 89 +++++++++++++++++++++++++++-
 4 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 NGCC/src/ocr/GestionnaireCopies.java

diff --git a/NGCC/src/ocr/Copie.java b/NGCC/src/ocr/Copie.java
index 56773a4..b4ec6ae 100644
--- a/NGCC/src/ocr/Copie.java
+++ b/NGCC/src/ocr/Copie.java
@@ -1,8 +1,12 @@
 package ocr;
 
+import java.awt.image.BufferedImage;
+
 public class Copie {
 
 	ImagesCopie base;
 
-
+	public Copie(BufferedImage img) {
+		this.base = new ImagesCopie(img); 
+	}
 }
diff --git a/NGCC/src/ocr/GestionnaireCopies.java b/NGCC/src/ocr/GestionnaireCopies.java
new file mode 100644
index 0000000..c88977b
--- /dev/null
+++ b/NGCC/src/ocr/GestionnaireCopies.java
@@ -0,0 +1,5 @@
+package ocr;
+
+public class GestionnaireCopies {
+
+}
diff --git a/NGCC/src/ocr/ImagesCopie.java b/NGCC/src/ocr/ImagesCopie.java
index 39bb319..1807497 100644
--- a/NGCC/src/ocr/ImagesCopie.java
+++ b/NGCC/src/ocr/ImagesCopie.java
@@ -3,7 +3,7 @@ package ocr;
 import java.awt.image.BufferedImage;
 import java.util.Map;
 
-public abstract class ImagesCopie {
+public class ImagesCopie {
 
 	private Map<String,Img> hMapImgs;
 	
diff --git a/NGCC/src/ocr/diag.ucls b/NGCC/src/ocr/diag.ucls
index 720ffbe..de3b52c 100644
--- a/NGCC/src/ocr/diag.ucls
+++ b/NGCC/src/ocr/diag.ucls
@@ -1,6 +1,93 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <class-diagram version="1.2.3" icons="true" always-add-relationships="false" generalizations="true" realizations="true" 
-  associations="true" dependencies="false" nesting-relationships="true">  
+  associations="true" dependencies="false" nesting-relationships="true" router="FAN">  
+  <class id="1" language="java" name="ocr.ImgNumEtu" project="PT" file="/PT/src/ocr/ImgNumEtu.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="99" width="157" x="309" y="901"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="2" language="java" name="ocr.Img" project="PT" file="/PT/src/ocr/Img.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="207" width="159" x="407" y="654"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="3" language="java" name="ocr.Rogneur" project="PT" file="/PT/src/ocr/Rogneur.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="153" width="267" x="100" y="322"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="4" language="java" name="ocr.Copie" project="PT" file="/PT/src/ocr/Copie.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="81" width="87" x="407" y="322"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="5" language="java" name="ocr.ImgNote" project="PT" file="/PT/src/ocr/ImgNote.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="99" width="143" x="506" y="901"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="6" language="java" name="ocr.OCR" project="PT" file="/PT/src/ocr/OCR.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="99" width="217" x="534" y="322"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <class id="7" language="java" name="ocr.ImagesCopie" project="PT" file="/PT/src/ocr/ImagesCopie.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="99" width="166" x="407" y="515"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
+      sort-features="false" accessors="true" visibility="true">      
+      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
+      <operations public="true" package="true" protected="true" private="true" static="true"/>    
+    </display>  
+  </class>  
+  <generalization id="8">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="2"/>  
+  </generalization>  
+  <association id="9">    
+    <end type="SOURCE" refId="7" navigable="false">      
+      <attribute id="10" name="hMapImgs"/>      
+      <multiplicity id="11" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="2" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <generalization id="12">    
+    <end type="SOURCE" refId="5"/>    
+    <end type="TARGET" refId="2"/>  
+  </generalization>  
+  <association id="13">    
+    <end type="SOURCE" refId="4" navigable="false">      
+      <attribute id="14" name="base"/>      
+      <multiplicity id="15" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="7" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
   <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
     sort-features="false" accessors="true" visibility="true">    
     <attributes public="true" package="true" protected="true" private="true" static="true"/>