support combined plots ! #210

src/feelpp/benchmarking/report/atomicReports/atomicReport.py

@@ -195,9 +195,8 @@ def createReport(self, base_dir, renderer):
         """
         hash_params_headers, flat_hash_params = self.parseHashMap()
 
-        model=AtomicReportModel( self.runs )
         view=AtomicReportView( self.plots_config )
-        controller=AtomicReportController(model,view)
+        controller=AtomicReportController(self.model,view)
 
         renderer.render(
             f"{base_dir}/{self.filename()}.adoc",
@@ -211,9 +210,7 @@ def createReport(self, base_dir, renderer):
                 flat_hash_param_map = flat_hash_params,
                 hash_params_headers = hash_params_headers,
                 description_path = self.description_path,
-                figures = controller.generateData("html"),
-                figure_csvs = controller.generateData("csv"),
-                figure_pgfs = controller.generateData("pgf")
+                figures = controller.generateAll()
             )
         )
 

src/feelpp/benchmarking/report/base/baseComponent.py

@@ -142,9 +142,7 @@ def createOverview(self,base_dir,renderer,parents,plots_config,master_df):
             data = dict(
                 parent_catalogs = "-".join([parent.id for parent in parents]),
                 parents = parents,
-                figures = controller.generateData("html"),
-                figure_csvs = controller.generateData("csv"),
-                figure_pgfs = controller.generateData("pgf")
+                figures = controller.generateAll()
             )
         )
 

src/feelpp/benchmarking/report/base/controller.py

@@ -11,41 +11,23 @@ def __init__(self, model, view):
         self.model = model
         self.view = view
 
-    def generatePlotly(self):
-        """ Creates plotly figures for each plot specified on the view config file
-        Returns a list of plotly figures.
-        """
-        return [ figure.createFigure(self.model.master_df) for figure in self.view.figures ]
-
-    def generatePlotlyHtml(self):
-        """ Creates plotly figures in html for each plot specified on the view config file
-        Returns a list of plotly HTML figures
-        """
-        return [ figure.createFigureHtml(self.model.master_df) for figure in self.view.figures ]
-
-    def generateTikz(self):
-        """ Creates Tikz/Pgf figures for each plot specified on the view config file
-        Returns:
-            list[str] LaTeX pgf plots.
-        """
-        return [ figure.createTex(self.model.master_df) for figure in self.view.figures ]
-
-    def generateCsv(self):
-        """ Create a list containing the data for each plot specified on the view config in CSV format.
-        Returns (list[str]): List of csv data.
-        """
-        return [ figure.createCsv(self.model.master_df) for figure in self.view.figures ]
-
-
-    def generateData(self,format):
-        """ Creates a list of data depending on the desired format, using the plot configuration and the model's master dataframe"""
-        if format == "plotly":
-            return self.generatePlotly()
-        elif format == "html":
-            return self.generatePlotlyHtml()
-        elif format in ["tikz", "pgf"]:
-            return self.generateTikz()
-        elif format == "csv":
-            return self.generateCsv()
-        else:
-            raise NotImplementedError
+    def generateAll(self):
+        return [
+            self.generateFigure(figure,plot_config.plot_types)
+            for figure,plot_config in zip(self.view.figures,self.view.plots_config)
+        ]
+
+    def generateFigure(self,figure,plot_types):
+        return {
+            "plot_types": plot_types,
+            "subfigures": [self.generateSubfigure(subfigure) for subfigure in figure]
+        }
+
+    def generateSubfigure(self, subfigure):
+        return {
+            "exports": [
+                { "display_text":"CSV", "filename":"data.csv", "data":subfigure.createCsv(self.model.master_df) },
+                { "display_text":"LaTeX", "filename":"figure.tex", "data":subfigure.createTex(self.model.master_df) },
+            ],
+            "html": subfigure.createFigureHtml(self.model.master_df)
+        }

src/feelpp/benchmarking/report/base/view.py

