From a7d71b22781713381e5949d88165520a01bfbf6c Mon Sep 17 00:00:00 2001 From: jiyongs Date: Sat, 15 May 2021 02:25:45 +0900 Subject: [PATCH] table icon --- __pycache__/__main__.cpython-38.pyc | Bin 211 -> 211 bytes .../__pycache__/Lattice_2.cpython-38.pyc | Bin 2443 -> 2443 bytes .../__pycache__/__init__.cpython-38.pyc | Bin 118 -> 118 bytes .../check_line_scale.cpython-38.pyc | Bin 4148 -> 4148 bytes .../__pycache__/make_border.cpython-38.pyc | Bin 1197 -> 1144 bytes .../__pycache__/merge_table.cpython-38.pyc | Bin 4742 -> 4689 bytes .../makeGoogleSheet.cpython-38.pyc | Bin 5416 -> 5416 bytes utils/__pycache__/__init__.cpython-38.pyc | Bin 110 -> 110 bytes utils/__pycache__/file_path.cpython-38.pyc | Bin 439 -> 439 bytes utils/__pycache__/location.cpython-38.pyc | Bin 1893 -> 1893 bytes utils/__pycache__/tasks.cpython-38.pyc | Bin 4327 -> 4327 bytes www/__pycache__/__init__.cpython-38.pyc | Bin 108 -> 108 bytes www/__pycache__/app.cpython-38.pyc | Bin 511 -> 511 bytes www/__pycache__/views.cpython-38.pyc | Bin 10574 -> 10576 bytes www/static/css/menu_template.css | 22 +++++ www/static/css/{extract.css => workspace.css} | 48 ++++++---- www/static/icon/check.png | Bin 0 -> 32008 bytes www/static/icon/table.png | Bin 0 -> 243 bytes www/templates/index.html | 2 +- www/templates/menu_template.html | 10 ++ .../{extract.html => workspace.html} | 86 +++++++++++------- www/views.py | 2 +- 22 files changed, 114 insertions(+), 56 deletions(-) create mode 100644 www/static/css/menu_template.css rename www/static/css/{extract.css => workspace.css} (88%) create mode 100644 www/static/icon/check.png create mode 100644 www/static/icon/table.png create mode 100644 www/templates/menu_template.html rename www/templates/{extract.html => workspace.html} (89%) diff --git a/__pycache__/__main__.cpython-38.pyc b/__pycache__/__main__.cpython-38.pyc index c5dd07f97364ab8c322ef3ce561f9ca4919a6184..edc1038d8c21baa8f16bf98f9a068ffff3794431 100644 GIT binary patch delta 19 Zcmcc2c$twql$V!_0SH*+Cr#u&0RSp%1V#V= delta 19 Zcmcc2c$twql$V!_0SHq0;wN&S001kH1Y-aI diff --git a/check_lattice/__pycache__/Lattice_2.cpython-38.pyc b/check_lattice/__pycache__/Lattice_2.cpython-38.pyc index bf301f99671ade773afdecd140841ca0de0d0c85..a2ac21481b6f9a4ed6a9e9e7fdd5c3575a6258dd 100644 GIT binary patch delta 20 ZcmeAc?iS__<>lpK00I{INgKHvH~}Vt1G@kK delta 20 ZcmeAc?iS__<>lpK0D@G$_>J5RoB$`p1K0on diff --git a/check_lattice/__pycache__/__init__.cpython-38.pyc b/check_lattice/__pycache__/__init__.cpython-38.pyc index 685d5435f6227806694b6fd017466f748cc1f527..dfbfc6ac4826241e393ebfc81fe3b845d6581bd1 100644 GIT binary patch delta 17 WcmXRb;|}HJ delta 20 acmdm@utkA8l$V!_0SHq0;x}?@3IG5v2Lto~ diff --git a/check_lattice/__pycache__/make_border.cpython-38.pyc b/check_lattice/__pycache__/make_border.cpython-38.pyc index fa68b24cae42f76f8c8c60a9cd21a601ae8449f0..8651fb794fa3c499ee7382d4b93104f8bcd0140a 100644 GIT binary patch delta 52 zcmZ3>`GbQyl$V!_0SH*+CvD_zVrINGxsO?u`InsDC8q@2|F)QXa##N?96+n8M$`6mBiwg8f*EGmq=lcQMV E0Eq%5iU0rr diff --git a/check_lattice/__pycache__/merge_table.cpython-38.pyc b/check_lattice/__pycache__/merge_table.cpython-38.pyc index 9b07c3040936b2f773ec95e674813a00d7be6a58..2a53bda09c730aa5b9f6b286d8e04967d404c5fb 100644 GIT binary patch delta 119 zcmZouy{N(+%FD~e00b=ZlQweeu`>UX)7xCgs>R57Yw{en4~!C%kfQM6ra4FZzrSn=1l&-jEqr}(*;*BN=_CKQeu+;snniq HA>;=DC3G5% delta 172 zcmcbp(x%EC%FD~e00b#1g&Vo`SS`K=06ET9F`>n&Ma40%wyt@-eh-k0aY-%CF3B&5 zanCIA&d-ktaB+(-NleN~jZdv8DN0N(*=)nA#mE>nIi2kTqxj|sb}cqJNuWtZY;b}H z#F7FMVIYR|sWq8d G$PWNs4KgqQ diff --git a/data_rendering/__pycache__/makeGoogleSheet.cpython-38.pyc b/data_rendering/__pycache__/makeGoogleSheet.cpython-38.pyc index 68460350a60d26213aec0b2841bdba7b49d4f87b..b864a89987936b2443308ace0cd2824ae5e2bcbc 100644 GIT binary patch delta 20 acmZ3XwL*(Kl$V!_0SH*+CvD`G6$Jn-QUlBY delta 20 acmZ3XwL*(Kl$V!_0SL~{OxegSD+&NK#{}U3 diff --git a/utils/__pycache__/__init__.cpython-38.pyc b/utils/__pycache__/__init__.cpython-38.pyc index 8b67f319f7959935d12a6fcfcb5dcfa044066dfb..5c6aa4464655e912a19406f948dd92a0032ef506 100644 GIT binary patch delta 17 Wcmd1H;|}HJ+;{-kc delta 20 acmaFL_mq!2l$V!_0SMCg;x}?fu>$}!B?Mal diff --git a/utils/__pycache__/tasks.cpython-38.pyc b/utils/__pycache__/tasks.cpython-38.pyc index 99fcf0a069de3b0be34c5dccd862bf2b3b9fec5a..3c268c4b8b7cfd972c0814aa45c623530ec6b78f 100644 GIT binary patch delta 20 acmaE^_*{`Yl$V!_0SH*-CvD`uBLDz4=mhfs delta 20 acmaE^_*{`Yl$V!_0SLBmByHrrBLDz8Hw9Y& diff --git a/www/__pycache__/__init__.cpython-38.pyc b/www/__pycache__/__init__.cpython-38.pyc index d967522a3405982bacee051028b036a13c0e2f86..a7011affbcf4a2990ad6d11301176ae9268ca136 100644 GIT binary patch delta 17 Wcmd1F;SS~HXbRmd0l$V!_0SMO4o1MVEk#`Rd7hidPQFd`bVsh%{i#)Y50Ox89tN;K2 delta 36 qcmcZ*bS{WDl$V!_0SIg+rzEg$fn diff --git a/www/static/css/menu_template.css b/www/static/css/menu_template.css new file mode 100644 index 00000000..65589083 --- /dev/null +++ b/www/static/css/menu_template.css @@ -0,0 +1,22 @@ +header { + position: relative; + width: auto; + height: 8%; + background: #F52C05; +} +header ul{ + position: absolute; + height: 50%; + bottom: 10%; +} +header li{ + list-style-type: none; + float: left; + height: 100%; + margin-left: 10px; + margin-right: 50px; + font-size: 32px; + font-weight: bold; + color: white; + cursor: pointer; +} \ No newline at end of file diff --git a/www/static/css/extract.css b/www/static/css/workspace.css similarity index 88% rename from www/static/css/extract.css rename to www/static/css/workspace.css index 7817194b..412dafe2 100644 --- a/www/static/css/extract.css +++ b/www/static/css/workspace.css @@ -12,26 +12,6 @@ body { font-size : 12px; height: 100vh; } -header { - position: relative; - width: auto; - height: 8%; - background: #F52C05; -} -header ul{ - position: absolute; - height: 50%; - bottom: 0; -} -header li{ - list-style-type: none; - float: left; - height: 100%; - margin-left: 100px; - font-size: 28px; - color: white; - cursor: pointer; -} #page_list_box{ position: absolute; @@ -51,6 +31,16 @@ header li{ .thumb_img_select{ border: 2px solid #F52C05; } +.check_page{ + float:left; + width: 20px; + margin-left: 10px; +} +.exist_class{ + float:right; + width: 16px; + margin-right: 10px; +} #article_table{ @@ -67,6 +57,24 @@ input :not([type=radio]){ margin: 10px; } +#top_tools{ + width: 580px; +} +#top_tools input[type=button]{ + font-size: 18px; + font-weight: bold; +} +.btn{ + width: 160px; +} +.radio-inline input[type="radio"]{ + width: 25px; + height: 25px; + margin-right: 10px; + margin-top: -1px; + vertical-align: middle; +} + #output { margin: 0 20px; padding: 20px; diff --git a/www/static/icon/check.png b/www/static/icon/check.png new file mode 100644 index 0000000000000000000000000000000000000000..a12c397690fe0286092f43f30ee13bfebfc555c2 GIT binary patch literal 32008 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⪌=#+N3y+8xzdluvJEw%mlNPhJCL_UODtK}3w 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 literal 0 HcmV?d00001 diff --git a/www/templates/index.html b/www/templates/index.html index 39d58cc1..4071df4c 100644 --- a/www/templates/index.html +++ b/www/templates/index.html @@ -211,7 +211,7 @@ -
+ {% include "menu_template.html" %}

