SimulationExperiment view: removed the shell of a graph panel and gra…

…phs specific property editor (opencor#1426). Indeed, refactoring the Graphs property editor was proving to be too tedious, not to mention that this meant several instances of our context menu, etc. one for each graph panel. So, not optimal at all.
agarny · Oct 28, 2017 · e010025 · e010025
1 parent baf2672
commit e010025
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 204 deletions.
diff --git a/src/plugins/simulation/SimulationExperimentView/CMakeLists.txt b/src/plugins/simulation/SimulationExperimentView/CMakeLists.txt
@@ -16,8 +16,6 @@ ADD_PLUGIN(SimulationExperimentView
 
         src/simulationexperimentviewcontentswidget.cpp
         src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp
-        src/simulationexperimentviewinformationgraphpanelpropertyeditor.cpp
-        src/simulationexperimentviewinformationgraphspropertyeditor.cpp
         src/simulationexperimentviewinformationparameterswidget.cpp
         src/simulationexperimentviewinformationsimulationwidget.cpp
         src/simulationexperimentviewinformationsolverswidget.cpp
@@ -33,8 +31,6 @@ ADD_PLUGIN(SimulationExperimentView
 
         src/simulationexperimentviewcontentswidget.h
         src/simulationexperimentviewinformationgraphpanelandgraphswidget.h
-        src/simulationexperimentviewinformationgraphpanelpropertyeditor.h
-        src/simulationexperimentviewinformationgraphspropertyeditor.h
         src/simulationexperimentviewinformationparameterswidget.h
         src/simulationexperimentviewinformationsimulationwidget.h
         src/simulationexperimentviewinformationsolverswidget.h

diff --git a/...lationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp b/...lationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp
@@ -29,8 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "sedmlsupport.h"
 #include "simulation.h"
 #include "simulationexperimentviewinformationgraphpanelandgraphswidget.h"
-#include "simulationexperimentviewinformationgraphpanelpropertyeditor.h"
-#include "simulationexperimentviewinformationgraphspropertyeditor.h"
 #include "simulationexperimentviewsimulationwidget.h"
 #include "simulationexperimentviewwidget.h"
 
@@ -182,10 +180,7 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::initialize(Op
     if (!mPropertyEditor) {
         // No property editor exists for the given graph panel, so create one
 
-        if (mMode == GraphPanel)
-            mPropertyEditor = new SimulationExperimentViewInformationGraphPanelPropertyEditor(this);
-        else
-            mPropertyEditor = new SimulationExperimentViewInformationGraphsPropertyEditor(this);
+        mPropertyEditor = new Core::PropertyEditorWidget(false, false, this);
 
         // We want our own context menu for our property editor
 

diff --git a/...ulationExperimentView/src/simulationexperimentviewinformationgraphpanelpropertyeditor.cpp b/...ulationExperimentView/src/simulationexperimentviewinformationgraphpanelpropertyeditor.cpp
diff --git a/...imulationExperimentView/src/simulationexperimentviewinformationgraphpanelpropertyeditor.h b/...imulationExperimentView/src/simulationexperimentviewinformationgraphpanelpropertyeditor.h
diff --git a/.../SimulationExperimentView/src/simulationexperimentviewinformationgraphspropertyeditor.cpp b/.../SimulationExperimentView/src/simulationexperimentviewinformationgraphspropertyeditor.cpp
diff --git a/...on/SimulationExperimentView/src/simulationexperimentviewinformationgraphspropertyeditor.h b/...on/SimulationExperimentView/src/simulationexperimentviewinformationgraphspropertyeditor.h