good revisions (were reseted by accident)

SRC/Python/.idea/workspace.xml

@@ -24,10 +24,10 @@
       <file leaf-file-name="PixelRep_Demo.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/PixelRep_Demo.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="230">
-              <caret line="43" column="42" selection-start-line="43" selection-start-column="42" selection-end-line="43" selection-end-column="42" />
+            <state relative-caret-position="332">
+              <caret line="35" column="32" selection-start-line="35" selection-start-column="32" selection-end-line="35" selection-end-column="32" />
               <folding>
-                <element signature="e#1534#1568#0" expanded="true" />
+                <element signature="e#1584#1618#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -36,8 +36,8 @@
       <file leaf-file-name="PIXEL_REPLICATION_LIB.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/PIXEL_REPLICATION_LIB.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-531">
-              <caret line="38" column="22" selection-start-line="38" selection-start-column="22" selection-end-line="38" selection-end-column="22" />
+            <state relative-caret-position="1411">
+              <caret line="83" column="30" selection-start-line="83" selection-start-column="30" selection-end-line="83" selection-end-column="30" />
               <folding />
             </state>
           </provider>
@@ -46,8 +46,8 @@
       <file leaf-file-name="GENERATE_ELLIPSE_LIB.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/GENERATE_ELLIPSE_LIB.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2444">
-              <caret line="196" column="0" selection-start-line="196" selection-start-column="0" selection-end-line="196" selection-end-column="0" />
+            <state relative-caret-position="1428">
+              <caret line="84" column="33" selection-start-line="84" selection-start-column="33" selection-end-line="84" selection-end-column="33" />
               <folding />
             </state>
           </provider>
@@ -96,6 +96,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -120,7 +121,6 @@
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scope" />
       <pane id="Scratches" />
     </panes>
   </component>
@@ -329,10 +329,10 @@
     <frame x="1912" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21875" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.10208333" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32921812" sideWeight="0.50208336" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Python Console" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6359375" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Python Console" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33802083" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3281893" sideWeight="0.49791667" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -366,6 +366,32 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/PixelRep_Demo.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="986">
+          <caret line="59" column="7" selection-start-line="59" selection-start-column="7" selection-end-line="59" selection-end-column="7" />
+          <folding>
+            <element signature="e#1584#1618#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/PIXEL_REPLICATION_LIB.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/GENERATE_ELLIPSE_LIB.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1428">
+          <caret line="84" column="33" selection-start-line="84" selection-start-column="33" selection-end-line="84" selection-end-column="33" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/GenerateEllipseLib.py" />
     <entry file="file://$PROJECT_DIR$/PixelRepLib.py" />
     <entry file="file://$PROJECT_DIR$/PixelReplication.py" />
@@ -373,7 +399,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -381,7 +406,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -389,7 +413,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -414,7 +437,7 @@
         <state relative-caret-position="230">
           <caret line="34" column="5" selection-start-line="34" selection-start-column="5" selection-end-line="34" selection-end-column="5" />
           <folding>
-            <element signature="e#1534#1568#0" expanded="true" />
+            <element signature="e#1584#1618#0" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -426,7 +449,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -446,26 +468,26 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/GENERATE_ELLIPSE_LIB.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2444">
-          <caret line="196" column="0" selection-start-line="196" selection-start-column="0" selection-end-line="196" selection-end-column="0" />
+        <state relative-caret-position="1428">
+          <caret line="84" column="33" selection-start-line="84" selection-start-column="33" selection-end-line="84" selection-end-column="33" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/PIXEL_REPLICATION_LIB.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-531">
-          <caret line="38" column="22" selection-start-line="38" selection-start-column="22" selection-end-line="38" selection-end-column="22" />
+        <state relative-caret-position="1411">
+          <caret line="83" column="30" selection-start-line="83" selection-start-column="30" selection-end-line="83" selection-end-column="30" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/PixelRep_Demo.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="43" column="42" selection-start-line="43" selection-start-column="42" selection-end-line="43" selection-end-column="42" />
+        <state relative-caret-position="332">
+          <caret line="35" column="32" selection-start-line="35" selection-start-column="32" selection-end-line="35" selection-end-column="32" />
           <folding>
-            <element signature="e#1534#1568#0" expanded="true" />
+            <element signature="e#1584#1618#0" expanded="true" />
           </folding>
         </state>
       </provider>

SRC/Python/GENERATE_ELLIPSE_LIB.py

@@ -60,9 +60,9 @@ def GetRandomEllipseImage(K):
             ptsSub2Ind = np.ravel_multi_index([np.array(pts[k][0:,0]), np.array(pts[k][0:,1])], [bw.shape[0], bw.shape[1]])
             idxPts.append(ptsSub2Ind)
 
-        bNoFullOverlap = GetOverlap(idxPts)
+        bGoodOverlap = GetOverlap(idxPts)
 
-        if bNoFullOverlap:
+        if bGoodOverlap:
             bValidEllipse = True
 
     ptsCombined = np.concatenate(pts[0:K])
