got rid of .ui and installed toolbar and wheel

opencor · Aug 4, 2020 · e3a87cc · e3a87cc
1 parent b163409
commit e3a87cc
Show file tree

Hide file tree

Showing 8 changed files with 87 additions and 137 deletions.
diff --git a/src/plugins/editing/MappingView/CMakeLists.txt b/src/plugins/editing/MappingView/CMakeLists.txt
@@ -15,10 +15,9 @@ add_plugin(MappingView
         src/mappingviewplugin.cpp
         src/mappingviewwidget.cpp
         src/mappingviewzincwidget.cpp
-    UIS
-        src/mappingviewwidget.ui
     PLUGINS
         Core
         CellMLSupport
         ZincWidget
+        Qwt
 )
diff --git a/src/plugins/editing/MappingView/i18n/MappingView_fr.ts b/src/plugins/editing/MappingView/i18n/MappingView_fr.ts
@@ -1,17 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="fr_FR" sourcelanguage="en_GB">
-<context>
-    <name>MappingViewWidget</name>
-    <message>
-        <source>Node:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Variable:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>OpenCOR::MappingView::MappingViewPlugin</name>
     <message>

diff --git a/src/plugins/editing/MappingView/src/mappingvieweditingwidget.cpp b/src/plugins/editing/MappingView/src/mappingvieweditingwidget.cpp
@@ -29,10 +29,6 @@ along with this program. If not, see <https://gnu.org/licenses>.
 
 //==============================================================================
 
-#include "ui_mappingviewwidget.h"
-
-//==============================================================================
-
 #include <QFile>
 #include <QtGui>
 

diff --git a/src/plugins/editing/MappingView/src/mappingviewwidget.cpp b/src/plugins/editing/MappingView/src/mappingviewwidget.cpp
@@ -28,12 +28,9 @@ along with this program. If not, see <https://gnu.org/licenses>.
 
 //==============================================================================
 
-#include "ui_mappingviewwidget.h"
-
-//==============================================================================
-
-#include <QtGui>
 #include <QMenu>
+#include <QApplication>
+#include <QScreen>
 
 //==============================================================================
 
