Merge pull request #14 from Patent2net/4.0.0-dev2

4.0.0 dev2
Patent2net · Jun 9, 2021 · 319c984 · 319c984
2 parents dab1870 + 54a12b1
commit 319c984
Show file tree

Hide file tree

Showing 96 changed files with 138,526 additions and 6,464 deletions.
diff --git a/Patent2Net/AcadNNets.py b/Patent2Net/AcadNNets.py
@@ -1407,10 +1407,14 @@ def cycle (liste):
     anglOpt = "{{loadingMessage=='' ? 'LOAD GRAPH' : loadingMessage}}"
 )    
 
+# Graph recupes v2
+RenderTemplate(
+    "graph-recipes.html",
+    configFile.ResultPath+"/graph-recipes-" + projectName + ".html",
+    request=projectName
+)
 
-
-
-
+
 # secondes = time.time() - start_time
 
 # heures, secondes = divmod(secondes, 3600)

diff --git a/Patent2Net/P2N-Nets-new.py b/Patent2Net/P2N-Nets-new.py
@@ -1314,10 +1314,14 @@ def cycle (liste):
     configFile.ResultPath+"/GraphUpload.html",
     request=projectName,
     anglOpt = "{{loadingMessage=='' ? 'LOAD GRAPH' : loadingMessage}}"
-)    
-
-
-
+)
+
+# Graph recupes v2
+RenderTemplate(
+    "graph-recipes.html",
+    configFile.ResultPath+"/graph-recipes-" + projectName + ".html",
+    request=projectName
+)
 
 
 # secondes = time.time() - start_time

diff --git a/Patent2Net/P2N-Nets-newBeta.py b/Patent2Net/P2N-Nets-newBeta.py
@@ -888,10 +888,14 @@ def cycle (liste):
     anglOpt = "{{loadingMessage=='' ? 'LOAD GRAPH' : loadingMessage}}"
 )    
 
+# Graph recupes v2
+RenderTemplate(
+    "graph-recipes.html",
+    configFile.ResultPath+"/graph-recipes-" + projectName + ".html",
+    request=projectName
+)
 
-
-
-
+
 secondes = time.time() - start_time
 
 heures, secondes = divmod(secondes, 3600)

diff --git a/Patent2Net/media/Graph-recipes/view_board/board.html b/Patent2Net/media/Graph-recipes/view_board/board.html
@@ -23,9 +23,8 @@ <h3 class="main-title">P2N graph</h3>
 
     <div layout flex>
       <div layout="column" layout-fill class="command-zone">
-        <div class="network-info">
+        <div class="network-info flex flex-row">
           <span style="font-size: 1.4em">{{filename}}</span>
-          <br>
           {{nodesCount}} nodes -
           {{edgesCount}} edges
           <br>