@@ -84,7 +84,7 @@ def GetRandomEllipseImage(K):
     bwEdge = np.uint8(bwEdge)
     ptsEdge = np.where(bwEdge == 1)
 
-    return bw, ptsEdge, idxPts
+    return bw, ptsEdge
 
 def genEllipse(mu, cv, c, bFill):
     import numpy as np
@@ -180,7 +180,7 @@ def GetRandomEllipsePts(mu, IMSIZE):
 
 def GetOverlap(idxPts):
     import numpy as np
-    bNoFullOverlap = True
+    bGoodOverlap = True
     K = len(idxPts)
 
     for k in np.arange(0, K, 1):
@@ -189,12 +189,14 @@ def GetOverlap(idxPts):
         for i in kOther:
             idxPts_other = np.append(idxPts_other, idxPts[i])
         idxPts_test = idxPts[k]
-        intPts = np.intersect1d(idxPts_other, idxPts_test)
-        diffPts = idxPts_test.size - intPts.size
-        if diffPts < 100:
-            bNoFullOverlap = False
+        intersectPts = np.intersect1d(idxPts_other, idxPts_test)
+        diffPts = idxPts_test.size - intersectPts.size
+        if diffPts < 200:
+            bGoodOverlap = False
             break
-
-    return bNoFullOverlap
+        if intersectPts.size == 0:
+            bGoodOverlap = False
+            break
+    return bGoodOverlap
 
 bwim = GetRandomEllipseImage(5)

SRC/Python/PIXEL_REPLICATION_LIB.py

@@ -40,7 +40,7 @@ def PixelReplicate(bwim):
     import cv2
 
     print("Computing Distance Transform...")
-    bwd = cv2.distanceTransform(bwim, distanceType=cv2.DIST_L2, maskSize=5)
+    bwd = cv2.distanceTransform(bwim, distanceType=cv2.DIST_L2, maskSize=cv2.DIST_MASK_3)
     bwd = np.asmatrix(bwd, dtype=float)
     roundBwd = np.round(bwd)
     nPtsRep = np.sum(roundBwd, dtype=int)
@@ -90,15 +90,25 @@ def drawClusters(gmmfit, bwim, ptsEdge):
     print("Clusters Found: ", np.unique(clusters)+1)
 
     plt.figure()
-    plt.imshow(bwim, cmap='gray')
+    black = np.zeros((bwim.shape[0], bwim.shape[1]))
+    bwLabel = np.zeros((bwim.shape[0], bwim.shape[1]))
+    plt.imshow(black, cmap='gray')
     plt.hold(True)
     print("Plotting...")
     colors = ['m', 'r', 'c', 'g', 'y', 'b']
     for h in np.unique(clusters):
         clustIdx = np.where(clusters == h)
         clustIdx = clustIdx[0]
-        plt.scatter(x=pts[clustIdx, 1], y=pts[clustIdx, 0], c=colors[h])
-    plt.scatter(ptsEdge[1], ptsEdge[0], c='w', lw=0, s=7)
+        bwLabel[np.array([pts[clustIdx, 0]]), np.array([pts[clustIdx, 1]])] = h
+        plt.scatter(x=pts[clustIdx, 1], y=pts[clustIdx, 0], s=50, c=colors[h], lw=0)
+
+    plt.scatter(ptsEdge[1], ptsEdge[0], s=50, c='w', lw=0)
+    plt.axis('off')
+    plt.subplots_adjust(left=0, bottom=0, right=1, top=1, wspace=0, hspace=0)
+    plt.margins(0)
+    plt.autoscale(enable=True, axis='both', tight='True')
     plt.show()
     plt.hold(False)
-    return
+
\ No newline at end of file
+    bwLabel = np.uint8(bwLabel)
+    return bwLabel
\ No newline at end of file

SRC/Python/PixelRep_Demo.py

+# To run the PixelRep_Demo, run this Python file.
 
 # Copyright (c) 2016, Drexel University
 # All rights reserved.
@@ -33,11 +34,11 @@ import GENERATE_ELLIPSE_LIB as GenEllipse
 # Generate random ellipse image
 print("Generating Ellipse...")
 K = 3 # number of ellipse to fit
-bwim, trueBounds, idxPts = GenEllipse.GetRandomEllipseImage(K)
+bwim, trueBounds = GenEllipse.GetRandomEllipseImage(K)
 
 # # You may import an image for demo by uncommenting the following code:
 # import cv2
-# im = cv2.imread('U:\Angeline\PixelRep\Ellipse.tif', cv2.CV_8UC1)
+# im = cv2.imread('INSERT FILENAME', cv2.CV_8UC1)
 # th, bwim = cv2.threshold(im, 0, 1, cv2.THRESH_BINARY)
 # trueBounds = [0, 0]
 # # (Remember to modify K number of ellipses)
@@ -56,7 +57,7 @@ gmmfit = PR.fitGMM(ptsRep, K)
 
 # Draw clusters
 
-PR.drawClusters(gmmfit, bwim, trueBounds)
+bwLabel = PR.drawClusters(gmmfit, bwim, trueBounds)