@@ -52,14 +49,52 @@ namespace MappingView {
 //==============================================================================
 
 MappingViewWidget::MappingViewWidget(QWidget *pParent) :
-    Core::SplitterWidget(pParent),
-    mAxesFontPointSize(0),
-    mGui(new Ui::MappingViewWidget)
+    Core::SplitterWidget(pParent)
 {
 
-    // Set up the GUI
+    // Set our orientation
+
+    setOrientation(Qt::Vertical);
+
+    //create and add toolbar
+
+    mToolBarWidget = new Core::ToolBarWidget();
+
+        QRect availableGeometry = qApp->primaryScreen()->availableGeometry();
+
+        mDelayWidget = new QwtWheel(mToolBarWidget);
+
+        mDelayWidget->setBorderWidth(0);
+        mDelayWidget->setFixedSize(int(0.07*availableGeometry.width()),
+                                   mDelayWidget->height()/2);
+        mDelayWidget->setFocusPolicy(Qt::NoFocus);
+        mDelayWidget->setRange(0.0, 100.0);
+        mDelayWidget->setWheelBorderWidth(0);
+
+        mDelayWidget->setValue(MappingViewZincWidget::nodeSizeOrigin);
+
+    mToolBarWidget->addWidget(mDelayWidget);
+
+    addWidget(mToolBarWidget);
+
+    //create and add informative labels
+
+    QLabel *nodeLabel = new QLabel("Node:",this);
+    addWidget(nodeLabel);
+
+    mNodeValue = new QLabel(this);
+    addWidget(mNodeValue);
 
-    mGui->setupUi(this);
+    QLabel *variableLabel = new QLabel("Variable:",this);
+    addWidget(variableLabel);
+
+    mVariableValue = new QLabel(this);
+    addWidget(mVariableValue);
+
+    //create and add the variable tree:
+
+    mVariableTree = new QTreeView(this);
+    addWidget(mVariableTree);
 
     // Keep track of our movement
     /*
@@ -72,23 +107,19 @@ MappingViewWidget::MappingViewWidget(QWidget *pParent) :
     //TODO
     mMeshFileName = "/home/tuareg/Documents/OpenCOR/opencor/meshes/circulation.exnode";
 
-    // Create and add a Zinc widget
+    // add a Zinc widget
 
     mMappingViewZincWidget = new MappingViewZincWidget(this, mMeshFileName);
 
-    //TODO move to mappingviewzincwidget and you know how it works
-    connect(mMappingViewZincWidget, &MappingViewZincWidget::devicePixelRatioChanged,
-            this, &MappingViewWidget::devicePixelRatioChanged);
-
     connect(mMappingViewZincWidget, &MappingViewZincWidget::nodeSelection,
             this, &MappingViewWidget::nodeSelection);
+    connect(mDelayWidget, &QwtWheel::valueChanged,
+            mMappingViewZincWidget, &MappingViewZincWidget::setNodeSizes );
 
-    mGui->layout->addWidget(mMappingViewZincWidget);
+    addWidget(mMappingViewZincWidget);
 
     //mToolBarWidget = new Core::ToolBarWidget();
 
-
-
 }
 
 //==============================================================================
@@ -120,14 +151,14 @@ void MappingViewWidget::initialize(const QString &pFileName)
     if (mEditingWidget == nullptr) {
         // No editing widget exists for the given file, so create one
 
-        mEditingWidget = new MappingViewEditingWidget(pFileName, "../opencor/meshes/circulation.exnode",this);
+        mEditingWidget = new MappingViewEditingWidget(pFileName, mMeshFileName,this);
 
         mEditingWidgets.insert(pFileName, mEditingWidget);
     }
 
     //mListWidgetVariables->setModel(mEditingWidget->listViewModelVariables()); //TODO set only when charging the plugin ?
     //mGui->outputList->setModel(mEditingWidget->listViewModelOutput());
-    mGui->variableTree->setModel(mEditingWidget->getTreeViewModel());
+    mVariableTree->setModel(mEditingWidget->getTreeViewModel());
 }
 
 //==============================================================================
@@ -203,30 +234,14 @@ void MappingViewWidget::fileRenamed(const QString &pOldFileName, const QString &
 
 //==============================================================================
 
-void MappingViewWidget::devicePixelRatioChanged(const int &pDevicePixelRatio)
-{
-    Q_UNUSED(pDevicePixelRatio);
-    //TODO to confirm
-    // Update our scene using the given devide pixel ratio
-    /*
-    OpenCMISS::Zinc::Scene scene = mZincContext->getDefaultRegion().getScene();
-
-    scene.beginChange();
-        scene.createGraphicsPoints().getGraphicspointattributes().getFont().setPointSize(pDevicePixelRatio*mAxesFontPointSize);
-    scene.endChange();
-    */
-}
-
-//==============================================================================
-
 void MappingViewWidget::nodeSelection(int pId) {
 
     if (pId==-1) {
-        mGui->nodeValue->setText("");
-        mGui->variableValue->setText("");
+        mNodeValue->setText("");
+        mVariableValue->setText("");
     } else {
-        mGui->nodeValue->setNum(pId);
-        mGui->variableValue->setText(mEditingWidget->getVariableOfNode(pId));
+        mNodeValue->setNum(pId);
+        mVariableValue->setText(mEditingWidget->getVariableOfNode(pId));
     }
 }
 

diff --git a/src/plugins/editing/MappingView/src/mappingviewwidget.h b/src/plugins/editing/MappingView/src/mappingviewwidget.h
@@ -36,12 +36,14 @@ along with this program. If not, see <https://gnu.org/licenses>.
 #include <QTableView>
 #include <QMap>
 #include <QListWidget>
+#include <QLabel>
+#include <QTreeView>
 
 //==============================================================================
 
-namespace Ui {
-    class MappingViewWidget;
-} // namespace Ui
+#include "qwtbegin.h"
+    #include "qwt_wheel.h"
+#include "qwtend.h"
 
 //==============================================================================
 
@@ -85,14 +87,16 @@ class MappingViewWidget : public Core::SplitterWidget
 
     bool saveFile(const QString &pOldFileName, const QString &pNewFileName);
 
-    int mAxesFontPointSize;
-
 private:
-    Ui::MappingViewWidget *mGui;
+
+    QwtWheel *mDelayWidget;
 
     Core::ToolBarWidget *mToolBarWidget;
 
     MappingViewZincWidget *mMappingViewZincWidget;
+    QLabel *mNodeValue;
+    QLabel *mVariableValue;
+    QTreeView *mVariableTree;
 
     QListWidget *mListWidgetVariables;
     QListWidget *mListWidgetOutput;
@@ -103,10 +107,8 @@ class MappingViewWidget : public Core::SplitterWidget
     QString mMeshFileName;
 
 private slots:
-    void devicePixelRatioChanged(const int &pDevicePixelRatio);
     void nodeSelection(int pId);
 
-
 };
 
 //==============================================================================

