From 948d857d3440370594ab0050d89a753b44a23691 Mon Sep 17 00:00:00 2001
From: Gino Bryja <g3bryja@gmail.com>
Date: Sat, 16 Feb 2019 16:00:57 -0500
Subject: [PATCH] IO and Image manip should be working, begin converting to
 array

---
 .gitignore                                    |   4 +-
 .idea/workspace.xml                           |  15 ++--
 .../github/book_folding_app/BookFolder.class  | Bin 7212 -> 7576 bytes
 .../github/book_folding_app/BookFolder.java   |  75 +++++++++---------
 4 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8b9b63a..2747e1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@ Thumbs.db
 *.war
 *.ear
 *.log
-*.so
\ No newline at end of file
+*.so
+*.jpg
+*.png
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 48c5fc3..856a488 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="37dc1861-899d-4bf2-8d5f-5f15145ed4ca" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/BookApp/com/github/book_folding_app/BookFolder.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/BookApp/com/github/book_folding_app/BookFolder.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/com/github/book_folding_app/BookFolder.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/github/book_folding_app/BookFolder.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test_out.png" beforeDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -17,8 +20,8 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/com/github/book_folding_app/BookFolder.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="426">
-              <caret line="195" column="59" lean-forward="true" selection-start-line="195" selection-start-column="59" selection-end-line="195" selection-end-column="59" />
+            <state relative-caret-position="120">
+              <caret line="179" column="61" selection-start-line="179" selection-start-column="61" selection-end-line="179" selection-end-column="61" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="method#get_str#0;class#BookFolder#0" />
@@ -28,8 +31,8 @@
                 <element signature="method#get_page_cuts#0;class#BookFolder#0" />
                 <element signature="method#check_page_cuts#0;class#BookFolder#0" />
                 <element signature="method#get_img#0;class#BookFolder#0" />
-                <element signature="method#get_img_gray#0;class#BookFolder#0" />
                 <element signature="method#resize_img#0;class#BookFolder#0" />
+                <element signature="method#get_img_gray#0;class#BookFolder#0" />
                 <element signature="method#run#0;class#BookFolder#0" />
               </folding>
             </state>
@@ -197,8 +200,8 @@
     <entry file="file://$PROJECT_DIR$/src/bookFold.java" />
     <entry file="file://$PROJECT_DIR$/src/com/github/book_folding_app/BookFolder.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="426">
-          <caret line="195" column="59" lean-forward="true" selection-start-line="195" selection-start-column="59" selection-end-line="195" selection-end-column="59" />
+        <state relative-caret-position="120">
+          <caret line="179" column="61" selection-start-line="179" selection-start-column="61" selection-end-line="179" selection-end-column="61" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="method#get_str#0;class#BookFolder#0" />
@@ -208,8 +211,8 @@
             <element signature="method#get_page_cuts#0;class#BookFolder#0" />
             <element signature="method#check_page_cuts#0;class#BookFolder#0" />
             <element signature="method#get_img#0;class#BookFolder#0" />
-            <element signature="method#get_img_gray#0;class#BookFolder#0" />
             <element signature="method#resize_img#0;class#BookFolder#0" />
+            <element signature="method#get_img_gray#0;class#BookFolder#0" />
             <element signature="method#run#0;class#BookFolder#0" />
           </folding>
         </state>
diff --git a/out/production/BookApp/com/github/book_folding_app/BookFolder.class b/out/production/BookApp/com/github/book_folding_app/BookFolder.class
index d97df50a82fe9c9420a3aad12a9178f95cac8f03..2e7cdcc09f970df82c2bfe08fb134051dfaac5a9 100644
GIT binary patch
delta 3525
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

delta 3293
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
Bc>w?b

diff --git a/src/com/github/book_folding_app/BookFolder.java b/src/com/github/book_folding_app/BookFolder.java
index 4f8cdde..1ee871a 100644
--- a/src/com/github/book_folding_app/BookFolder.java
+++ b/src/com/github/book_folding_app/BookFolder.java
@@ -128,13 +128,8 @@ private float get_height(float num, float px_height, float height) {
         return num / px_height * height;
     }
 
