adapted paths

app/__init__.py

@@ -1,7 +1,8 @@
 from flask import Flask
 
-app = Flask(__name__)
+#app = Flask(__name__)
+app = Flask(__name__, static_url_path="", static_folder="static")
 app.debug = True
-app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 0
+#app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 0
 
 from app import views

app/__init__.py~

@@ -0,0 +1,8 @@
+from flask import Flask
+
+#app = Flask(__name__)
+app = Flask(__name__, static_url_path="", static_folder="static")
+app.debug = True
+#app.config['SEND_FILE_MAX_AGE_DEFAULT'] = 0
+
+from app import views

app/static/js/js_libs/ui.js

@@ -72,7 +72,7 @@ function create_new_tab(title, id,terms) {
     newElement.setAttribute('id', "iso_"+id);
     console.log(terms);
     console.log(textElement)
-    newElement.innerHTML = "<iframe width=100% height=1000px src= '/static/isos/" + id  + ".PDF')'> </iframe>";
+    newElement.innerHTML = "<iframe width=100% height=1000px src= '/edi2/isos/" + id  + ".PDF')'> </iframe>";
     theDiv.appendChild(textElement);
     theDiv.appendChild(newElement);
     }
@@ -83,7 +83,8 @@ function create_new_tab(title, id,terms) {
         textElement.innerHTML += "<a onclick=change_isos_tab('"+id+"','start')> Start of ISO File. </a><br>";
         newElement.setAttribute('id', "iso_"+id);
         //console.log(terms);
-        newElement.innerHTML = "<iframe width=100% height=1000px src= '/static/isos/" + id  + ".PDF')'> </iframe>";
+        newElement.innerHTML = "<iframe width=100% height=1000px src= '/edi2/isos/" + id  + ".PDF')'> </iframe>";
+        newElement.innerHTML ="<h1> hallooo </>"
         theDiv.appendChild(textElement);
         theDiv.appendChild(newElement);
     }
@@ -95,7 +96,7 @@ function change_isos_tab(id, term){
     if (term == "start"){
         term = 1;
     }
-    theDiv.innerHTML = "<iframe width=100% height=1000px src= '/static/isos/" + id  + ".PDF#page="+ term+"')'> </iframe>";
+    theDiv.innerHTML = "<iframe width=100% height=1000px src= '/edi2/isos/" + id  + ".PDF#page="+ term+"')'> </iframe>";
     console.log(id,term);
     return true;
 }

app/static/js/js_libs/ui.js~

