Update app.py

app.py

@@ -8,11 +8,12 @@ Original file is located at
 """
 
 
+
 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 pdf2image import convert_from_path
 
 import math
 import fitz
@@ -30,6 +31,8 @@ from db import dropbox_upload_file
 from pathlib import Path
 from PreprocessingFoundation import rmv_text,rmv_dashedLines
 
+
+
 #############################################################################################
 
 '''push output to dropbox'''
@@ -63,11 +66,7 @@ def plan2img(plan):
             pl1=np.array(pl)
         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 ):
   im=imgOriginal.copy()
@@ -239,7 +238,6 @@ def allpreSteps(imgOriginal):
   green2=ConnectBeamLines(noSmallDashes)
   # cv2_imshow(green2)
   return green2
-green2=allpreSteps(plan2img(plan))
 
 def ChangeBrightness(img,k):
   imgdarker = 255 * (img/255)**k # k>1 darker , k <1 lighter
@@ -345,7 +343,7 @@ def colorOrder(img,finalColorArray):
   
   return res
 
-def getinnerColor(BlackmaskDetected,detectedColors,finalColorArray,num1,num2,flag,eachcolor):
+def getinnerColor(BlackmaskDetected,img,detectedColors,finalColorArray,num1,num2,flag,eachcolor):
 
   countBlackMasks=0
   xored=detectedColors
@@ -391,7 +389,7 @@ def getinnerColor(BlackmaskDetected,detectedColors,finalColorArray,num1,num2,fla
 
   return xored,invertedmask , BlackmaskDetected
 
-def allLevelsofColor(BlackmaskDetected,levelonly, invertedmask,color,finalColorArray):
+def allLevelsofColor(BlackmaskDetected,img,levelonly, invertedmask,color,finalColorArray):
 
   firstLevel=levelonly
   firstLevel1=levelonly
@@ -451,7 +449,7 @@ def allLevelsofColor(BlackmaskDetected,levelonly, invertedmask,color,finalColorA
 
   return firstLevel1, BlackmaskDetected
 
-def getColoredContour(mask,finalColorArray,num1,num2,flag,eachcolor):
+def getColoredContour(mask,img,finalColorArray,num1,num2,flag,eachcolor):
 
   ColoredContour, Coloredhierarchy = cv2.findContours(mask, cv2.RETR_TREE, cv2.CHAIN_APPROX_SIMPLE)
   Coloredhierarchy=Coloredhierarchy[0]
@@ -479,14 +477,14 @@ def getColoredContour(mask,finalColorArray,num1,num2,flag,eachcolor):
         if extrema == (0, 0) :#and extremaB==(0,0): # if image is not black --> has a colored mask within
           break
 
-  levelOnly,invertedmask,BlackmaskDetected=getinnerColor(Blackmask,detectedColors,finalColorArray,num1,num2,flag,eachcolor) #mask inner levels b abyad 
-  firstLevel1, BlackmaskDetected1= allLevelsofColor(BlackmaskDetected,levelOnly, invertedmask,eachcolor,finalColorArray)
+  levelOnly,invertedmask,BlackmaskDetected=getinnerColor(Blackmask,img,detectedColors,finalColorArray,num1,num2,flag,eachcolor) #mask inner levels b abyad 
+  firstLevel1, BlackmaskDetected1= allLevelsofColor(BlackmaskDetected,img,levelOnly, invertedmask,eachcolor,finalColorArray)
   # cv2_imshow(firstLevel1)
   return firstLevel1,invertedmask, BlackmaskDetected1
 
 """#  contours"""
 
-def findContoursFullImage(img,number,finalColorArray,num1,num2,flag,color=[0,0,0]):
+def findContoursFullImage(green2,img,number,finalColorArray,num1,num2,flag,color=[0,0,0]):
   if number == 0:
     thresh=preprocess(img,number,green2)
 
