Changeset 33082 for other-projects/is-sheet-music-encore

Timestamp:

2019-05-16T11:15:02+12:00 (5 years ago)

Author:

cpb16

Message:

added notes from meeting

Location:

other-projects/is-sheet-music-encore/trunk/image-identification

Files:

• .idea/workspace.xml (modified) (8 diffs)
• out/production/image-identification/Main.class (modified) ( previous)
• src/Main.java (modified) (3 diffs)

other-projects/is-sheet-music-encore/trunk/image-identification/.idea/workspace.xml

@@ -3 +3 @@
   <component name="ChangeListManager">
     <list default="true" readonly="true" id="9bad4f92-4a7d-46a2-b6f0-94214c9f55cc" name="Default" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/out/production/image-identification/Main.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/image-identification/Main.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Main.java" afterDir="false" />
     </list>
@@ -18 +20 @@
         <entry file="file://$PROJECT_DIR$/src/Main.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="107">
-              <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+            <state relative-caret-position="495">
+              <caret line="33" column="38" selection-start-line="33" selection-start-column="38" selection-end-line="33" selection-end-column="38" />
               <folding>
                 <element signature="imports" expanded="true" />
@@ -49 +51 @@
   </component>
   <component name="PropertiesComponent">
+    <property name="GenerateAntBuildDialog.backupFiles" value="true" />
+    <property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" />
+    <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
+    <property name="GenerateAntBuildDialog.generateSingleFile" value="true" />
+    <property name="GenerateAntBuildDialog.outputFileNameProperty" value="image-identification" />
     <property name="full.screen.before.presentation.mode" value="false" />
     <property name="last_opened_file_path" value="$USER_HOME$/Desktop" />
-    <property name="project.structure.last.edited" value="Project" />
+    <property name="project.structure.last.edited" value="Modules" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
@@ -130 +137 @@
       <window_info anchor="bottom" id="Event Log" order="1" side_tool="true" />
       <window_info anchor="right" id="Maven Projects" order="3" />
-      <window_info anchor="bottom" id="Run" order="6" weight="0.34662578" />
+      <window_info anchor="bottom" id="Run" order="6" weight="0.26993865" />
       <window_info anchor="bottom" id="Version Control" order="2" />
       <window_info anchor="bottom" id="Terminal" order="0" weight="0.42638037" />
@@ -154 +161 @@
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="7" weight="0.25" />
       <window_info anchor="right" id="Capture Analysis" order="0" />
-      <window_info anchor="bottom" id="Run" order="6" visible="true" weight="0.34662578" />
+      <window_info anchor="bottom" id="Version Control" order="2" />
       <window_info anchor="right" id="Theme Preview" order="2" />
       <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.18382749" />
@@ -161 +168 @@
       <window_info anchor="right" id="Ant Build" order="6" weight="0.25" />
       <window_info anchor="bottom" id="TODO" order="10" />
-      <window_info anchor="bottom" id="Version Control" order="2" />
+      <window_info anchor="bottom" id="Run" order="6" visible="true" weight="0.34662578" />
       <window_info id="Image Layers" order="4" />
       <window_info id="Designer" order="0" />
@@ -190 +197 @@
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Main.java">
+      <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1410">
           <caret line="94" column="73" selection-start-line="94" selection-start-column="73" selection-end-line="94" selection-end-column="73" />
@@ -237 +254 @@
     <entry file="file://$PROJECT_DIR$/src/Main.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="107">
-          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
+        <state relative-caret-position="495">
+          <caret line="33" column="38" selection-start-line="33" selection-start-column="38" selection-end-line="33" selection-end-column="38" />
           <folding>
             <element signature="imports" expanded="true" />

other-projects/is-sheet-music-encore/trunk/image-identification/src/Main.java

@@ -16 +16 @@
 //https://riptutorial.com/opencv/example/21963/converting-an-mat-object-to-an-bufferedimage-object
 
+
+
+//GOAL for 21st
+
+
+//Classifier 01
+//Have args so can call "java image-identification-classifier01 XX XX"
+//args can be parameters in algorthim such as threshold or theta?
+//Run on 5000 images.
+//Record success rates
+//All done with makefile
+
+
+//But first understand houghline transform
+//Know what the algorithm being used is doing.
+//MAke constants for this classifier
+//Make java be able to run on CMD line
 
 public class Main {
@@ -65 +82 @@
             percentage = ((float)redCount/(float)pixelCount)*(float)100;
             //If more than %10 and less than %50 then its sheet music!
-            if(percentage > 10 && percentage < 50){
+            if(percentage > 10 && percentage < 50){ //MAKE THESE CONSTANTS!!
                 return true;}
         }
@@ -99 +116 @@
             Imgproc.HoughLines(edgesDetected, lines, 1, Math.PI / 180, 150); // runs the actual detection
             // Draw the lines
+            //LOOK OVER THIS AGAIN THE 1000 might be image height?
+            //THRESHOLD should be changed, based on img dimensions?
+
             for (int x = 0; x < lines.rows(); x++) {
                 double rho = lines.get(x, 0)[0],
                         theta = lines.get(x, 0)[1];
+                //CONVERT to Cartisean coord
                 double a = Math.cos(theta), b = Math.sin(theta);
                 double x0 = a * rho, y0 = b * rho;
+
                 Point pt1 = new Point(Math.round(x0 + 1000 * (-b)), Math.round(y0 + 1000 * (a)));
                 Point pt2 = new Point(Math.round(x0 - 1000 * (-b)), Math.round(y0 - 1000 * (a)));