Update app.py

app.py

@@ -1,43 +1,25 @@
-# -*- coding: utf-8 -*-
-"""DEPLOY-PileCaps-ADR.ipynb
-
-Automatically generated by Colaboratory.
-
-Original file is located at
-    https://colab.research.google.com/drive/19_mNwUtppW-iE_s3e-yhENpxjzx4mFpi
-"""
-import os
-##########################
-os.system('apt-get install poppler-utils libpoppler-cpp-dev')
-os.system('pip install -v -v python-poppler')
-os.system('pip install PyQt5')
-# os.system('brew install pkg-config poppler python')
-
-# os.system('brew install poppler')
-# os.system('pip install pdf2image')
-
-import numpy as np 
+# import numpy as np 
 import cv2 
 # from google.colab.patches import cv2_imshow
-from matplotlib import pyplot as plt 
-from pdf2image import convert_from_path
+# from matplotlib import pyplot as plt 
+# from pdf2image import convert_from_path
 
 import math
 import fitz
 import pandas as pd
 import random
-# import imutils
-# from imutils import contours 
-import colorsys
+# # import imutils
+# # from imutils import contours 
+# import colorsys
 from PIL import Image  , ImageDraw, ImageFont , ImageColor
 import numpy as np
 import gradio as gr
 # from pdf_annotate import PdfAnnotator, Location, Appearance ,Metadata 
-# import os
+import os
 from db import dropbox_upload_file
 from pathlib import Path
 from PreprocessingFoundation import rmv_text,rmv_dashedLines
-import popplerqt5
+
 
 #############################################################################################
 
@@ -64,47 +46,50 @@ def plan2img(plan):
     
     else:
         fname = plan
-              
         #op='pictures/found.png'
-        pages = convert_from_path(fname)#, poppler_path = r'/poppler-0.68.0/bin')
-        imgg = np.array(pages[0])
-        # #op='pictures/found.png'
-        # doc = fitz.open(fname)  # open document
-        # for page in doc:
-        #     pix = page.get_pixmap()  # render page to an image
-        #     pl=Image.frombytes('RGB', [pix.width,pix.height],pix.samples)
-        #     pl1=np.array(pl)
-            # print(type(pl1))
-        return imgg
+        # pages = convert_from_path(fname)
+        # imgg = np.array(pages[0])
+
 
+        doc = fitz.open(path)
+        for page in doc:
+            pix = page.get_pixmap(dpi=200)  # render page to an image
+            pl=Image.frombytes('RGB', [pix.width,pix.height],pix.samples)
+            pl1=np.array(pl)
+            # pix = page.get_pixmap()  # render page to an image
+        return pl1
 
+# path='/content/drive/MyDrive/Colab Notebooks/Pile caps plans/13886-CRH-B3-FN-DR-S-31001 - Copy.pdf'
+
+# pip install aspose-pdf
+
+# pip install img2pdf
 
 def detectCircles(imgOriginal ):
-    print(type(imgOriginal))
-    im=imgOriginal.copy()
+  im=imgOriginal.copy()
+  imgGry1 = cv2.cvtColor(im, cv2.COLOR_BGR2GRAY)
+  kernel=np.ones((3,3),np.uint8)
+  er1=cv2.erode(imgGry1,kernel, iterations=2)
+ 
+  er1=cv2.dilate(er1,kernel, iterations=1)
+  gray_blurred = cv2.blur(er1, (3,3 ))
+  # Apply Hough transform on the blurred image.
+   # min distance between circles,  Upper threshold for the internal Canny edge detector.
+  detected_circles = cv2.HoughCircles( gray_blurred, cv2.HOUGH_GRADIENT, 1, 50, param1= 550,
+                    param2 =21, minRadius = 20, maxRadius = 40) #18 param2
     