@@ -497,7 +495,7 @@ def findContoursFullImage(img,number,finalColorArray,num1,num2,flag,color=[0,0,0
     pil_image=Image.fromarray(mask)
     extrema = pil_image.convert("L").getextrema()
     if extrema != (0, 0): # if image is not black --> has a colored mask within
-      coloredregions,invertedmask,BlackmaskDetected1=getColoredContour(mask,finalColorArray,num1,num2,flag,color)
+      coloredregions,invertedmask,BlackmaskDetected1=getColoredContour(mask,img,finalColorArray,num1,num2,flag,color)
       
       thresh=preprocess(coloredregions,number,green2)
       x=cv2.bitwise_and(thresh,thresh,mask=BlackmaskDetected1)
@@ -541,12 +539,12 @@ def StraightenImage(contour,imgArea):
     ##############  
     return warped,angleR,width,height
 
-def getAreasPerimeter(img,number,num1,num2,flag,finalColorArray,color=[0,0,0]):
+def getAreasPerimeter(green2,img,number,num1,num2,flag,finalColorArray,color=[0,0,0]):
   appended=[]
   if number==0:
-    contourss=findContoursFullImage(img,number,finalColorArray,num1,num2,flag,color)
+    contourss=findContoursFullImage(green2,img,number,finalColorArray,num1,num2,flag,color)
   else:
-    contourss=findContoursFullImage(img,number,finalColorArray,num1,num2,flag,color)[0]
+    contourss=findContoursFullImage(green2,img,number,finalColorArray,num1,num2,flag,color)[0]
 
   for contour in contourss:
 
@@ -571,10 +569,10 @@ def getAreasPerimeter(img,number,num1,num2,flag,finalColorArray,color=[0,0,0]):
 
   return appended
 
-def FillDictionary(SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray,rgbcolor=[0,0,0],color=[0,0,0]):
+def FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray,rgbcolor=[0,0,0],color=[0,0,0]):
   #fills dictionary with key areas and number of occurences
 
-  areas_Perimeters=sorted(getAreasPerimeter(img,number,num1,num2,flag,finalColorArray,color) )
+  areas_Perimeters=sorted(getAreasPerimeter(green2,img,number,num1,num2,flag,finalColorArray,color) )
 
   indices=[]
   for i in range(len(areas_Perimeters)):
@@ -643,25 +641,25 @@ def FillDictionary(SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArr
 # apdf = PdfAnnotator('/content/drive/MyDrive/Colab Notebooks/Pile caps plans/13886-CRH-B2-FN-DR-S-21001.pdf')
 
 # ratio2=apdf.get_size(0)[0] / ImgShape[1] 
-# ratio1 = apdf.get_size(0)[1] / ImgShape[0] 
-# print(ratio1,ratio2)
+# # ratio1 = apdf.get_size(0)[1] / ImgShape[0] 
+# # print(ratio1,ratio2)
 
-# apdf.add_annotation(
-#   'polygon',
+# # apdf.add_annotation(
+# #   'polygon',
 
-#   Location(points= [ [1803*ratio2, 1929*ratio2], [1943*ratio2 ,1564*ratio2], [2370*ratio2, 1728*ratio2], [2229*ratio2 ,2094*ratio2]] ,page=0),
-#   Appearance(stroke_color=(1, 0, 1), stroke_width=5,stroke_transparency=0.5,fill=(0,1,0),fill_transparency=0.2,),
-#   # Metadata(Subj='hii'),#,Label='jnnf',label='jnnnf',name='ll',Name='mfds',note='mmf',Note='nzsf'), #Subj
-# )
+# #   Location(points= [ [1803*ratio2, 1929*ratio2], [1943*ratio2 ,1564*ratio2], [2370*ratio2, 1728*ratio2], [2229*ratio2 ,2094*ratio2]] ,page=0),
+# #   Appearance(stroke_color=(1, 0, 1), stroke_width=5,stroke_transparency=0.5,fill=(0,1,0),fill_transparency=0.2,),
+# #   # Metadata(Subj='hii'),#,Label='jnnf',label='jnnnf',name='ll',Name='mfds',note='mmf',Note='nzsf'), #Subj
+# # )
 
-# apdf.add_annotation(
-#   'square',
-#   Location(x1=1000,y1=100,x2=2000,y2=300 ,page=0),
-#   Appearance(stroke_color=(1, 0, 1), stroke_width=5,fill=(0,1,0),fill_transparency=0.2),
-#   Metadata(Subj='hii',Label='jnnf'), #Subj
-# )
+# # apdf.add_annotation(
+# #   'square',
+# #   Location(x1=1000,y1=100,x2=2000,y2=300 ,page=0),
+# #   Appearance(stroke_color=(1, 0, 1), stroke_width=5,fill=(0,1,0),fill_transparency=0.2),
+# #   Metadata(Subj='hii',Label='jnnf'), #Subj
+# # )
 
-# apdf.write('bb.pdf')  # or use overwrite=True if you feel lucky
+# # apdf.write('bb.pdf')  # or use overwrite=True if you feel lucky
 
 # pip install pdfrw
 
@@ -673,7 +671,7 @@ def FillDictionary(SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArr
 
 # destpage.showPDFpage(r * fitz.Matrix(d=-1), src, sourcepage.number)
 
-def drawAllContours(img,number,finalColorArray,num1,num2,flag):
+def drawAllContours(green2,img,number,finalColorArray,num1,num2,flag):
   # colors=[color,color1,color2,color3,color4,color5,color6,color7]
   # img=np.array(img)
   areasinImage=[]
@@ -704,8 +702,8 @@ def drawAllContours(img,number,finalColorArray,num1,num2,flag):
       if eachcolor==firstcolor: # 3shan a3rf el array of colors et3adet kam mara - to support embedded levels 
         counter+=1
 
-      contourss,rgbcolor,invertedmask=findContoursFullImage(maskDone,number,finalColorArray,num1,num2,flag,eachcolor) 
-      SimilarAreaDictionary= FillDictionary(SimilarAreaDictionary,maskDone,number,num1,num2,flag,finalColorArray,rgbcolor,eachcolor)
+      contourss,rgbcolor,invertedmask=findContoursFullImage(green2,maskDone,number,finalColorArray,num1,num2,flag,eachcolor) 
+      SimilarAreaDictionary= FillDictionary(green2,SimilarAreaDictionary,maskDone,number,num1,num2,flag,finalColorArray,rgbcolor,eachcolor)
 
       a = SimilarAreaDictionary.to_numpy()
 
@@ -805,9 +803,9 @@ def drawAllContours(img,number,finalColorArray,num1,num2,flag):
 
     else:
       SimilarAreaDictionary= pd.DataFrame(columns=['Rounded','Width','Height','Perimeter','Occurences','Total Perimeter','R','G','B'])
-    contourss=findContoursFullImage(img,number,finalColorArray,num1,num2,flag)
+    contourss=findContoursFullImage(green2,img,number,finalColorArray,num1,num2,flag)
 
-    SimilarAreaDictionary= FillDictionary(SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray)
+    SimilarAreaDictionary= FillDictionary(green2,SimilarAreaDictionary,img,number,num1,num2,flag,finalColorArray)
 
     for contour in contourss:
 
@@ -878,9 +876,9 @@ def drawAllContours(img,number,finalColorArray,num1,num2,flag):
 # drawAllContours(img,0,[],1.11,25579,'area') #,[190,47,250] ,[47,251,255] ,[80,240,15],[253,163,40]
 # imgPerimeter1,image_new1,Dictionary=drawAllContours(img,220,[47,251,255],[251,163,47],1.105,27233.5,'area')
 
-def MainFunc(dp,finalColorArray,number,num1,num2,flag):
+def MainFunc(green2,img,dp,finalColorArray,number,num1,num2,flag):
 
-  imgPerimeter1,image_new1,Df2=drawAllContours(img,number,finalColorArray,num1,num2,flag)
+  imgPerimeter1,image_new1,Df2=drawAllContours(green2,img,number,finalColorArray,num1,num2,flag)
   x = path.split("/")
   x=x.pop()
   Df2=Df2.T
@@ -902,6 +900,7 @@ def MainFunc(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):
+  green2=allpreSteps(img)
   colorArray=[color,color1,color2,color3,color4,color5,color6,color7]
   finalColorArray=[]
   for c in colorArray:
@@ -914,30 +913,30 @@ def PickColorContours(dp,img,radioButton,radioButton1, color,color1,color2,color
     if radioButton=="Measure Full Image" :
      
       if radioButton1=='Area':
-        imgPerimeter1,image_new1,df=drawAllContours(img,0,finalColorArray,num1,num2,'area')
+        imgPerimeter1,image_new1,df=drawAllContours(green2,img,0,finalColorArray,num1,num2,'area')
         return image_new1
       else:
-        imgPerimeter1,image_new1,df=drawAllContours(img,0,finalColorArray,num1,num2,'perimeter')
+        imgPerimeter1,image_new1,df=drawAllContours(green2,img,0,finalColorArray,num1,num2,'perimeter')
         return imgPerimeter1
     else:   
       if radioButton1=='Area':
-        imgPerimeter1,image_new1,df=drawAllContours(img,220,finalColorArray,num1,num2,'area') #rgbValue
+        imgPerimeter1,image_new1,df=drawAllContours(green2,img,220,finalColorArray,num1,num2,'area') #rgbValue
         return image_new1
       else:
-        imgPerimeter1,image_new1,df=drawAllContours(img,220,finalColorArray,num1,num2,'perimeter') #rgbValue
+        imgPerimeter1,image_new1,df=drawAllContours(green2,img,220,finalColorArray,num1,num2,'perimeter') #rgbValue
         return imgPerimeter1
   else:
     if radioButton=="Measure Full Image":
       if radioButton1=='Area':
-        Dictionary, imgPerimeter1,image_new1=MainFunc(dp,finalColorArray,0,num1,num2,'area')
+        Dictionary, imgPerimeter1,image_new1=MainFunc(green2,img,dp,finalColorArray,0,num1,num2,'area')
       else:
-        Dictionary, imgPerimeter1,image_new1=MainFunc(dp,finalColorArray,0,num1,num2,'perimeter')
+        Dictionary, imgPerimeter1,image_new1=MainFunc(green2,img,dp,finalColorArray,0,num1,num2,'perimeter')
 
     else:
       if radioButton1=='Area':
-        Dictionary, imgPerimeter1,image_new1=MainFunc(dp,finalColorArray,220,num1,num2,'area')
+        Dictionary, imgPerimeter1,image_new1=MainFunc(green2,img,dp,finalColorArray,220,num1,num2,'area')
       else:
-        Dictionary, imgPerimeter1,image_new1=MainFunc(dp,finalColorArray,220,num1,num2,'perimeter')
+        Dictionary, imgPerimeter1,image_new1=MainFunc(green2,img,dp,finalColorArray,220,num1,num2,'perimeter')
 
     Dictionary=Dictionary.T
     Dictionary.to_excel("output.xlsx")