-    // Convert height from inches to pixels
-    private int get_px_height(float num, float px_height, float height) {
-        return (int)(num / height * px_height);
-    }
-
     // Retrieve specified image
-    BufferedImage get_img() {
+    private BufferedImage get_img() {
         BufferedImage img = null;
         try {
             img = ImageIO.read(new File(img_name));
@@ -145,8 +140,18 @@ BufferedImage get_img() {
         return img;
     }
 
+    // Resize image
+    private BufferedImage resize_img(BufferedImage img) {
+        Image img_temp = img.getScaledInstance(num_pages, px_height, Image.SCALE_SMOOTH);
+        BufferedImage img_resize = new BufferedImage(num_pages, px_height, BufferedImage.TYPE_BYTE_GRAY);
+        Graphics2D graphics = img_resize.createGraphics();
+        graphics.drawImage(img_temp, 0, 0, null);
+        graphics.dispose();
+        return img_resize;
+    }
+
     // Convert image to grayscale
-    BufferedImage get_img_gray(BufferedImage img) {
+    private BufferedImage get_img_gray(BufferedImage img) {
         BufferedImage img_grayscale = new BufferedImage(
                 img.getWidth(),
                 img.getHeight(),
@@ -157,50 +162,42 @@ BufferedImage get_img_gray(BufferedImage img) {
         return img_grayscale;
     }
 
-    // Resize image
-    BufferedImage resize_img(BufferedImage img) {
-        BufferedImage img_resize = new BufferedImage(num_pages, (int)height, BufferedImage.TYPE_INT_RGB);
-        return img_resize;
-    }
-
     // Convert grayscale image to 2D array of pixels
 
-    // Save image
+    // Perform image manipulation functions
+    private BufferedImage edit_img() {
+        BufferedImage img = get_img();
+        BufferedImage img_resize = resize_img(img);
+        BufferedImage img_gray = get_img_gray(img_resize);
+        return img_gray;
+    }
 
+    // Save image
+    private void save_img(BufferedImage img, String file_path, String file_name) {
+        File out_file = new File(file_path + File.separator + file_name);
+        System.out.println(out_file);
+        try {
+            ImageIO.write(img, img_name.substring(img_name.lastIndexOf('.') + 1), out_file);
+        }
+        catch (IOException e) {
+            System.out.println("ERROR: File not saved");
+        }
+    }
 
     private void test() {
+        num_pages = 100;
+        height = 10f;
+        px_height = (int)(height * 96);
         img_name = get_str("\nEnter image name\n");
-        BufferedImage img = get_img();
+        BufferedImage img = edit_img();
         // Try using this:
         // C:\Users\g3bry\Desktop\Python\BookProject\pugtest.png
-
-        // This works as long as the image is placed in the \BookApp dir
+        // Works as long as the image is placed in the \BookApp dir
         String working_dir = System.getProperty("user.dir");
         String abs_file_path = working_dir + File.separator + img_name;
         System.out.println(abs_file_path);
 
-        // Try resizing
-        num_pages = 100;
-        height = 10f;
-        px_height = (int)(height * 96);
-        Image img_temp = img.getScaledInstance(num_pages, px_height, Image.SCALE_SMOOTH);
-        BufferedImage img_resize = new BufferedImage(num_pages, px_height, BufferedImage.TYPE_BYTE_GRAY);
-        Graphics2D graphics = img_resize.createGraphics();
-        graphics.drawImage(img_temp, 0, 0, null);
-        graphics.dispose();
-
-        // This works
-        BufferedImage img_gray = get_img_gray(img_resize);
-
-        // Write manipulated file
-        File out_file = new File(working_dir + File.separator + "test_out.png");
-        try {
-            ImageIO.write(img_resize, "png", out_file);
-        }
-        catch (IOException e) {
-            System.out.println("Error");
-        }
-
+        save_img(img, working_dir, "test_out" + img_name.substring(img_name.length() - 4));
     }
 
     private void run() {