PDF Table Extractor

diff --git a/www/templates/menu_template.html b/www/templates/menu_template.html new file mode 100644 index 00000000..e95f32b9 --- /dev/null +++ b/www/templates/menu_template.html @@ -0,0 +1,10 @@ + + +
+
    +
  • Upload
  • +
  • Workspace
  • +
  • Download
  • + +
+
\ No newline at end of file diff --git a/www/templates/extract.html b/www/templates/workspace.html similarity index 89% rename from www/templates/extract.html rename to www/templates/workspace.html index cdbb3294..a6214c6b 100644 --- a/www/templates/extract.html +++ b/www/templates/workspace.html @@ -3,7 +3,7 @@ PDF Table Select Areas - + @@ -381,7 +381,10 @@ var imageWidth = $('#pageImg').width(); var imageHeight = $('#pageImg').height(); - $('.image-decorator div, .image-decorator img').css({'height':'70vh', 'width':(imageWidth/imageHeight*100)*0.7+'vh'}); + var fit_width = (imageWidth/imageHeight*100)*0.7+'vh'; + + $('.image-decorator div, .image-decorator img').css({'height':'70vh', 'width':fit_width}); + // $('#top_tools').css({'width':fit_height}); if( detected_areas.hasOwnProperty(String(this_page)) ){ page = String(this_page); @@ -471,18 +474,23 @@
-
-
    -
  • HOME
  • -
  • BLAH BLAH
  • -
  • BLAH BLAH
  • - -
-
+ + {% include "menu_template.html" %} +
{% for idx in range(1, totalPage+1) %} -
+
+ {% set tables_len = detected_areas[idx]|length %} + + +
{% if idx == 1 %} {% else %} + {{idx}} -

+
{% endfor %} @@ -513,17 +522,36 @@
- - -
- - - -
+ + + + + + + + + + + +
+ + + +
+ + + + + +

@@ -532,23 +560,13 @@
- +
-
- -
- -
-
diff --git a/www/views.py b/www/views.py index c2d0bb85..dd02c50e 100644 --- a/www/views.py +++ b/www/views.py @@ -196,7 +196,7 @@ def extract_page(): inputstream.close() return render_template( - 'extract.html', + 'workspace.html', fileName=fileName, totalPage=total_page, detected_areas=detected_areas[fileName],