@@ -0,0 +1,232 @@
+/*
+  This file is part of CPEE.
+
+  CPEE is free software: you can redistribute it and/or modify it under the terms
+  of the GNU General Public License as published by the Free Software Foundation,
+  either version 3 of the License, or (at your option) any later version.
+
+  CPEE is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+  PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License along with
+  CPEE (file COPYING in the main directory).  If not, see
+  <http://www.gnu.org/licenses/>.
+*/
+
+function ui_click_tab(moi) { // {{{
+  $(moi).trigger('click');
+} // }}}
+
+function ui_close_tab(moi){
+  var active = $(moi).parent().attr('data-tab');
+  var tabbed = $(moi).parent().parent().parent();
+  var is_inactive = $(moi).parent().hasClass('inactive');
+  $('*[data-tab=' + active + ']').remove();
+  $('*[data-belongs-to-tab=' + active + ']').remove();
+  if (!is_inactive)
+    ui_click_tab($('ui-tabbar ui-tab.default'));
+}
+
+function ui_add_close(moi) {
+  $(moi).append($('<ui-close>✖</ui-close>'));
+}
+
+function ui_empty_tab_contents(id) {
+  $('ui-content ui-area[data-belongs-to-tab=' + id + ']').empty();
+}
+
+function ui_add_tab(tabbed,title,id,closeable,additionalclasses) {
+  additionalclasses = typeof additionalclasses !== 'undefined' ? additionalclasses : '';
+  if ($('ui-tabbar ui-tab[data-tab=' + id + ']').length > 0) {
+    ui_activate_tab($('ui-tabbar ui-tab[data-tab=' + id + ']'));
+    return false;
+  } else {
+    var instab = $("<ui-tab class='inactive" + (closeable ? ' closeable' : '') + (additionalclasses == '' ? '' : ' ' + additionalclasses) + "' data-tab='" + id + "'>" + title + "</ui-tab>");
+    var insarea = $("<ui-area data-belongs-to-tab='" + id + "' class='inactive' id="+ id +"></ui-area>");
+    $(tabbed).find('ui-behind').before(instab);
+    $(tabbed).find('ui-content').append(insarea);
+    ui_add_close($('ui-tabbar ui-tab[data-tab=' + id + ']'));
+    return true;
+  }
+}
+
+function create_new_tab(title, id,terms) {
+    //console.log(title,id);
+    if (terms != "empty"){
+    var terms = atob(terms);
+    var theDiv = document.getElementById(id);
+    //var content = document.createTextNode("Test");
+    //var content = document.createTextNode(terms);
+    var newElement = document.createElement('div');
+    var textElement = document.createElement('div');
+    var array_terms = JSON.parse(terms);
+    var len = Object.keys(array_terms).length;
+    console.log(len);
+    textElement.innerHTML += "<a onclick=change_isos_tab('"+id+"','start')> Start of ISO document </a><br>";
+    for (var key in array_terms) {
+        console.log(key);
+        //theDiv.appendChild(document.createTextNode(terms[key]));
+        textElement.innerHTML += "<a onclick=change_isos_tab('"+id+"','"+array_terms[key]+"')>"+key+" </a><br>";
+    }
+    newElement.setAttribute('id', "iso_"+id);
+    console.log(terms);
+    console.log(textElement)
+    newElement.innerHTML = "<iframe width=100% height=1000px src= '/edi2/isos/" + id  + ".PDF')'> </iframe>";
+    theDiv.appendChild(textElement);
+    theDiv.appendChild(newElement);
+    }
+    else{
+        var theDiv = document.getElementById(id);
+        var newElement = document.createElement('div');
+        var textElement = document.createElement('div');
+        textElement.innerHTML += "<a onclick=change_isos_tab('"+id+"','start')> Start of ISO File. </a><br>";
+        newElement.setAttribute('id', "iso_"+id);
+        //console.log(terms);
+        newElement.innerHTML = "<iframe width=100% height=1000px src= '/edi2/isos/" + id  + ".PDF')'> </iframe>";
+        newElement.innerHTML ="<h1> hallooo </>"
+        theDiv.appendChild(textElement);
+        theDiv.appendChild(newElement);
+    }
+    return true;
+}
+
+function change_isos_tab(id, term){
+    var theDiv = document.getElementById("iso_"+id);
+    if (term == "start"){
+        term = 1;
+    }
+    theDiv.innerHTML = "<iframe width=100% height=1000px src= '/edi2/isos/" + id  + ".PDF#page="+ term+"')'> </iframe>";
+    console.log(id,term);
+    return true;
+}
+
+function ui_add_tab_active(tabbed,title,id,closeable,additionalclasses, terms) {
+  var state = ui_add_tab(tabbed,title,id,closeable,additionalclasses);
+  console.log("test");
+  if (state) { create_new_tab(title, id, terms); }
+  if (state) { ui_activate_tab($('ui-tabbar ui-tab[data-tab=' + id + ']')); }
+  return state;
+}
+
+
+
+function ui_clone_tab(tabbar,original,title,id,closeable,additionalclasses) {
+  additionalclasses = typeof additionalclasses !== 'undefined' ? additionalclasses : '';
+  var instab = $("<ui-tab class='inactive" + (closeable ? ' closeable' : '') + (additionalclasses == '' ? '' : ' ' + additionalclasses) + "' data-tab='" + id + "' id='tab_" + id + "'>" + title + "</ui-tab>");
+  var insarea = original.clone();
+  insarea.attr("data-belongs-to-tab",id);
+  insarea.attr("class","inactive");
+  $(tabbar).find('ui-behind').before(instab);
+  $(tabbar).parent().append(insarea);
+  ui_add_close($('ui-tabbed ui-tab[data-tab=' + id + ']'));
+}
+
+(function($) { //{{{
+  $.fn.dragcolumn = function() {
+    var drag = $(this);
+    var prev = drag.prev();
+    var next = drag.next();
+
+    this.on("mousedown", function(e) {
+      drag.addClass('draggable');
+      $(document).one("mouseup", function(e) {
+        drag.removeClass('draggable');
+        e.preventDefault();
+      });
+      e.preventDefault();
+    });
+
+    $(document).on("mousemove", function(e) {
+      if (!drag.hasClass('draggable'))
+        return;
+
+      // Assume 50/50 split between prev and next then adjust to
+      // the next X for prev
+      var total = prev.outerWidth() + next.outerWidth();
+      var pos = e.pageX - prev.offset().left;
+      if (pos > total) {
+        pos = total;
+      }
+
+      var leftPercentage = pos / total;
+      var rightPercentage = 1 - leftPercentage;
+
+      prev.css('flex', leftPercentage.toString());
+      next.css('flex', rightPercentage.toString());
+
+      e.preventDefault();
+    });
+  }
+  $.fn.dragresize = function() {
+    var drag = $(this);
+    var prev = drag.prev();
+    var initpos = 0;
+    var initheight = $("ui-content",prev).height();
+
+    this.on("mousedown", function(e) {
+      drag.addClass('draggable');
+      initpos = e.pageY;
+      $(document).one("mouseup", function(e) {
+        drag.removeClass('draggable');
+        e.preventDefault();
+      });
+      e.preventDefault();
+    });
+
+    $(document).on("mousemove", function(e) {
+      if (!drag.hasClass('draggable'))
+        return;
+
+      var pos = initheight - (initpos - e.pageY);
+      if (pos < 0)
+        return;
+
+      $("ui-content",prev).css('height', pos.toString());
+
+      e.preventDefault();
+    });
+  }
+})(jQuery); //}}}
+
+function ui_activate_tab(moi) { // {{{
+  var active = $(moi).attr('data-tab');
+  var tabbed = $(moi).parent().parent();
+  var tabs = [];
+  $("ui-tabbar > ui-tab",tabbed).each(function(){
+    if (!$(this).attr('class').match(/switch/)) {
+      tabs.push($(this).attr('data-tab'));
+    }
+  });
+  $(".inactive",tabbed).removeClass("inactive");
+  $.each(tabs,function(a,b){
+    if (b != active) {
+      $("ui-tabbar ui-tab[data-tab=" + b + "]",tabbed).addClass("inactive");
+      $("ui-content *[data-belongs-to-tab=" + b + "]",tabbed).addClass("inactive");
+    }
+  });
+} // }}}
+function ui_toggle_vis_tab(moi) {// {{{
+  if ($(moi)[0].nodeName == 'UI-TABBED') {
+    var tabbed = $(moi);
+  }
+  if ($(moi)[0].nodeName == 'UI-TAB') {
+    var tabbed = $(moi).parent().parent();
+  }
+  if (tabbed) {
+    tabbed.toggleClass('off');
+  }
+}// }}}
+
+$(document).ready(function() {
+  if (!($.browser.name == "Firefox" && $.browser.version >= 20) && !($.browser.name == "Chrome" && $.browser.version >= 30)) {
+    $('body').children().remove();
+    $('body').append('Sorry, only Firefox >= 20.0 and Chrom(e|ium) >= 17 for now.');
+  }
+  $('ui-rest ui-content ui-resizehandle').dragcolumn();
+  $('*[is=x-ui] > ui-resizehandle').dragresize();
+  $(document).on('click','ui-tabbar ui-tab.switch',function(){ui_toggle_vis_tab(this);});
+  $(document).on('click','ui-tabbar ui-tab:not(.switch)',function(){ui_activate_tab(this);});
+  ui_add_close($('ui-tabbar ui-tab.closeable'));
+  $(document).on('click','ui-tabbar ui-tab.closeable ui-close',function(){ui_close_tab(this);});
+});

