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

displaying nicely, still working on details, highlighting and capturing input data

bscheibel 5 years ago
parent
5ed2a872e4
commit
0c759310af
4 changed files with 43 additions and 50 deletions
Unified View Show Diff Stats
  1. 15 43
      app/static/css/style.css
  2. 12 0
      app/templates/display_results.html
  3. 11 6
      app/templates/show_image.html
  4. 5 1
      app/views.py

+ 15 - 43
app/static/css/style.css
View File 

@@ -1,47 +1,8 @@
 
 body {
 
 body {
 
   background-color: #f2f2f2;
 
   background-color: #f2f2f2;
 
 }
 
 }
 
-/*.column {
 
-  float: left;
 
-  width: 50%;
 
-}'/
 
-/* Split the screen in half */
 
-/*.split {
 
-  height: 100%;
 
-  width: 50%;
 
-  position: fixed;
 
-  z-index: 1;
 
-  top: 0;
 
-  overflow-x: hidden;
 
-  padding-top: 20px;
 
-}
 
-
 
-/* Control the left side */
 
-/*.left {
 
-  left: 0;
 
-  background-color: white;
 
-}
 
-
 
-/* Control the right side */
 
-/*.right {
 
-  right: 0;
 
-  background-color: white;
 
-}
 
-.column {
 
-  float: left;
 
-  width: 33.33%;
 
-}
 
-.top {
 
-  height: 50vh;
 
-  background-color: #f1f1f1;
 
-}
 
-
 
-.bottom {
 
-  height: 50vh;
 
-  background-color: #f1f1f1;
 
-}*/
 
 /* If you want the content centered horizontally and vertically */
 
 /* If you want the content centered horizontally and vertically */
 
-.centered {
 
+/*.centered {
 
   position: absolute;
 
   position: absolute;
 
   top: 50%;
 
   top: 50%;
 
   left: 40%;
 
   left: 40%;
 
@@ -61,15 +22,22 @@ body {
 
 .thick-border {
 
 .thick-border {
 
         border: 3px solid black;
 
         border: 3px solid black;
 
         border-collapse: collapse;
 
         border-collapse: collapse;
 
-}
 
+}*/
 
 
 
 /* Style the image inside the centered container, if needed */
 
 /* Style the image inside the centered container, if needed */
 
-.centered img {
 
-  max-width: 140%;
 
+img {
 
+  max-width: 100%;
 
+}
 
+
 
+.images{
 
+  flex: 1 1 auto;
 
+  min-width: 15em;
 
+  max-width: 800px;
 
 }
 
 }
 
 
 
 .container {
 
 .container {
 
     display: flex;
 
     display: flex;
 
+    flex-wrap: row wrap;
 
 }
 
 }
 
 
 
 .column {
 
 .column {
 
@@ -89,3 +57,7 @@ body {
 
 .column-three {
 
 .column-three {
 
     order: 3;
 
     order: 3;
 
 }
 
 }
 
+
 
+@media (max-width: 50em) { /* 2 x 15em (.text & .images) + 2em  (left & right margin of the body element) + 1em (.text margin-right)  */
 
+  .container {flex-wrap: wrap}
 
+}

+ 12 - 0
app/templates/display_results.html
View File 

@@ -0,0 +1,12 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+<head>
 
+    <meta charset="UTF-8">
 
+    <title>Title</title>
 
+
 
+    {{ text }}
 
+</head>
 
+<body>
 
+
 
+</body>
 
+</html>

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

@@ -11,7 +11,9 @@
 
             <h1>Drawing</h1>
 
             <h1>Drawing</h1>
 
             <p> <a href="http://localhost:5000/"> Upload another drawing </a> </p>
 
             <p> <a href="http://localhost:5000/"> Upload another drawing </a> </p>
 
         {% if filename %}
 
         {% if filename %}
 
-        <img src="{{ url_for('send_file', filename=filename) }}"/>
 
+        <div class="images">
 
+            <img src="{{ url_for('send_file', filename=filename) }}"/>
 
+        </div>
 
         {% else %}
 
         {% else %}
 
         <h1>no image for whatever reason</h1>
 
         <h1>no image for whatever reason</h1>
 
         {% endif %}
 
         {% endif %}
 
@@ -20,7 +22,7 @@
 
     <div class="column column-two">
 
     <div class="column column-two">
 
             <h1>Extracted Measurements</h1>
 
             <h1>Extracted Measurements</h1>
 
                 <font size="3" face="Courier New" >
 
                 <font size="3" face="Courier New" >
 
-                <form method="post" action="">
 
+                <form method="post" action="{{ url_for('form_post') }}">
 
                 <table>
 
                 <table>
 
                     <tr>
 
                     <tr>
 
                         <td style="text-align:center"><h3>Key Value</h3></td>
 
                         <td style="text-align:center"><h3>Key Value</h3></td>
 
@@ -28,18 +30,21 @@
 
                         <td style="text-align:center"><h3>Correct</h3></td>
 
                         <td style="text-align:center"><h3>Correct</h3></td>
 
                         <td style="text-align:center"><h3>Actual Value</h3></td>
 
                         <td style="text-align:center"><h3>Actual Value</h3></td>
 
                     </tr>
 
                     </tr>
 
-                    {% for d in dims %}
 
+                    {% for key in dims %}
 
+                    <td><h4> {{key}} </h4></td>
 
+                        {% for d in dims[key][4] %}
 
                     <tr>
 
                     <tr>
 
-                        <td style="text-align:center"><input type="checkbox" name="check" value="checked"></td>
 
+                        <td style="text-align:center"><input type="checkbox" name="relevant" value="checked"></td>
 
                         <td style="text-align:center"> {{ d }}</td>
 
                         <td style="text-align:center"> {{ d }}</td>
 
-                        <td style="text-align:center"><input type="checkbox" name="check" value="checked"></td>
 
+                        <td style="text-align:center"><input type="checkbox" name="correct" value="checked"></td>
 
                         <td style="text-align:center"><input type="text" name="actual" size="10"></td>
 
                         <td style="text-align:center"><input type="text" name="actual" size="10"></td>
 
                     </tr>
 
                     </tr>
 
+                        {% endfor %}
 
                     {% endfor %}
 
                     {% endfor %}
 
 
 
 
 
                 </table>
 
                 </table>
 
-                    <button type="button" >Submit</button>
 
+                    <input type="submit" value="Submit"/>
 
                 </form>
 
                 </form>
 
                 </font>
 
                 </font>
 
     </div>
 
     </div>

+ 5 - 1
app/views.py
View File 

@@ -26,7 +26,7 @@ def convert_pdf(filename):
 
 
 
 def extract_all(uuid, filename):
 
 def extract_all(uuid, filename):
 
     order_bounding_boxes_in_each_block.main(uuid, UPLOAD_FOLDER + "/" + 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'])
 
+    subprocess.call(['python3','/home/bscheibel/PycharmProjects/dxf_reader/main.py', str(uuid), str(uuid)+"out.html",'localhost'])
 
 
 
 @app.route('/', methods=['GET', 'POST'])
 
 @app.route('/', methods=['GET', 'POST'])
 
 def upload_file():
 
 def upload_file():
 
@@ -90,3 +90,7 @@ def generate(name):
 
     except:
 
     except:
 
         return"Sorry file not found"
 
         return"Sorry file not found"
 
 
 
+@app.route('/show_results', methods=['POST'])
 
+def form_post():
 
+    text = request.args.get("form")
 
+    return render_template('display_results.html', text=text)