Refactor to combine RApplication and RMainWindow #174
Conversation
Objective: enhance the euler1d app with more control * The original `Plotter` is renamed to `Controller`. * The code directly operate matplotlib is factored to a new `Plot` class. * A new data class `QuantityLine` is created to hold a pair of an analytical line and a numerical line for a quantity.
* Keep RApplication and RMainWindow inherit from QObject rather than the two derived classes. The composite structure makes QApplication and QMainWindow objects accessislble from Python usin PySide6. * RApplication and RMainWindow should be combined to be a new class RManager. It should be done in the next checkin.
* This is a precursor of turning RMainWindow and RApplication into a single RManager class.
* Python modmesh.view.app is also renamed to modmesh.view.mgr.
yungyuc
added
refactor
There was a problem hiding this comment.
@tychuang1211 Would you have time to take a look tonight or tomorrow? If not I will directly merge.
| @@ -26,12 +26,11 @@ | |||
| * POSSIBILITY OF SUCH DAMAGE. | |||
| */ | |||
|
|
|||
| #include <modmesh/view/RMainWindow.hpp> // Must be the first include. | |||
| #include <modmesh/view/RManager.hpp> // Must be the first include. | |||
There was a problem hiding this comment.
Code in RApplication and RMainWindow is merged here. The diff is messy. It's probably too hard for review.
| @@ -125,6 +125,9 @@ struct qt_type_caster | |||
| } | |||
|
|
|||
| QT_TYPE_CASTER(QWidget, _("QWidget")); | |||
| QT_TYPE_CASTER(QCoreApplication, _("QCoreApplication")); | |||
There was a problem hiding this comment.
Add casters for QApplication and QMainWindow.
| // | ||
| ; | ||
| } | ||
|
|
||
| wrapper_type & wrap_basic_qt() | ||
| wrapper_type & wrap_widget() |
There was a problem hiding this comment.
Organize wrapping functions in member functions.
| }) | ||
| // | ||
| ; | ||
|
|
||
| return *this; | ||
| } | ||
|
|
||
| }; /* end class WrapRMainWindow */ | ||
| wrapper_type & wrap_app() |
There was a problem hiding this comment.
This is for the "app" sub-system.
|
|
||
| WrapRApplication(pybind11::module & mod, char const * pyname, char const * pydoc) | ||
| : root_base_type(mod, pyname, pydoc) | ||
| wrapper_type & wrap_mainWindow() |
There was a problem hiding this comment.
This is to make it work like QMainWindow
| self.num.figure.canvas.draw() | ||
|
|
||
|
|
||
| class Plot: |
There was a problem hiding this comment.
Plot holds the major logic for plotting.
| ndata=shocktube.svr.velocity[::2]) | ||
|
|
||
|
|
||
| class Controller: |
There was a problem hiding this comment.
Controller holds the major logic for the calculation.
| view.mgr.pycon.writeToHistory('\n') | ||
|
|
||
|
|
||
| def run(interval=10, max_steps=50, **kw): |
There was a problem hiding this comment.
run() function is kept to work as a simple driver.
| @@ -38,13 +38,13 @@ | |||
| class ViewTC(unittest.TestCase): | |||
|
|
|||
| def test_import(self): | |||
| self.assertTrue(hasattr(modmesh.view, "app")) | |||
| self.assertTrue(hasattr(modmesh.view, "mgr")) | |||
There was a problem hiding this comment.
Rename app to mgr. This is less confusing a name!
By combining
RApplicationandRMainWindowintoRManager,QApplicationandQMainWindowcan be exposed without being inherited and accessed using PySide6 in Python. It will further help development.modmesh.view.appis renamed tomodmesh.view.mgr. It avoids the confusing API between the manager object and themodmesh.appplugin-ish sub-system.The 1D Euler app is enhanced to allow to be created without starting the animation automatically. Stepping in the plotting is also possible.