app/templates/index.html

@@ -22,7 +22,7 @@
     <title>Resources</title>
 
     <!-- libs, do not modify. When local than load local libs. -->
-        <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
+     <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
@@ -35,14 +35,14 @@
     <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
 
-    <script type="text/javascript" src="/js_libs/ui.js"></script>
+    <script type="text/javascript" src="/edi2/js_libs/ui.js"></script>
     <link   rel="stylesheet"      href="/js_libs/ui.css" type="text/css"/>
 
     <link   rel="stylesheet"      href="/cdp_ui/ui.css" type="text/css"/>
 
-    <link   rel="stylesheet"      href="css/ui.css" type="text/css"/>
+    <link   rel="stylesheet"      href="/edi2/css/ui.css" type="text/css"/>
     
-    <!--script type="text/javascript" src="{{ url_for('static', filename='js/js_libs/jquery.min.js') }}"></script>
+	<!--<script type="text/javascript" src="{{ url_for('static', filename='js/js_libs/jquery.min.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/js_libs/jquery.browser.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/js_libs/jquery.svg.min.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/js_libs/jquery.svgdom.min.js') }}"></script>
@@ -60,9 +60,9 @@
 
     <link   rel="stylesheet"      href="{{ url_for('static', filename='js/js_libs/cdp_ui.css') }}" type="text/css"/>
 
