Home Explore Help
Sign In
bscheibel
/
ui
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

show all, still working on displaying it nicely

bscheibel 5 years ago
parent
a817459ee4
commit
bd10d14e26
4 changed files with 52 additions and 26 deletions
Unified View Show Diff Stats
  1. 8 0
      app/static/css/style.css
  2. 21 6
      app/templates/show_image.html
  3. 15 13
      app/views.py
  4. 8 7
      order_bounding_boxes_in_each_block.py

+ 8 - 0
app/static/css/style.css
View File 

@@ -58,8 +58,16 @@ body {
 
         border: 3px solid black;
 
         border: 3px solid black;
 
         border-collapse: collapse;
 
         border-collapse: collapse;
 
 }
 
 }
 
+.indent {
 
+    margin-left: 10
 
+}
 
+.text {
 
+    font-size: 2px;
 
+    font-size: 1vw;
 
+}
 
 /* Style the image inside the centered container, if needed */
 
 /* Style the image inside the centered container, if needed */
 
 .centered img {
 
 .centered img {
 
   max-width: 140%;
 
   max-width: 140%;
 
   /*border-radius: 50%;
 
   /*border-radius: 50%;
 
 }
 
 }
 
+

+ 21 - 6
app/templates/show_image.html
View File 

@@ -8,8 +8,10 @@
 
 <div class="split left">
 
 <div class="split left">
 
 <div class="header_centered">
 
 <div class="header_centered">
 
   <h1>Drawing</h1>
 
   <h1>Drawing</h1>
 
+           <p><a  href="http://localhost:5000/"> Upload another drawing </a></p>
 
 </div>
 
 </div>
 
   <div class="centered">
 
   <div class="centered">
 
+
 
     {% if filename %}
 
     {% if filename %}
 
       <img src="{{ url_for('send_file', filename=filename) }}"/>
 
       <img src="{{ url_for('send_file', filename=filename) }}"/>
 
     {% else %}
 
     {% else %}
 
@@ -21,17 +23,30 @@
 
 
 
 <div class="split right">
 
 <div class="split right">
 
   <div class="top">
 
   <div class="top">
 
-    <div style="text-indent:50px;">
 
       <h1>Extracted Tolerances</h1>
 
       <h1>Extracted Tolerances</h1>
 
-      <p>Maße: {{ dims }} </p>
 
-      <p><a  href="http://localhost:5000/"> Upload another drawing </a></p>
 
+            <font size="1" face="Courier New" >
 
+            <table>
 
+                <tr>
 
+                  <td><h2>Important?</h2></td>
 
+                  <td><h2>Target Values</h2></td>
 
+                  <td><h2>Actual Values</h2></td>
 
+                </tr>
 
+                {% for d in dims %}
 
+                <tr>
 
+                        <td><input type="checkbox" name="check" value="checked"></td>
 
+                        <td> {{ d }}</td>
 
+                        <td><input type="text" name="actual"></td>
 
+                </tr>
 
+                {% endfor %}
 
+        </table>
 
+        </font>
 
     </div>
 
     </div>
 
-  </div>
 
 
 
 
 
-  <div class="bottom">
 
+  <div class="bottom indent">
 
     <div style="text-indent:50px;">
 
     <div style="text-indent:50px;">
 
       <h1>Additional Requirements:</h1>
 
       <h1>Additional Requirements:</h1>
 
+      <div style="text-indent:20px">
 
       <table>
 
       <table>
 
 
 
         {% for k in isos %}
 
         {% for k in isos %}
 
@@ -40,7 +55,7 @@
 
                 </tr>
 
                 </tr>
 
         {% endfor %}
 
         {% endfor %}
 
       </table>
 
       </table>
 
-
 
+    </div>
 
     </div>
 
     </div>
 
     </div>
 
     </div>
 
 </div>
 
 </div>

+ 15 - 13
app/views.py
View File 

@@ -1,6 +1,4 @@
 
 from app import app
 
 from app import app
 
-import os
 
-from flask import make_response
 
 from flask import Flask, request, redirect, url_for, send_from_directory, render_template
 
 from flask import Flask, request, redirect, url_for, send_from_directory, render_template
 
 import subprocess
 
 import subprocess
 
 import order_bounding_boxes_in_each_block
 
 import order_bounding_boxes_in_each_block
 
@@ -21,18 +19,24 @@ def allowed_file(filename):
 
     return '.' in filename and \
 
     return '.' in filename and \
 
            filename.rsplit('.', 1)[1] in ALLOWED_EXTENSIONS
 
            filename.rsplit('.', 1)[1] in ALLOWED_EXTENSIONS
 
 
 
+def convert_pdf(filename):
 
+    PDFFILE = UPLOAD_FOLDER +"/" + filename
 
+    subprocess.call(['pdftoppm', '-jpeg', '-singlefile',
 
+                     PDFFILE, '/home/bscheibel/uploads_app/out'])
 
+
 
+def extract_all(uuid, filename):
 
+    order_bounding_boxes_in_each_block.main(uuid, UPLOAD_FOLDER + "/" + filename)
 
+    subprocess.call(['python3','/home/bscheibel/PycharmProjects/dxf_reader/clustering_precomputed_dbscan.py', str(uuid), str(uuid)+"out.html",'localhost'])
 
+
 
 @app.route('/', methods=['GET', 'POST'])
 
 @app.route('/', methods=['GET', 'POST'])
 
 def upload_file():
 
 def upload_file():
 
     if request.method == 'POST':
 
     if request.method == 'POST':
 
         file = request.files['file']
 
         file = request.files['file']
 
         if file and allowed_file(file.filename):
 
         if file and allowed_file(file.filename):
 
-
 
             filename = file.filename
 
             filename = file.filename
 
-            #image = wandImage(filename=filename)
 
-            #image.save(os.path).join(app.config["UPLOAD_FOLDER"], filename)
 
             file.save(os.path.join(app.config["UPLOAD_FOLDER"], filename))
 
             file.save(os.path.join(app.config["UPLOAD_FOLDER"], filename))
 
             uuid = random.randint(100,10000000)
 
             uuid = random.randint(100,10000000)
 
-            order_bounding_boxes_in_each_block.main(uuid, UPLOAD_FOLDER+"/"+filename)
 
+            extract_all(uuid, filename)
 
             return redirect(url_for('uploaded_file', filename=filename, uuid=uuid))
 
             return redirect(url_for('uploaded_file', filename=filename, uuid=uuid))
 
     return '''
 
     return '''
 
     <!doctype html>
 
     <!doctype html>
 
@@ -43,10 +47,6 @@ def upload_file():
 
          <input type=submit value=Upload>
 
          <input type=submit value=Upload>
 
     </form>
 
     </form>
 
     '''
 
     '''
 
-def convert_pdf(filename):
 
-    PDFFILE = UPLOAD_FOLDER +"/" + filename
 
-    subprocess.call(['pdftoppm', '-jpeg', '-singlefile',
 
-                     PDFFILE, '/home/bscheibel/uploads_app/out'])
 
 
 
 @app.route('/show/<filename>&<uuid>')
 
 @app.route('/show/<filename>&<uuid>')
 
 def uploaded_file(filename, uuid):
 
 def uploaded_file(filename, uuid):
 
@@ -54,9 +54,11 @@ def uploaded_file(filename, uuid):
 
     if filename.endswith(".pdf") or filename.endswith(".PDF"):
 
     if filename.endswith(".pdf") or filename.endswith(".PDF"):
 
         convert_pdf(filename)
 
         convert_pdf(filename)
 
         db = redis.Redis("localhost")
 
         db = redis.Redis("localhost")
 
-        #uuid = "dd"
 
-        isos = json.loads(db.get(uuid))
 
-        return render_template('show_image.html', filename=file_out, isos=isos)
 
+        iso = db.get(uuid+"dims")
 
+        print(iso)
 
+        isos = json.loads(db.get(uuid+"isos"))
 
+        dims = json.loads(db.get(uuid+"dims"))
 
+        return render_template('show_image.html', filename=file_out, isos=isos, dims=dims)
 
 
 
     else:
 
     else:
 
         filename = filename
 
         filename = filename

+ 8 - 7
order_bounding_boxes_in_each_block.py
View File 

@@ -7,7 +7,7 @@ import re
 
 import json
 
 import json
 
 
 
 def get_bound_box(uuid, file):
 
 def get_bound_box(uuid, file):
 
-    print(file)
 
+    #print(file)
 
     response = open(file)
 
     response = open(file)
 
     html_doc = response.read()
 
     html_doc = response.read()
 
     response.close()
 
     response.close()
 
@@ -52,9 +52,6 @@ def get_bound_box(uuid, file):
 
 
 
         #print("\n")"""
 
         #print("\n")"""
 
 
 
-
 
-    db = redis.Redis("localhost")
 
-    db.set(uuid, "test")
 
     return new_all_elements, uuid
 
     return new_all_elements, uuid
 
 
 
 def pdf_to_html(uuid,filepath):
 
 def pdf_to_html(uuid,filepath):
 
@@ -69,7 +66,7 @@ def extract_isos(result):
 
         #print(element)
 
         #print(element)
 
         for x in element:
 
         for x in element:
 
             new_arr += x[4] + " "
 
             new_arr += x[4] + " "
 
-        print(new_arr)
 
+        #print(new_arr)
 
         if re.search(reg,new_arr):
 
         if re.search(reg,new_arr):
 
             #print(new_arr)
 
             #print(new_arr)
 
             found = re.findall(reg, new_arr)
 
             found = re.findall(reg, new_arr)
 
@@ -86,8 +83,12 @@ def main(uuid, result):
 
     isos = extract_isos(res)
 
     isos = extract_isos(res)
 
     isos_j = json.dumps(isos)
 
     isos_j = json.dumps(isos)
 
     db = redis.Redis("localhost")
 
     db = redis.Redis("localhost")
 
-    print(isos)
 
-    db.set(uuid, str(isos_j))
 
+    #print(isos)
 
+    db.set(str(uuid)+"isos", str(isos_j))
 
+    #print(db.get(uuid))
 
+
 
+
 
+
 
 
 
 """file = "/home/bscheibel/PycharmProjects/dxf_reader/drawings/5129275_Rev01-GV12.html"
 
 """file = "/home/bscheibel/PycharmProjects/dxf_reader/drawings/5129275_Rev01-GV12.html"
 
 res, uuid = get_bound_box("uuu", file)
 
 res, uuid = get_bound_box("uuu", file)