@@ -9,7 +9,4 @@ def __init__(self,plots_config):
             plots_config list[dict]. List with dictionaries specifying plots configuration.
         """
         self.plots_config = [Plot(**d) for d in plots_config]
-
-        self.figures = []
-        for plot_config in self.plots_config:
-            self.figures.extend(FigureFactory.create(plot_config))
+        self.figures = [FigureFactory.create(plot_config) for plot_config in self.plots_config]

src/feelpp/benchmarking/report/templates/atomicOverview.adoc.j2

@@ -11,4 +11,14 @@
     - {{parent.type.title()}} : {{parent.display_name}}
 {% endfor %}
 
-{%include "figures.html.j2" %}
+++++
+<style>
+{%include "css/figures.css" %}
+</style>
+
+{%include "figures.html.j2" %}
+
+<script type="text/javascript">
+{%include "js/figureHelpers.js"%}
+</script>
+++++

src/feelpp/benchmarking/report/templates/benchmark.adoc.j2

@@ -34,7 +34,15 @@ include::ROOT:{{description_path}}[leveloffset=+1]
 |===
 
 {% if not empty %}
+++++
+<style>
+{%include "css/figures.css" %}
+</style>
 
 {%include "figures.html.j2" %}
 
+<script type="text/javascript">
+{%include "js/figureHelpers.js"%}
+</script>
+++++
 {% endif %}

src/feelpp/benchmarking/report/templates/css/figures.css

@@ -0,0 +1,25 @@
+.figure-container {
+    position: relative;
+  }
+
+  .subfigure-container {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    transition: opacity 0.2s ease;
+  }
+
+  .subfigure-container.active {
+    position: relative;
+    opacity: 1;
+    pointer-events: auto;
+    z-index: 1;
+  }
+
+  .subfigure-container.inactive {
+    opacity: 0;
+    pointer-events: none;
+    z-index: 0;
+  }

src/feelpp/benchmarking/report/templates/figures.html.j2

@@ -1,36 +1,29 @@
 {% for figure in figures %}
-++++
-<button id="download-csv-{{parent_catalogs}}-{{loop.index}}" > CSV </button>
-<button id="download-pgf-{{parent_catalogs}}-{{loop.index}}" > LaTeX </button>
-{{figure}}
-++++
-{% endfor %}
+{% set figure_i = loop.index %}
+<div class='figure-container'>
+    {% if figure.plot_types | length > 1%}
+    <div class='tabs-container'>
+    {% for plot_type in figure.plot_types %}
+    {% set plot_type_i = loop.index %}
+        <button class='figure-tab' onclick='switchTab({{figure_i}},{{plot_type_i}})' >{{plot_type}}</button>
+    {% endfor %}
+    </div>
+    {% endif %}
 
+    {% for subfigure in figure.subfigures %}
+    {% set subfigure_i = loop.index %}
+      <div class="subfigure-container {% if loop.first %}active{% else %}inactive{% endif %}" id="subfig_{{ figure_i }}_{{ loop.index }}">
+        <div class='export-container'>
+        {% for export in subfigure.exports %}
+            <button onclick='downloadString(`{{export.data | tojson | stripquotes}}`,"{{export.filename}}","plain/text")' >
+                {{export.display_text}}
+            </button>
+        {% endfor %}
+        </div>
 
-++++
-<script>
-function downloadString(data, filename, mimeType ) {
-    const blob = new Blob([data], { type: `${mimeType};charset=utf-8` });
-    const url = URL.createObjectURL(blob);
-    const a = document.createElement('a');
-    a.href = url;
-    a.download = filename;
-    document.body.appendChild(a);
-    a.click();
-    document.body.removeChild(a);
-    URL.revokeObjectURL(url);
-}
+        {{subfigure.html}}
+    </div>
+    {% endfor %}
+</div>
 
-function addDownloadListener( button_id, data, filename, mimeType = 'text/plain') {
-    document.getElementById(button_id).addEventListener('click', function() {
-        downloadString(data,filename,mimeType);
-    });
-}
-
-{% for csv,pgf in zip(figure_csvs,figure_pgfs) %}
-    addDownloadListener('download-csv-{{parent_catalogs}}-{{loop.index}}' , `{{csv | tojson | stripquotes}}`, 'data.csv', 'text/csv')
-    addDownloadListener('download-pgf-{{parent_catalogs}}-{{loop.index}}' , `{{pgf | tojson | stripquotes}}`, 'figure.tex' )
-{% endfor %}
-
-</script>
-++++
+{% endfor %}

src/feelpp/benchmarking/report/templates/js/figureHelpers.js

@@ -0,0 +1,26 @@
+
+function downloadString(data, filename, mimeType ) {
+    const blob = new Blob([data], { type: `${mimeType};charset=utf-8` });
+    const url = URL.createObjectURL(blob);
+    const a = document.createElement('a');
+    a.href = url;
+    a.download = filename;
+    document.body.appendChild(a);
+    a.click();
+    document.body.removeChild(a);
+    URL.revokeObjectURL(url);
+}
+
+function switchTab(figureIndex, tabIndex) {
+    let subfigures = document.querySelectorAll(`[id^="subfig_${figureIndex}_"]`);
+    subfigures.forEach(subfig => {
+        subfig.classList.remove('active');
+        subfig.classList.add('inactive');
+    });
+
+    let activeSubfig = document.getElementById(`subfig_${figureIndex}_${tabIndex}`);
+    if(activeSubfig){
+        activeSubfig.classList.remove('inactive');
+        activeSubfig.classList.add('active');
+    }
+}