-    <!--<link   rel="stylesheet"      href="{{ url_for('static', filename='js/js_libs/css/ui.css') }}" type="text/css"/>-->
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css"/>
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/layout.css') }}" type="text/css"/>
+    <link   rel="stylesheet"      href="{{ url_for('static', filename='js/js_libs/css/ui.css') }}" type="text/css"/>-->
+    <link rel="stylesheet" href="/edi2/css/style.css" type="text/css"/>
+    <link rel="stylesheet" href="/edi2/css/layout.css" type="text/css"/>
 
   <body is="x-ui">
     <ui-rest id="main">
@@ -83,7 +83,7 @@
           <ui-content>
               <ui-area data-belongs-to-tab="drawing" >
                   <div class="images">
-                  <img  class="optcontent" id="drawing" src="/home/centurio/Projects/engineering_drawings_ui/app/temporary/out.jpg" alt="Drawing">
+                  <img  class="optcontent" id="drawing" src="{{ url_for('static', filename='edi2/out.jpg') }}" alt="Drawing">
                   </div>
 
               </ui-area>

app/templates/index.html~

@@ -22,7 +22,7 @@
     <title>Resources</title>
 
     <!-- libs, do not modify. When local than load local libs. -->
-        <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
+     <script type="text/javascript" src="/js_libs/jquery.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.browser.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.svg.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.svgdom.min.js"></script>
@@ -35,14 +35,14 @@
     <script type="text/javascript" src="/js_libs/jquery.caret.min.js"></script>
     <script type="text/javascript" src="/js_libs/jquery.cookie.js"></script>
 
-    <script type="text/javascript" src="/js_libs/ui.js"></script>
+    <script type="text/javascript" src="/edi2/js_libs/ui.js"></script>
     <link   rel="stylesheet"      href="/js_libs/ui.css" type="text/css"/>
 
     <link   rel="stylesheet"      href="/cdp_ui/ui.css" type="text/css"/>
 
-    <link   rel="stylesheet"      href="css/ui.css" type="text/css"/>
+    <link   rel="stylesheet"      href="/edi2/css/ui.css" type="text/css"/>
     
-    <!--script type="text/javascript" src="{{ url_for('static', filename='js/js_libs/jquery.min.js') }}"></script>
+	<!--<script type="text/javascript" src="{{ url_for('static', filename='js/js_libs/jquery.min.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/js_libs/jquery.browser.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/js_libs/jquery.svg.min.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/js_libs/jquery.svgdom.min.js') }}"></script>
@@ -60,9 +60,9 @@
 
     <link   rel="stylesheet"      href="{{ url_for('static', filename='js/js_libs/cdp_ui.css') }}" type="text/css"/>
 
-    <!--<link   rel="stylesheet"      href="{{ url_for('static', filename='js/js_libs/css/ui.css') }}" type="text/css"/>-->
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css"/>
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/layout.css') }}" type="text/css"/>
+    <link   rel="stylesheet"      href="{{ url_for('static', filename='js/js_libs/css/ui.css') }}" type="text/css"/>-->
+    <link rel="stylesheet" href="/edi2/css/style.css" type="text/css"/>
+    <link rel="stylesheet" href="/edi2/css/layout.css" type="text/css"/>
 
   <body is="x-ui">
     <ui-rest id="main">
