Merge pull request #54 from solvcon/project/ustmesh

yungyuc · web-flow · commit d95d641b9060 · 2022-04-04T21:11:37.000+08:00
Merge from project/ustmesh
diff --git a/src/viewer/CMakeLists.txt b/src/viewer/CMakeLists.txt
@@ -15,6 +15,7 @@ if(NOT DEFINED INSTALL_VIEWERDIR)
 endif()
 
 find_package(Qt6 COMPONENTS Core)
+find_package(Qt6 COMPONENTS Widgets)
 find_package(Qt6 COMPONENTS Gui)
 find_package(Qt6 COMPONENTS 3DCore)
 find_package(Qt6 COMPONENTS 3DRender)
@@ -23,6 +24,7 @@ find_package(Qt6 COMPONENTS 3DExtras)
 
 qt_add_executable(
     viewer
+    modmesh/viewer/RPythonText.cpp
     main.cpp
 )
 
@@ -39,6 +41,8 @@ set_target_properties(
 
 target_link_libraries(
     viewer PUBLIC
+    pybind11::embed
+    Qt::Widgets
     Qt::3DCore
     Qt::3DExtras
     Qt::3DInput
diff --git a/src/viewer/main.cpp b/src/viewer/main.cpp
@@ -26,12 +26,15 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <modmesh/python/python.hpp> // Must be the first include.
 #include <modmesh/modmesh.hpp>
 #include <modmesh/viewer/viewer.hpp>
+#include <modmesh/viewer/RPythonText.hpp>
 
-#include <QGuiApplication>
+#include <pybind11/embed.h>
 
-#include <qt3dwindow.h>
+#include <QApplication>
+#include <QMainWindow>
 
 std::shared_ptr<modmesh::StaticMesh2d> make_3triangles()
 {
@@ -71,47 +74,61 @@ std::shared_ptr<modmesh::StaticMesh2d> make_3triangles()
 int main(int argc, char ** argv)
 {
     /*
-     * TODO: Sequence of application startup:
-     *   1. Parsing arguments and parameters.
+     * Sequence of application startup:
+     *   1. (Todo) Parsing arguments and parameters.
      *   2. Initialize application globals.
      *   3. Initialize GUI globals.
      *   4. Set up GUI windowing.
      */
 
     using namespace modmesh;
+    namespace py = pybind11;
 
-    // Start application with GUI.
-    QGuiApplication app(argc, argv);
+    // Start the interpreter.
+    py::scoped_interpreter interpreter_guard{};
 
-    // Create and set up main window.
-    Qt3DExtras::Qt3DWindow window;
+    // Instantiate the application object.
+    QApplication app(argc, argv);
+    QMainWindow main_window;
 
+    // Load the Python extension module.
+    std::cerr << "Loading modmesh._modmesh ... ";
+    bool load_failure = false;
+    try
     {
-        // Set up the camera.
-        Qt3DRender::QCamera * camera = window.camera();
-        camera->lens()->setPerspectiveProjection(45.0f, 16.0f / 9.0f, 0.1f, 1000.0f);
-        camera->setPosition(QVector3D(0, 0, 40.0f));
-        camera->setViewCenter(QVector3D(0, 0, 0));
+        py::module_::import("modmesh._modmesh");
     }
-
-    // Create and set up the root scene.
-    RScene scene;
-
+    catch (const py::error_already_set & e)
+    {
+        if (std::string::npos == std::string(e.what()).find("ModuleNotFoundError"))
+        {
+            throw;
+        }
+        else
+        {
+            std::cerr << "fails" << std::endl;
+            load_failure = true;
+        }
+    }
+    if (!load_failure)
     {
-        // Set up the camera control.
-        auto * control = scene.camera_controller();
-        control->setCamera(window.camera());
-        control->setLinearSpeed(50.0f);
-        control->setLookSpeed(180.0f);
-
-        // Set the mesh to the scene.
-        RStaticMesh<2> rmh(make_3triangles());
-        rmh->setParent(scene.ptr());
+        std::cerr << "succeeds" << std::endl;
     }
 
-    // Show the window.
-    window.setRootEntity(scene.ptr());
-    window.show();
+    // Create and set up main 3D view.
+    auto * vwidget = new R3DWidget();
+    new RStaticMesh<2>(make_3triangles(), vwidget->scene());
+
+    auto * pydock = new RPythonText(QString("Python"), &main_window);
+    pydock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
+    main_window.addDockWidget(Qt::RightDockWidgetArea, pydock);
+
+    // Set up window.
+    main_window.setCentralWidget(vwidget);
+    main_window.resize(800, 400);
+    vwidget->resize(400, 400);
+    main_window.show();
 
+    // Run the application.
     return app.exec();
 }
diff --git a/src/viewer/modmesh/viewer/RPythonText.cpp b/src/viewer/modmesh/viewer/RPythonText.cpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2022, Yung-Yu Chen <yyc@solvcon.net>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * - Neither the name of the copyright holder nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "RPythonText.hpp"
+
+namespace modmesh
+{
+
+RPythonText::RPythonText(
+    QString const & title,
+    QWidget * parent,
+    Qt::WindowFlags flags)
+    : QDockWidget(title, parent, flags)
+{
+    setUp();
+}
+
+void RPythonText::setUp()
+{
+    m_text = new QTextEdit();
+    m_text->setFont(QFont("Courier New"));
+    m_run = new QPushButton(QString("run"));
+
+    m_layout = new QVBoxLayout();
+    m_layout->addWidget(m_text);
+    m_layout->addWidget(m_run);
+    m_widget = new QWidget();
+    m_widget->setLayout(m_layout);
+
+    setWidget(m_widget);
+
+    connect(m_run, &QPushButton::clicked, this, &RPythonText::runPythonCode);
+}
+
+void RPythonText::runPythonCode()
+{
+    namespace py = pybind11;
+
+    std::string code = m_text->toPlainText().toStdString();
+    try
+    {
+        py::exec(code);
+    }
+    catch (const py::error_already_set & e)
+    {
+        std::cerr << e.what() << std::endl;
+    }
+}
+
+} /* end namespace modmesh */
+
+// vim: set ff=unix fenc=utf8 et sw=4 ts=4 sts=4:
diff --git a/src/viewer/modmesh/viewer/RPythonText.hpp b/src/viewer/modmesh/viewer/RPythonText.hpp
@@ -0,0 +1,70 @@
+#pragma once
+
+/*
+ * Copyright (c) 2022, Yung-Yu Chen <yyc@solvcon.net>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * - Neither the name of the copyright holder nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <modmesh/python/python.hpp> // Must be the first include.
+#include <pybind11/embed.h>
+
+#include <Qt>
+#include <QDockWidget>
+
+#include <QTextEdit>
+#include <QPushButton>
+#include <QVBoxLayout>
+
+namespace modmesh
+{
+
+class RPythonText
+    : public QDockWidget
+{
+
+public:
+
+    RPythonText(
+        QString const & title = "Python",
+        QWidget * parent = nullptr,
+        Qt::WindowFlags flags = Qt::WindowFlags());
+
+private:
+
+    void setUp();
+
+    void runPythonCode();
+
+    QTextEdit * m_text;
+    QPushButton * m_run;
+    QVBoxLayout * m_layout;
+    QWidget * m_widget;
+
+}; /* end class RPythonText */
+
+} /* end namespace modmesh */
+
+// vim: set ff=unix fenc=utf8 et sw=4 ts=4 sts=4:
diff --git a/src/viewer/modmesh/viewer/viewer.hpp b/src/viewer/modmesh/viewer/viewer.hpp
