Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/parameter: Add parameter dialog #246

Merged
merged 8 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cpp/modmesh/view/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set(MODMESH_VIEW_PYMODHEADERS
${CMAKE_CURRENT_SOURCE_DIR}/R3DWidget.hpp
${CMAKE_CURRENT_SOURCE_DIR}/RWorld.hpp
${CMAKE_CURRENT_SOURCE_DIR}/RManager.hpp
${CMAKE_CURRENT_SOURCE_DIR}/RParameter.hpp
${CMAKE_CURRENT_SOURCE_DIR}/RAxisMark.hpp
${CMAKE_CURRENT_SOURCE_DIR}/RPythonConsoleDockWidget.hpp
${CMAKE_CURRENT_SOURCE_DIR}/RStaticMesh.hpp
Expand All @@ -20,6 +21,7 @@ set(MODMESH_VIEW_PYMODSOURCES
${CMAKE_CURRENT_SOURCE_DIR}/R3DWidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/RWorld.cpp
${CMAKE_CURRENT_SOURCE_DIR}/RManager.cpp
${CMAKE_CURRENT_SOURCE_DIR}/RParameter.cpp
${CMAKE_CURRENT_SOURCE_DIR}/RAxisMark.cpp
${CMAKE_CURRENT_SOURCE_DIR}/RPythonConsoleDockWidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/RStaticMesh.cpp
Expand Down
19 changes: 19 additions & 0 deletions cpp/modmesh/view/RManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#include <vector>

#include <modmesh/view/RAction.hpp>
#include <modmesh/view/RParameter.hpp>
#include <Qt>
#include <QMenuBar>
#include <QMenu>
Expand Down Expand Up @@ -211,6 +212,24 @@ void RManager::setUpMenu()
this->addApplication(QString("linear_wave"));
this->addApplication(QString("bad_euler1d"));
}

{
QAction * params = new RAction(
QString("Parameters"),
QString("Runtime parameters"),
[]()
{
static int64_t int64V = 5566;
static double doubleV = 77.88;
auto params = createParameters();
addParam(params, "global.a.b.int64_foo", &int64V);
addParam(params, "global.a.b.double_bar", &doubleV);
openParameterView(params);
}
);
m_mainWindow->menuBar()->addAction(params);

}
}

void RManager::clearApplications()
Expand Down
47 changes: 47 additions & 0 deletions cpp/modmesh/view/RParameter.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
* Copyright (c) 2023, Buganini Chiu <[email protected]>
*
* 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/view/RParameter.hpp> // Must be the first include.

namespace modmesh
{
pybind11::tuple createParameters(void) {
pybind11::module pui_module = pybind11::module::import("PUI");
return pybind11::make_tuple(
pui_module.attr("StateDict")(), pybind11::list()
);
}

void openParameterView(pybind11::tuple & params) {
pybind11::module params_module = pybind11::module::import("modmesh.params");
params_module.attr("openParameterView")(params[1]);
}

} /* end namespace modmesh */

// vim: set ff=unix fenc=utf8 et sw=4 ts=4 sts=4:
57 changes: 57 additions & 0 deletions cpp/modmesh/view/RParameter.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
#pragma once

/*
* Copyright (c) 2023, Buganini Chiu <[email protected]>
*
* 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/view/common_detail.hpp> // Must be the first include.

namespace modmesh
{

pybind11::tuple createParameters(void);
void openParameterView(pybind11::tuple & params);

template <typename T>
void addParam(pybind11::tuple & params, const char *key, T *ptr) {
params[0][pybind11::str(key)] = *ptr;
auto binding = params[0](key);
binding.attr("bind")(
pybind11::cpp_function([ptr](){
return *ptr;
}),
pybind11::cpp_function([key, ptr](T value){
std::cout << "Set " << key << " = " << value << std::endl;
*ptr = value;
})
);
static_cast<pybind11::list>(params[1]).append(binding);
}

} /* end namespace modmesh */

// vim: set ff=unix fenc=utf8 et sw=4 ts=4 sts=4:
63 changes: 63 additions & 0 deletions modmesh/params.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
from PUI.PySide6 import *
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add license text.


class ParameterView(PuiInQt):
class TableAdapter:
def __init__(self, state, data):
self.state = state
self._data = data

def data(self, row, col):
param = self._data[row]
return [param.key, param.value][col]

def setData(self, row, col, value):
if col==1:
self._data[row].value = value

def editable(self, row, col):
return col > 0

def columnHeader(self, col):
return ["Key","Value"][col]

def rowCount(self):
return len(self._data)

def columnCount(self):
return 2

def __init__(self, container, state):
super().__init__(container)
self.state = state

def content(self):
data = State()
if not self.state.filter:
data.params = self.state.params
else:
data.params = [it for it in self.state.params if self.state.filter in it.key]
with VBox():
TextField(self.state("filter"))
Table(self.TableAdapter(self.state, data.params))

def openParameterView(params):
state = State()
state.buffer = [f"line {i}" for i in range(50)]
state.cmd_edit = ""
state.config_modal = False
state.filter = ""
state.params = params
pv = ParameterView(Window(size=(640, 480)), state)
pv.redraw()

if __name__=="__main__":
class Example():
def __init__(self):
self.app = QtWidgets.QApplication([])

def run(self):
openParameterView()
self.app.exec()

root = Example()
root.run()
Loading