improved import of original netlist, gui selection for modifier, ini …

…with settings, dynamic import/export with out hard coded paths
emsec · Jun 21, 2024 · 588aa95 · 588aa95
1 parent aab833a
commit 588aa95
Show file tree

Hide file tree

Showing 6 changed files with 288 additions and 181 deletions.
diff --git a/plugins/netlist_modifier/CMakeLists.txt b/plugins/netlist_modifier/CMakeLists.txt
@@ -9,6 +9,7 @@ if(PL_NETLIST_MODIFIER OR BUILD_ALL_PLUGINS)
         SHARED
         HEADER ${NETLIST_MODIFIER_INC}
         SOURCES ${NETLIST_MODIFIER_SRC} ${NETLIST_MODIFIER_PYTHON_SRC}
+        LINK_LIBRARIES PUBLIC gui netlist_simulator_controller
         PYDOC SPHINX_DOC_INDEX_FILE ${CMAKE_CURRENT_SOURCE_DIR}/documentation/netlist_modifier.rst
     )
 endif()
diff --git a/plugins/netlist_modifier/include/netlist_modifier/netlist_modifier.h b/plugins/netlist_modifier/include/netlist_modifier/netlist_modifier.h
@@ -1,41 +1,35 @@
-#pragma  once
-#include  "hal_core/defines.h"
-#include  "hal_core/plugin_system/plugin_interface_base.h"
+#pragma once
+#include "hal_core/defines.h"
+#include "hal_core/netlist/netlist.h"
 #include "hal_core/plugin_system/gui_extension_interface.h"
-#include  "hal_core/utilities/result.h"
-#include  "hal_core/netlist/netlist.h"
+#include "hal_core/plugin_system/plugin_interface_base.h"
+#include "hal_core/utilities/result.h"
 
-namespace  hal
+namespace hal
 {
-	class GuiExtensionNetlistModifier;
-
-	class  PLUGIN_API  NetlistModifierPlugin : public  BasePluginInterface
-	{
-		GuiExtensionNetlistModifier* m_gui_extension;
-
-	public:
-		std::string  get_name() const  override;
-		std::string  get_version() const  override;
-		void  initialize() override;
-
-		void on_load() override;
-        void on_unload() override;
+    class GuiExtensionNetlistModifier;
 
-		std::set<std::string> get_dependencies() const override;
+    class PLUGIN_API NetlistModifierPlugin : public BasePluginInterface
+    {
+        GuiExtensionNetlistModifier* m_gui_extension;
 
-        NetlistModifierPlugin();
+    public:
+        std::string get_name() const override;
+        std::string get_version() const override;
+        void initialize() override;
 
-        bool  create_modified_netlist();
+        void on_load() override;
+        void on_unload() override;
 
-        static Netlist* modified_netlist_pointer;
-    private:
-
-        bool replace_gates();
-	};
+        std::set<std::string> get_dependencies() const override;
 
+        NetlistModifierPlugin();
 
+        bool modify_in_place();
+        bool save();
+    };
 
-	class GuiExtensionNetlistModifier : public GuiExtensionInterface
+    class GuiExtensionNetlistModifier : public GuiExtensionInterface
     {
         std::vector<PluginParameter> m_parameter;
 
@@ -47,6 +41,5 @@ namespace  hal
         std::vector<PluginParameter> get_parameter() const override;
 
         void set_parameter(const std::vector<PluginParameter>& params) override;
-
     };
-} // namespace hal
+}    // namespace hal
diff --git a/plugins/netlist_modifier/python/python_bindings.cpp b/plugins/netlist_modifier/python/python_bindings.cpp
@@ -13,30 +13,28 @@ namespace hal
     // the name in PYBIND11_MODULE/PYBIND11_PLUGIN *MUST* match the filename of the output library (without extension),
     // otherwise you will get "ImportError: dynamic module does not define module export function" when importing the module
 
-	#ifdef PYBIND11_MODULE
-		PYBIND11_MODULE(netlist_modifier, m)
-		{
-			m.doc() = "hal netlist modifier python bindings";
-	#else
-		PYBIND11_PLUGIN(netlist_modifier)
-		{
-			py::module m("netlist_modifier", "hal netlist modifier python bindings");
-	#endif
-	
-	// define all exposed functions
-	py::class_<NetlistModifierPlugin, RawPtrWrapper<NetlistModifierPlugin>, BasePluginInterface>(m, "NetlistModifierPlugin")
+#ifdef PYBIND11_MODULE
+    PYBIND11_MODULE(netlist_modifier, m)
+    {
+        m.doc() = "hal netlist modifier python bindings";
+#else
+    PYBIND11_PLUGIN(netlist_modifier)
+    {
+        py::module m("netlist_modifier", "hal netlist modifier python bindings");
+#endif
+
+        // define all exposed functions
+        py::class_<NetlistModifierPlugin, RawPtrWrapper<NetlistModifierPlugin>, BasePluginInterface>(m, "NetlistModifierPlugin")
             .def_property_readonly("name", &NetlistModifierPlugin::get_name)
             .def("get_name", &NetlistModifierPlugin::get_name)
             .def_property_readonly("version", &NetlistModifierPlugin::get_version)
             .def("get_version", &NetlistModifierPlugin::get_version)
             .def(py::init<>())
-            .def(
-                "create_modified_netlist",
-                &NetlistModifierPlugin::create_modified_netlist
-            );
+            .def("modify_in_place", &NetlistModifierPlugin::modify_in_place)
+            .def("save", &NetlistModifierPlugin::save);
 
-	#ifndef PYBIND11_MODULE
-		return m.ptr();
-	#endif
-	}
-} // namespace hal
+#ifndef PYBIND11_MODULE
+        return m.ptr();
+#endif
+    }
+}    // namespace hal