SimulationExperiment view: some work on populating our graph panel pr…

…operty editor (#1426).
opencor · Oct 30, 2017 · 7832e0d · 7832e0d
1 parent fe2dffe
commit 7832e0d
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 0 deletions.
diff --git a/src/plugins/simulation/SimulationExperimentView/i18n/SimulationExperimentView_fr.ts b/src/plugins/simulation/SimulationExperimentView/i18n/SimulationExperimentView_fr.ts
@@ -175,6 +175,34 @@
         <source>Fill colour</source>
         <translation>Couleur de remplissage</translation>
     </message>
+    <message>
+        <source>Font size</source>
+        <translation>Taille de la police</translation>
+    </message>
+    <message>
+        <source>Grid lines</source>
+        <translation>Lignes de quadrillage</translation>
+    </message>
+    <message>
+        <source>Point coordinates</source>
+        <translation>Coordonnées de point</translation>
+    </message>
+    <message>
+        <source>Font colour</source>
+        <translation>Couleur de la police</translation>
+    </message>
+    <message>
+        <source>Zoom region</source>
+        <translation>Région de zoom</translation>
+    </message>
+    <message>
+        <source>Logarithmic X axis</source>
+        <translation>Axe logarithmique des X</translation>
+    </message>
+    <message>
+        <source>Logarithmic Y axis</source>
+        <translation>Axe logarithmique des Y</translation>
+    </message>
 </context>
 <context>
     <name>OpenCOR::SimulationExperimentView::SimulationExperimentViewInformationParametersWidget</name>

diff --git a/...lationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp b/...lationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp
@@ -140,6 +140,34 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::retranslateUi
     foreach (Core::PropertyEditorWidget *graphsPropertyEditor, mGraphsPropertyEditors)
         graphsPropertyEditor->retranslateUi();
 
+    // Retranslate the contents of our graph panel property editors
+
+    foreach (Core::PropertyEditorWidget *graphPanelPropertyEditor, mGraphPanelPropertyEditors) {
+        graphPanelPropertyEditor->properties()[0]->setName(tr("Colour"));
+        graphPanelPropertyEditor->properties()[1]->setName(tr("Font size"));
+
+        graphPanelPropertyEditor->properties()[2]->setName(tr("Grid lines"));
+        graphPanelPropertyEditor->properties()[2]->properties()[0]->setName(tr("Style"));
+        graphPanelPropertyEditor->properties()[2]->properties()[1]->setName(tr("Width"));
+        graphPanelPropertyEditor->properties()[2]->properties()[2]->setName(tr("Colour"));
+
+        graphPanelPropertyEditor->properties()[3]->setName(tr("Logarithmic X axis"));
+        graphPanelPropertyEditor->properties()[4]->setName(tr("Logarithmic Y axis"));
+
+        graphPanelPropertyEditor->properties()[5]->setName(tr("Point coordinates"));
+        graphPanelPropertyEditor->properties()[5]->properties()[0]->setName(tr("Style"));
+        graphPanelPropertyEditor->properties()[5]->properties()[1]->setName(tr("Width"));
+        graphPanelPropertyEditor->properties()[5]->properties()[2]->setName(tr("Colour"));
+        graphPanelPropertyEditor->properties()[5]->properties()[3]->setName(tr("Font colour"));
+
+        graphPanelPropertyEditor->properties()[6]->setName(tr("Zoom region"));
+        graphPanelPropertyEditor->properties()[6]->properties()[0]->setName(tr("Style"));
+        graphPanelPropertyEditor->properties()[6]->properties()[1]->setName(tr("Width"));
+        graphPanelPropertyEditor->properties()[6]->properties()[2]->setName(tr("Colour"));
+        graphPanelPropertyEditor->properties()[6]->properties()[3]->setName(tr("Filled"));
+        graphPanelPropertyEditor->properties()[6]->properties()[4]->setName(tr("Fill colour"));
+    }
+
     // Retranslate the information about our graphs properties
     // Note: no need to do this for all our property editors (i.e. call
     //       updateAllGraphsInfo()) since this will automatically be done when
@@ -192,6 +220,10 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::initialize(Op
         mGraphPanelPropertyEditor = new Core::PropertyEditorWidget(false, false, this);
         mGraphsPropertyEditor = new Core::PropertyEditorWidget(false, false, this);
 
+        // Populate our graph panel property editor
+
+        populateGraphPanelPropertyEditor();
+
         // We want our own context menu for our graphs property editor
 
         mGraphsPropertyEditor->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -719,6 +751,41 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::graphsPropert
     mGraphsHorizontalScrollBarValue = pValue;
 }
 
+
+//==============================================================================
+
+void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::populateGraphPanelPropertyEditor()
+{
+    // Populate our graph panel property editor
+
+    mGraphPanelPropertyEditor->addColorProperty();
+    mGraphPanelPropertyEditor->addDoubleGt0Property();
+
+    Core::Property *gridLinesProperty = mGraphPanelPropertyEditor->addSectionProperty();
+
+    mGraphPanelPropertyEditor->addListProperty(SEDMLSupport::lineStyles(), gridLinesProperty);
+    mGraphPanelPropertyEditor->addDoubleGt0Property(gridLinesProperty);
+    mGraphPanelPropertyEditor->addColorProperty(gridLinesProperty);
+
+    mGraphPanelPropertyEditor->addBooleanProperty();
+    mGraphPanelPropertyEditor->addBooleanProperty();
+
+    Core::Property *pointCoordinatesProperty = mGraphPanelPropertyEditor->addSectionProperty();
+
+    mGraphPanelPropertyEditor->addListProperty(SEDMLSupport::lineStyles(), pointCoordinatesProperty);
+    mGraphPanelPropertyEditor->addDoubleGt0Property(pointCoordinatesProperty);
+    mGraphPanelPropertyEditor->addColorProperty(pointCoordinatesProperty);
+    mGraphPanelPropertyEditor->addColorProperty(pointCoordinatesProperty);
+
+    Core::Property *zoomRegionProperty = mGraphPanelPropertyEditor->addSectionProperty();
+
+    mGraphPanelPropertyEditor->addListProperty(SEDMLSupport::lineStyles(), zoomRegionProperty);
+    mGraphPanelPropertyEditor->addDoubleGt0Property(zoomRegionProperty);
+    mGraphPanelPropertyEditor->addColorProperty(zoomRegionProperty);
+    mGraphPanelPropertyEditor->addBooleanProperty(zoomRegionProperty);
+    mGraphPanelPropertyEditor->addColorProperty(zoomRegionProperty);
+}
+
 //==============================================================================
 
 void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::populateParametersContextMenu(CellMLSupport::CellmlFileRuntime *pRuntime)

diff --git a/...mulationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.h b/...mulationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.h
@@ -137,6 +137,8 @@ class SimulationExperimentViewInformationGraphPanelAndGraphsWidget : public QSta
     int mGraphPanelHorizontalScrollBarValue;
     int mGraphsHorizontalScrollBarValue;
 
+    void populateGraphPanelPropertyEditor();
+
     void populateParametersContextMenu(CellMLSupport::CellmlFileRuntime *pRuntime);
 
     bool checkParameter(CellMLSupport::CellmlFileRuntime *pRuntime,