diff --git a/src/plugins/editing/MappingView/src/mappingviewwidget.ui b/src/plugins/editing/MappingView/src/mappingviewwidget.ui
diff --git a/src/plugins/editing/MappingView/src/mappingviewzincwidget.cpp b/src/plugins/editing/MappingView/src/mappingviewzincwidget.cpp
@@ -57,7 +57,8 @@ namespace MappingView {
 MappingViewZincWidget::MappingViewZincWidget(QWidget *pParent, const QString &pMainFileName) :
     ZincWidget::ZincWidget(pParent),
     mMainFileName(pMainFileName),
-    mAuxFileName(pMainFileName)
+    mAuxFileName(pMainFileName),
+    mNodeSize(nodeSizeOrigin)
 {
     // Keep track of our current scene viewer's description
     //TODO usefull ?
@@ -162,8 +163,6 @@ void MappingViewZincWidget::initializeGL()
 
         // Size of our green spheres
 
-        mNodeSize = 20.;
-
         OpenCMISS::Zinc::Graphicspointattributes pointAttr = nodePoints.getGraphicspointattributes();
 
         pointAttr.setBaseSize(1, &mNodeSize);
@@ -188,7 +187,7 @@ void MappingViewZincWidget::mouseMoveEvent(QMouseEvent *pEvent)
 void MappingViewZincWidget::mousePressEvent(QMouseEvent *pEvent)
 {
     ZincWidget::mousePressEvent(pEvent);
-    mouse_pos_click = pEvent->pos();
+    mMousePosClick = pEvent->pos();
 }
 
 //==============================================================================
@@ -197,7 +196,7 @@ void MappingViewZincWidget::mouseReleaseEvent(QMouseEvent *pEvent)
 {
     ZincWidget::mouseReleaseEvent(pEvent);
 
-    if (mouse_pos_click==pEvent->pos()) {
+    if (mMousePosClick==pEvent->pos()) {
         click(pEvent);
     }
 }
@@ -214,10 +213,10 @@ void MappingViewZincWidget::wheelEvent(QWheelEvent *pEvent)
 void MappingViewZincWidget::click(QMouseEvent *pEvent)
 {
     mScenePicker->setSceneviewerRectangle(mSceneViewer, OpenCMISS::Zinc::SCENECOORDINATESYSTEM_WINDOW_PIXEL_TOP_LEFT,
-                                          pEvent->x() - size_selection,
-                                          pEvent->y() - size_selection,
-                                          pEvent->x() + size_selection,
-                                          pEvent->y() + size_selection);
+                                          pEvent->x() - mSizeSelection,
+                                          pEvent->y() - mSizeSelection,
+                                          pEvent->x() + mSizeSelection,
+                                          pEvent->y() + mSizeSelection);
     OpenCMISS::Zinc::Node node = mScenePicker->getNearestNode();
 
     int id = node.getIdentifier();
@@ -258,6 +257,12 @@ void MappingViewZincWidget::click(QMouseEvent *pEvent)
 
 //==============================================================================
 
+void MappingViewZincWidget::setNodeSizes(int pSize) {
+     mNodeSize = pSize;
+    //TODO
+    initializeGL();
+}
+
 } // namespace ZincWidget
 } // namespace OpenCOR