@@ -83,8 +83,7 @@
           <ui-content>
               <ui-area data-belongs-to-tab="drawing" >
                   <div class="images">
-                  <img  class="optcontent" id="drawing" src="/home/centurio/Projects/engineering_drawings_ui/app/temporary/out.jog
-" alt="Drawing">
+                  <img  class="optcontent" id="drawing" src="{{ url_for('static', filename='edi2/out.jpg') }}" alt="Drawing">
                   </div>
 
               </ui-area>

app/views.py

@@ -30,7 +30,7 @@ def allowed_file(filename):
 def convert_pdf_img(filename):
     PDFFILE = UPLOAD_FOLDER +"/" + filename
     subprocess.call(['pdftoppm', '-jpeg', '-singlefile',
-                     PDFFILE, path + '/temporary/out'])
+                     PDFFILE,  '/home/centurio/web/edi2/out'])
 
 def extract_all(uuid, filename, db):
     #order_bounding_boxes_in_each_block.main(uuid, UPLOAD_FOLDER + "/" + filename)
@@ -146,8 +146,9 @@ def uploaded_file(filename, uuid):
         #re_gewinde = r"M\d{1,2}"
         #re_passungen = r"h\d{1,2}|H\d{1,2}"
         det_coords= "0,0,0,0"
-        with open(path+ '/config.json') as f:
+        with open(path +'/static/config.json') as f:
             config_file = json.load(f)
+            print(config_file)
 
         for dim in sorted(dims):
             #print(dim)
@@ -192,7 +193,7 @@ def uploaded_file(filename, uuid):
                             search_terms["Beginn"] = 1
                         terms = json.dumps(search_terms)
                         #print(terms)
-                        terms = base64.b64encode(terms.encode())
+                        terms = base64.b64encode(terms.encode()).decode('utf-8')
                         #terms = "blub"
 
 

app/views.py~

@@ -18,7 +18,7 @@ path = "/home/centurio/Projects/engineering_drawings_ui/app"
 
 #path_extraction = '/home/bscheibel/PycharmProjects/dxf_reader/main.py'
 path_extraction = "/home/centurio/Projects/engineering_drawings_extraction/main.py"
-UPLOAD_FOLDER = path + "/temporary"
+UPLOAD_FOLDER = path + "/temporary/"
 app.config["UPLOAD_FOLDER"] = UPLOAD_FOLDER
 ALLOWED_EXTENSIONS = set(['pdf', 'png', 'jpg', 'jpeg', 'PDF'])
 
@@ -30,7 +30,7 @@ def allowed_file(filename):
 def convert_pdf_img(filename):
     PDFFILE = UPLOAD_FOLDER +"/" + filename
     subprocess.call(['pdftoppm', '-jpeg', '-singlefile',
-                     PDFFILE, path + '/temporary/out'])
+                     PDFFILE,  '/edi2/out'])
 
 def extract_all(uuid, filename, db):
     #order_bounding_boxes_in_each_block.main(uuid, UPLOAD_FOLDER + "/" + filename)
@@ -146,8 +146,9 @@ def uploaded_file(filename, uuid):
         #re_gewinde = r"M\d{1,2}"
         #re_passungen = r"h\d{1,2}|H\d{1,2}"
         det_coords= "0,0,0,0"
-        with open(path+ '/config.json') as f:
+        with open(path +'/static/config.json') as f:
             config_file = json.load(f)
+            print(config_file)
 
         for dim in sorted(dims):
             #print(dim)
@@ -192,7 +193,7 @@ def uploaded_file(filename, uuid):
                             search_terms["Beginn"] = 1
                         terms = json.dumps(search_terms)
                         #print(terms)
-                        terms = base64.b64encode(terms.encode())
+                        terms = base64.b64encode(terms.encode()).decode('utf-8')
                         #terms = "blub"
 
 

wsgi.py

@@ -1,4 +1,5 @@
 from app import app
 
 if __name__ == "__main__":
-    app.run()
+    #app.run()
+    server = Flask(__name__, static_url_path="", static_folder="static")

wsgi.py~

@@ -0,0 +1,5 @@
+from app import app
+
+if __name__ == "__main__":
+    app.run()
+    server = Flask(__name__, static_url_path="", static_folder="static")