diff --git a/PlaningDeTavail.md b/PlaningDeTavail.md index 53a8441..55c0985 100644 --- a/PlaningDeTavail.md +++ b/PlaningDeTavail.md @@ -85,7 +85,7 @@ Objectif : Écriture du format `.pif` + finalisation convertisseur |------------|---------|--------|-----|-------------| | US-D2 | AA | TODO | 🟥 | Vérifier BitOutputStream avec flux réel | | US-C5 | AD | DOING | 🟨 | Implémenter PIFWriter (header + tables + pixels compressés) | -| US-U6 | AD | TODO | 🟥 | Exporter une image en `.pif` | +| US-U6 | AD | DOING | 🟨 | Exporter une image en `.pif` | | US-P1 | AA | TODO | 🟥 | Finaliser affichage des fréquences | | US-P2 | AA | TODO | 🟥 | Finaliser affichage codes Huffman | | US-P3 | AA | TODO | 🟥 | Finaliser affichage codes canoniques | diff --git a/makefile b/makefile index 3c959df..8420b0e 100644 --- a/makefile +++ b/makefile @@ -45,6 +45,36 @@ $(BIN): $(DOC): mkdir -p $(DOC) +#Compilation des classe de mhuffman +$(BIN)/$(PKG_PATH)/mhuffman/CanonicalCode.class: $(BIN) \ + $(SRC)/$(PKG_PATH)/mhuffman/CanonicalCode.java + $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/mhuffman/CanonicalCode.java + +$(BIN)/$(PKG_PATH)/mhuffman/FrequencyTable.class: $(BIN) \ + $(BIN)/$(PKG_PATH)/mimage/RGBImage.class \ + $(SRC)/$(PKG_PATH)/mhuffman/FrequencyTable.java + $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/mhuffman/FrequencyTable.java + +$(BIN)/$(PKG_PATH)/mhuffman/HuffmanTree.class: $(BIN) \ + $(BIN)/$(PKG_PATH)/mhuffman/HuffmanNode.class \ + $(BIN)/$(PKG_PATH)/mhuffman/HuffmanTree.java + $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/mhuffman/HuffmanTree.java + +$(BIN)/$(PKG_PATH)/mhuffman/HuffmanNode.class: $(BIN) \ + $(SRC)/$(PKG_PATH)/mhuffman/HuffmanNode.java + $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/mhuffman/HuffmanNode.java + + +# Compilation des classe mimages +$(BIN)/$(PKG_PATH)/mimage/RGBImage.class: $(BIN) \ + $(BIN)/$(PKG_PATH)/mimage/Pixel.class \ + $(BIN)/$(PKG_PATH)/mimage/RGBImage.java + $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/mimage/RGBImage.java + +$(BIN)/$(PKG_PATH)/mimage/Pixel.class: $(BIN) \ + $(SRC)/$(PKG_PATH)/mimage/Pixel.java + $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/mimage/Pixel.java + #Compilation de l'interface graphique je compile converterWindow $(BIN)/$(PKG_PATH)/vconverter/ConverterWindow.class: $(BIN) \ $(BIN)/$(PKG_PATH)/vconverter/ImagePreviewPanel.class \ @@ -58,34 +88,33 @@ $(BIN)/$(PKG_PATH)/vconverter/ConverterWindow.class: $(BIN) \ $(BIN)/$(PKG_PATH)/vconverter/ImagePreviewPanel.class: $(BIN) \ $(SRC)/$(PKG_PATH)/vconverter/ImagePreviewPanel.java $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/vconverter/ImagePreviewPanel.java - $(BIN)/$(PKG_PATH)/vconverter/FrequencyTablePanel.class: $(BIN) \ $(SRC)/$(PKG_PATH)/vconverter/FrequencyTablePanel.java $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/vconverter/FrequencyTablePanel.java - $(BIN)/$(PKG_PATH)/vconverter/CodeTablePanel.class: $(BIN) \ $(SRC)/$(PKG_PATH)/vconverter/CodeTablePanel.java $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/vconverter/CodeTablePanel.java +# Compilation des classes mpif + + #Compilation des classes util $(BIN)/$(PKG_PATH)/util/Config.class: $(BIN) \ $(SRC)/$(PKG_PATH)/util/Config.java $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/util/Config.java - $(BIN)/$(PKG_PATH)/util/ByteUtils.class: $(BIN) \ $(SRC)/$(PKG_PATH)/util/ByteUtils.java $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/util/ByteUtils.java - $(BIN)/$(PKG_PATH)/util/BitInputStream.class: $(BIN) \ $(SRC)/$(PKG_PATH)/util/BitInputStream.java $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/util/BitInputStream.java - $(BIN)/$(PKG_PATH)/util/BitOutputStream.class: $(BIN) \ $(SRC)/$(PKG_PATH)/util/BitOutputStream.java $(JAVAC) -cp $(BIN) -d $(BIN) $(SRC)/$(PKG_PATH)/util/BitOutputStream.java + # Exécution run-conv: all $(JAVA) -cp $(BIN) $(MAIN_CONVERTER) diff --git a/src/fr/iutfbleau/sae/ConverterController.java b/src/fr/iutfbleau/sae/ConverterController.java index b1698d2..49360c0 100644 --- a/src/fr/iutfbleau/sae/ConverterController.java +++ b/src/fr/iutfbleau/sae/ConverterController.java @@ -15,9 +15,10 @@ public class ConverterController { BufferedImage image; try { image = ImageIO.read(f); - } catch (IOExeption e){ + } catch (IOException e){ return null; } return image; + } } diff --git a/src/fr/iutfbleau/sae/mpif/PIFWriter.java b/src/fr/iutfbleau/sae/mpif/PIFWriter.java new file mode 100644 index 0000000..c31139e --- /dev/null +++ b/src/fr/iutfbleau/sae/mpif/PIFWriter.java @@ -0,0 +1,18 @@ +package fr.iutfbleau.sae.mpif; +import fr.iutfbleau.sae.util.bitOutputStream; +public class PIFWriter { + + + + public void writeHeader(bitOutputStream out,int width, int height){ + + } + + public void writeTables(bitOutputStream out, Map canonicalCodes){ + + } + + public void encodePixels(bitOutputStream out){ + + } +}