-    imgGry1 = cv2.cvtColor(im, cv2.COLOR_BGR2GRAY)
-    kernel=np.ones((3,3),np.uint8)
-    er1=cv2.erode(imgGry1,kernel, iterations=2)
-     
-    er1=cv2.dilate(er1,kernel, iterations=1)
-    gray_blurred = cv2.blur(er1, (3,3 ))
-      # Apply Hough transform on the blurred image.
-       # min distance between circles,  Upper threshold for the internal Canny edge detector.
-    detected_circles = cv2.HoughCircles( gray_blurred, cv2.HOUGH_GRADIENT, 1, 50, param1= 550,
-                        param2 =21, minRadius = 20, maxRadius = 40) #18 param2
-        
-      # Draw circles that are detected.
-    if detected_circles is not None:
-          # Convert the circle parameters a, b and r to integers.
-        detected_circles = np.uint16(np.around(detected_circles))
-        detected_circles = np.round(detected_circles[0, :]).astype("int")
-        #DRAW CIRCLES
-        for (x, y, r) in detected_circles:
-            cv2.circle(im, (x, y), r, (255, 255, 255), 6)
-    im=cv2.medianBlur(im,1)
-      # cv2_imshow(im)
-    return im
+  # Draw circles that are detected.
+  if detected_circles is not None:
+      # Convert the circle parameters a, b and r to integers.
+      detected_circles = np.uint16(np.around(detected_circles))
+      detected_circles = np.round(detected_circles[0, :]).astype("int")
+    #DRAW CIRCLES
+      for (x, y, r) in detected_circles:
+        cv2.circle(im, (x, y), r, (255, 255, 255), 6)
+  im=cv2.medianBlur(im,1)
+  print('circles')
+  cv2_imshow(im)
+  return im
 
 def detectSmallCircles(img ):
   #Remove tiny TOC points that interfere with shapes 
@@ -739,9 +724,9 @@ def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
             approx = cv2.approxPolyDP(contour, 0.005 * perimeter1, True)
             for point in approx:
                 x1, y1 = point[0]
-                shape.append([int(x1*ratio2),int(y1*ratio2)])
+                # shape.append([int(x1*ratio2),int(y1*ratio2)])
                 cv2.circle(imgArea1, (x1, y1), 4, (0, 255, 0), -1)
-            allpoints.append(shape)
+            # allpoints.append(shape)
 
             if (angleR != 90.0 and angleR != -90.0 and angleR != 0.0 and angleR != -0.0 ): #inclined b ay degree 
               width=widthR
@@ -857,7 +842,7 @@ def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
                         passed=1
                         cv2.drawContours(imgArea1, [contour], 0, ( int(SimilarAreaDictionary['B'].loc[i]),  int(SimilarAreaDictionary['G'].loc[i]), 255), -1)
           cv2.putText(imgtransparent1,'Area= '+str(areaa) + ' m', (x+50,y-10)  ,cv2.FONT_HERSHEY_SIMPLEX, 0.6, (50, 50, 255), 2)
-          cv2.drawContours(imgArea1, [contour], 0, (0, 0, 255), -1)
+          cv2.drawContours(imgArea1, [contour], 0, (0, 0, 255), 4)
         elif flag=='perimeter':
           masked=SimilarAreaDictionary.loc[SimilarAreaDictionary['Rounded'] ==round(perimeterr,1)]
           passed=0
@@ -869,7 +854,7 @@ def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
                           SimilarAreaDictionary['Total Perimeter'].loc[i]+=perimeterr
                           SimilarAreaDictionary['Perimeter'].loc[i]=perimeterr
                           passed=1
-                          cv2.drawContours(imgPerimeter1, [contour], 0, (0, 255, 255), 4)
+                          cv2.drawContours(imgPerimeter1, [contour], 0, (0, 0, 255), 4)
           cv2.putText(imgPerimeter1,'width='+str(width), (x+50,y-10)  ,cv2.FONT_HERSHEY_SIMPLEX, 0.6, (50, 50, 255), 2)
           cv2.putText(imgPerimeter1,'height='+str(height), (x+30,y-30)  ,cv2.FONT_HERSHEY_SIMPLEX, 0.6, (50, 50, 255), 2)
 
@@ -913,8 +898,9 @@ def MainFunc(green2,img,dp,finalColorArray,number,num1,num2,flag):
   return Df2, imgPerimeter1,image_new1
 
 def PickColorContours(dp,img,radioButton,radioButton1, color,color1,color2,color3,color4,color5,color6,color7,num1=0,num2=0):
-  img=np.array(img)
+  print(type(img))
   green2=allpreSteps(img)
+  
   colorArray=[color,color1,color2,color3,color4,color5,color6,color7]
   finalColorArray=[]
   for c in colorArray:
@@ -960,30 +946,40 @@ def PickColorContours(dp,img,radioButton,radioButton1, color,color1,color2,color
     return imgPerimeter1,Dictionary
 
 ''' General measurement function'''
-def getMeasurement(plan,SaveOP, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11):
+def getMeasurement(plan,SaveOP, dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1=0,num2=0):
+    
     if plan==None:
-        area=None
-        # area,perim,df=None,None,None
-    # elif 'foundation' in plan:
-    #     plan1='dropbox_plans/'+str(plan)
-    #     img=plan2img(plan1)
-    #     area,perim,df=IsolatedFoundations(img)
-        #area,perim,df=img,None,None
-    # elif 'piles' or 'pc' in plan: #any pile cap
-    else:
+        area,perim,df=None,None,None
+    elif 'foundation' in plan:
         plan1='dropbox_plans/'+str(plan)
         img=plan2img(plan1)
-        # print(type(img),'fhabfhbjabfka')
-        # area,perim,df=PileCaps(img)
-        # if num1==0 and num2 ==0 :
-        # print('FOUNDIMGYEHEOO')
-        area=PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11)
+        area,perim,df=IsolatedFoundations(img)
+        area,perim,df=img,None,None
+    elif 'piles' or 'pc' in plan: #any pile cap
+    # else:
+        plan1='dropbox_plans/'+str(plan)
+    # plan1='/content/drive/MyDrive/Colab Notebooks/Pile caps plans/13886-B3-NO_TEXT.pdf'
+    img=plan2img(plan1)
 
+    img = cv2.cvtColor(img, cv2.COLOR_RGB2BGR)
+
+    if num1==0 and num2 ==0:
+      area=PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11)
+      area = cv2.cvtColor(area, cv2.COLOR_RGB2BGR)
+      # if SaveOP:
+        # pushToDropbox(plan,area,perim,df)
+      return area
+    else:
+       imgPerimeter1,Dictionary= PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2)
+       imgPerimeter1=  cv2.cvtColor(imgPerimeter1, cv2.COLOR_RGB2BGR)
+       return imgPerimeter1,Dictionary
+        # else:
+          # areaPerimeterImg,df=PickColorContours(dp,img,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2)
     # if SaveOP:
     #     pushToDropbox(plan,area,perim,df)
 
     # return area,perim,df
-    return area
+
 ##########################################################
 def update_dropdown(project):
     
@@ -1011,9 +1007,11 @@ with gr.Blocks() as mainBlock:
               drop=gr.Dropdown(choices=None,interactive=True,label='project parts')
               radio_button = gr.Dropdown(choices=['foundation','external','interior'], value=None, interactive=True,label='sections')
               
-
-          # with gr.Column():
-          #     img1=gr.Image()
+              check=gr.Checkbox(label='SaveOutput')
+              show_button = gr.Button(value="Measure",elem_id='search')
+              clr_btn=gr.Button(value='Clear')
+          with gr.Column():
+              img1=gr.Image()
               # img2=gr.Image()
               # df=gr.Dataframe()
 
@@ -1035,14 +1033,9 @@ with gr.Blocks() as mainBlock:
         in9=gr.ColorPicker(label="color" )
         in10=gr.ColorPicker(label="color" )
         in11=gr.ColorPicker(label="color" )
-          
-        check=gr.Checkbox(label='SaveOutput')
-        show_button = gr.Button(value="Measure",elem_id='search')
-        clr_btn=gr.Button(value='Clear')
+
     with gr.Column():
-         img1=gr.Image()
-    # with gr.Column():
-      # out1 = gr.Image(label="Image", type="pil", image_mode="RGBA")
+      out1 = gr.Image(label="Image", type="pil", image_mode="RGBA")
                   #gr.Dataframe(label='Dictionary' ),  # row_count = (5, "fixed")
         # ]
   # btn1 = gr.Button("Submit")
@@ -1059,13 +1052,13 @@ with gr.Blocks() as mainBlock:
                 gr.Image(label="Image", type="pil", image_mode="RGBA"),
                 gr.Dataframe(label='Dictionary' ),  # row_count = (5, "fixed")
       ]
-  #  getMeasurement(plan,SaveOP)
-  show_button.click(fn=getMeasurement, inputs=[drop,check,dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11],outputs=img1)
+  #  getMeasurement(plan,SaveOP) #drop, check
+  show_button.click(fn=getMeasurement, inputs=[ drop, check , dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11],outputs=img1)
   clr_btn.click(fn=clear,outputs=[project,radio_button,check,drop])
   # btn1.click(fn=PickColorContours, inputs=[dp,in1,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11], outputs=out1)
   #secoond part 
-  project.change(fn=update_dropdown, inputs=[project], outputs=drop)
-  btn.click(fn=PickColorContours, inputs=[dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2], outputs=outputs1)
+  # btn.click(fn=PickColorContours, inputs=[dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2], outputs=outputs1)
+  btn.click(fn=getMeasurement, inputs=[dp,in2,in3,in4,in5,in6,in7,in8,in9,in10,in11,num1,num2],outputs=outputs1)
   
 mainBlock.launch(debug=True,enable_queue=True)