Reimplemented the ProgramTemplate with the new template system. WIP.

JLuebben · JLuebben · commit dfb9cb775547 · 2016-09-05T21:38:14.000+02:00
diff --git a/floppy/CustomNodes/crystNodes.py b/floppy/CustomNodes/crystNodes.py
@@ -147,7 +147,7 @@ def run(self):
     def report(self):
         r = super(PDB2INS, self).report()
         r['stdout'] = self.stdout
-        r['template'] = 'programTemplate'
+        r['template'] = 'ProgramTemplate'
         return r
 
 
diff --git a/floppy/CustomNodes/shelxNodes.py b/floppy/CustomNodes/shelxNodes.py
@@ -63,7 +63,7 @@ def run(self):
 
     def report(self):
         r = super(RunShelxl, self).report()
-        r['template'] = 'programTemplate'
+        r['template'] = 'ProgramTemplate'
         r['stdout'] = self.stdout
         return r
 
diff --git a/floppy/reportWidget.py b/floppy/reportWidget.py
@@ -2,55 +2,7 @@
 from PyQt5 import QtWebEngineWidgets, QtWebEngineCore
 from PyQt5.QtCore import Qt, QPoint, QSettings
 from floppy.templates import TEMPLATES
-'''
-TEMPLATES = {}
 
-
-
-def template(func):
-    TEMPLATES[func.__name__] = func
-    return func
-
-
-
-@template
-def defaultTemplate(data, cache):
-        return """<h1 id="head">{nodeName} -- {nodeID}</h1>
-        <style>
-          h1 {{ text-align:center; color: white}};
-        </style>
-
-        <style type="text/css">
-        #wrap {{
-           width:400;
-           margin:0 auto;
-        }}
-        #left_col {{
-           float:left;
-           width:200;
-           text-align:left;
-           color: white
-        }}
-        #right_col {{
-           float:right;
-           width:200;
-           text-align:right;
-           color: white
-        }}
-        </style>
-        <div id="wrap">
-            <div id="left_col">
-                {inputs}
-            </div>
-            <div id="right_col">
-                {outputs}
-            </div>
-        </div>""".format(nodeName=data['class'], nodeID=data['ID'],
-                         inputs='<br>'.join(['{}[{}]:  {}'.format(name, varType, value) for name, varType, value in data['inputs']]),
-                         outputs='<br>'.join(['{}[{}]:  {}'.format(name, varType, value) for name, varType, value in data['outputs']]))
-
-'''
-#class ReportWidget(QtWebKitWidgets.QWebView):
 class ReportWidget(QtWebEngineWidgets.QWebEngineView):
 
     def __init__(self, *args, **kwargs):
@@ -106,62 +58,6 @@ def _update(self):
         #scrollValue = self.page().scrollPosition()
         self.setHtml(tmplt(data, self.cache[:], self.fileBase, self.width()), url)
 
-'''
-@template
-def defaultTemplate(data, cache, fileBase):
-        return """
-        <style>
-          h1 {{ text-align:center; color: white}}
-        </style>
-
-        <style type="text/css">
-        #wrap {{
-           width:400;
-           margin:0 auto;
-        }}
-        #left_col {{
-           float:left;
-           width:200;
-           text-align:left;
-           color: white
-        }}
-        #right_col {{
-           float:right;
-           width:200;
-           text-align:right;
-           color: white
-        }}
-        </style>
-        <HTML>
-        <h1 id="head">{nodeName} -- {nodeID}</h1>
-        <div id="wrap">
-            <div id="left_col">
-                {inputs}
-            </div>
-            <div id="right_col">
-                {outputs}
-            </div>
-        </div></HTML>
-        """.format(nodeName=data['class'], nodeID=data['ID'],
-                         inputs='<br>'.join(['{}[{}]:  {}'.format(name, varType, value) for name, varType, value in data['inputs']]),
-                         outputs='<br>'.join(['{}[{}]:  {}'.format(name, varType, value) for name, varType, value in data['outputs']]))
-'''
-from floppy.quickPlot import test
-def defaultTemplate(data, cache, fileBase, width):
-    print(width)
-
-    return '''
-<HTML>
 
-    <BODY bgcolor="#606060">
-        <H1>{nodeName}</H1>
-        <div id=nodeID>ID: {ID} </div>
-        <P>This is very minimal "hello world" HTML document.</P>
-{plot}
-    </BODY>
-</HTML>
-    '''.format(nodeName=data['class'],
-               ID=data['ID'],
-               plot=test(width-30))
 
 
diff --git a/floppy/templates.py b/floppy/templates.py
@@ -159,6 +159,10 @@ def __call__(self, data, cache, fileBase, width):
         else:
             return str(self.document)
 
+class StdoutElement(TemplateElement):
+    def __call__(self, data, cache, fileBase, width):
+        return data['stdout'].replace('\\n', '<br>')
+
 
 class MetaTemplate(type):
     def __new__(cls, name, bases, classdict):
@@ -213,3 +217,7 @@ def __call__(self, data, cache, fileBase, width):
             </BODY>
         </HTML>
             '''.format(body='\n<br>\n'.join([element(data, cache, fileBase, width) for element in self.elements]))
+
+
+class ProgramTemplate(DefaultTemplate):
+    ELEMENTS = [IOElement, StdoutElement]
