luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-09-06 17:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP: refactoring ongoing.

Browse Source
This commit is contained in:
Matthias Koefferlein
2020-02-07 01:27:24 +01:00
parent fa1b98c933
commit 68472e6e14
47 changed files with 179 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/streamers/lefdef/lay_plugin/layLEFDEFImport.cc
+3 -3
View File
@@ -69,8 +69,8 @@ public:
virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
{
lay::PluginDeclaration::get_menu_entries (menu_entries);
menu_entries.push_back (lay::MenuEntry ("db::import_lef", "import_lef:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("LEF"))));
menu_entries.push_back (lay::MenuEntry ("db::import_def", "import_def:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("DEF/LEF"))));
menu_entries.push_back (lay::menu_item ("db::import_lef", "import_lef:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("LEF"))));
menu_entries.push_back (lay::menu_item ("db::import_def", "import_def:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("DEF/LEF"))));
}
virtual bool configure (const std::string &name, const std::string &value)
@@ -115,7 +115,7 @@ public:
lay::MainWindow::instance ()->cancel ();
// store configuration
lay::PluginRoot *config_root = lay::PluginRoot::instance ();
lay::Dispatcher *config_root = lay::Dispatcher::instance ();
if (import_lef) {
config_root->config_set (cfg_lef_import_spec, data.to_string ());
} else {
src/plugins/streamers/pcb/lay_plugin/layGerberImport.cc
+6 -6
View File
@@ -63,11 +63,11 @@ public:
virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
{
lay::PluginDeclaration::get_menu_entries (menu_entries);
menu_entries.push_back (lay::MenuEntry ("db::import_gerber", "import_gerber_menu:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("Gerber PCB")), true));
menu_entries.push_back (lay::MenuEntry ("db::import_gerber_new", "import_gerber_new:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("New Project"))));
menu_entries.push_back (lay::MenuEntry ("db::import_gerber_new_free", "import_gerber_new_free:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("New Project - Free Layer Mapping"))));
menu_entries.push_back (lay::MenuEntry ("db::import_gerber_open", "import_gerber_open:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("Open Project"))));
menu_entries.push_back (lay::MenuEntry ("db::import_gerber_recent", "import_gerber_recent:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("Recent Project"))));
menu_entries.push_back (lay::submenu ("db::import_gerber", "import_gerber_menu:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("Gerber PCB"))));
menu_entries.push_back (lay::menu_item ("db::import_gerber_new", "import_gerber_new:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("New Project"))));
menu_entries.push_back (lay::menu_item ("db::import_gerber_new_free", "import_gerber_new_free:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("New Project - Free Layer Mapping"))));
menu_entries.push_back (lay::menu_item ("db::import_gerber_open", "import_gerber_open:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("Open Project"))));
menu_entries.push_back (lay::menu_item ("db::import_gerber_recent", "import_gerber_recent:edit", "file_menu.import_menu.import_gerber_menu.end", tl::to_string (QObject::tr ("Recent Project"))));
}
virtual bool configure (const std::string &name, const std::string &value)
@@ -125,7 +125,7 @@ public:
}
lay::PluginRoot *config_root = lay::PluginRoot::instance ();
lay::Dispatcher *config_root = lay::Dispatcher::instance ();
GerberImportDialog dialog (QApplication::activeWindow (), &data);
db::GerberImporter importer;
src/plugins/tools/bool/lay_plugin/layBooleanOperationsPlugin.cc
+5 -5
View File
@@ -478,10 +478,10 @@ public:
virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
{
lay::PluginDeclaration::get_menu_entries (menu_entries);
menu_entries.push_back (lay::MenuEntry ("ops_group", "edit_menu.layer_menu.end"));
menu_entries.push_back (lay::MenuEntry ("lay::boolean", "boolean:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Boolean Operations"))));
menu_entries.push_back (lay::MenuEntry ("lay::merge", "merge:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Merge"))));
menu_entries.push_back (lay::MenuEntry ("lay::size", "size:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Size"))));
menu_entries.push_back (lay::separator ("ops_group", "edit_menu.layer_menu.end"));
menu_entries.push_back (lay::menu_item ("lay::boolean", "boolean:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Boolean Operations"))));
menu_entries.push_back (lay::menu_item ("lay::merge", "merge:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Merge"))));
menu_entries.push_back (lay::menu_item ("lay::size", "size:edit:edit_mode", "edit_menu.layer_menu.end", tl::to_string (QObject::tr ("Size"))));
}
virtual bool configure (const std::string & /*name*/, const std::string & /*value*/)
@@ -494,7 +494,7 @@ public:
// .. nothing yet ..
}
lay::Plugin *create_plugin (db::Manager *, lay::PluginRoot *root, lay::LayoutView *view) const
lay::Plugin *create_plugin (db::Manager *, lay::Dispatcher *root, lay::LayoutView *view) const
{
return new BooleanOperationsPlugin (root, view);
}
src/plugins/tools/diff/lay_plugin/layDiffPlugin.cc
+3 -5
View File
@@ -20,10 +20,8 @@
*/
#include "layDiffToolDialog.h"
#include "layDispatcher.h"
#include "layPlugin.h"
@@ -91,7 +89,7 @@ public:
virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
{
lay::PluginDeclaration::get_menu_entries (menu_entries);
menu_entries.push_back (lay::MenuEntry ("lay::diff_tool", "diff_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("Diff Tool"))));
menu_entries.push_back (lay::menu_item ("lay::diff_tool", "diff_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("Diff Tool"))));
}
virtual bool configure (const std::string & /*name*/, const std::string & /*value*/)
@@ -104,7 +102,7 @@ public:
// .. nothing yet ..
}
lay::Plugin *create_plugin (db::Manager *, lay::PluginRoot *root, lay::LayoutView *view) const
lay::Plugin *create_plugin (db::Manager *, lay::Dispatcher *root, lay::LayoutView *view) const
{
return new DiffPlugin (root, view);
}
src/plugins/tools/diff/lay_plugin/layDiffToolDialog.cc
+2 -2
View File
@@ -625,7 +625,7 @@ DiffToolDialog::exec_dialog (lay::LayoutView *view)
mp_ui->layoutb->set_layout_view (view);
}
lay::PluginRoot *config_root = lay::PluginRoot::instance ();
lay::Dispatcher *config_root = lay::Dispatcher::instance ();
bool f = false;
if (config_root->config_get (cfg_diff_run_xor, f)) {
@@ -674,7 +674,7 @@ BEGIN_PROTECTED
throw tl::Exception (tl::to_string (QObject::tr ("Trying to perform an Diff between identical layouts")));
}
lay::PluginRoot *config_root = lay::PluginRoot::instance ();
lay::Dispatcher *config_root = lay::Dispatcher::instance ();
config_root->config_set (cfg_diff_run_xor, mp_ui->xor_cbx->isChecked ());
config_root->config_set (cfg_diff_detailed, mp_ui->detailed_cbx->isChecked ());
src/plugins/tools/import/lay_plugin/layStreamImport.cc
+2 -2
View File
@@ -61,7 +61,7 @@ public:
virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
{
lay::PluginDeclaration::get_menu_entries (menu_entries);
menu_entries.push_back (lay::MenuEntry ("lay::import_stream", "import_stream:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("Other Files Into Current"))));
menu_entries.push_back (lay::menu_item ("lay::import_stream", "import_stream:edit", "file_menu.import_menu.end", tl::to_string (QObject::tr ("Other Files Into Current"))));
}
virtual bool configure (const std::string &name, const std::string &value)
@@ -95,7 +95,7 @@ public:
data = StreamImportData ();
}
lay::PluginRoot *config_root = lay::PluginRoot::instance ();
lay::Dispatcher *config_root = lay::Dispatcher::instance ();
StreamImportDialog dialog (QApplication::activeWindow (), &data);
lay::StreamImporter importer;
src/plugins/tools/import/lay_plugin/layStreamImportDialog.h
+1 -1
View File
@@ -56,7 +56,7 @@ namespace tl
namespace lay
{
class PluginRoot;
class Dispatcher;
}
namespace lay
src/plugins/tools/net_tracer/lay_plugin/layNetTracerConfig.cc
+3 -2
View File
@@ -23,6 +23,7 @@
#include "layNetTracerConfig.h"
#include "layConverters.h"
#include "layDispatcher.h"
#include <QColorDialog>
#include <QPainter>
@@ -128,7 +129,7 @@ NetTracerConfigPage::color_button_clicked ()
}
void
NetTracerConfigPage::setup (lay::PluginRoot *root)
NetTracerConfigPage::setup (lay::Dispatcher *root)
{
// window mode
lay::nt_window_type wmode = lay::NTFitNet;
@@ -237,7 +238,7 @@ NetTracerConfigPage::window_changed (int m)
}
void
NetTracerConfigPage::commit (lay::PluginRoot *root)
NetTracerConfigPage::commit (lay::Dispatcher *root)
{
double dim = 1.0;
tl::from_string (tl::to_string (le_window->text ()), dim);
src/plugins/tools/net_tracer/lay_plugin/layNetTracerConfig.h
+2 -2
View File
@@ -63,8 +63,8 @@ class NetTracerConfigPage
public:
NetTracerConfigPage (QWidget *parent);
virtual void setup (lay::PluginRoot *root);
virtual void commit (lay::PluginRoot *root);
virtual void setup (lay::Dispatcher *root);
virtual void commit (lay::Dispatcher *root);
public slots:
void window_changed (int);
src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.cc
+1 -1
View File
@@ -53,7 +53,7 @@ namespace lay
// -----------------------------------------------------------------------------------
// NetTracerDialog implementation
NetTracerDialog::NetTracerDialog (lay::PluginRoot *root, lay::LayoutView *view)
NetTracerDialog::NetTracerDialog (lay::Dispatcher *root, lay::LayoutView *view)
: lay::Browser (root, view, "net_tracer_dialog"),
lay::ViewService (view->view_object_widget ()),
m_cv_index (0),
src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.h
+1 -1
View File
@@ -57,7 +57,7 @@ class NetTracerDialog
Q_OBJECT
public:
NetTracerDialog (lay::PluginRoot *root, lay::LayoutView *view);
NetTracerDialog (lay::Dispatcher *root, lay::LayoutView *view);
virtual ~NetTracerDialog ();
virtual bool mouse_move_event (const db::DPoint &p, unsigned int buttons, bool prio);
src/plugins/tools/net_tracer/lay_plugin/layNetTracerPlugin.cc
+7 -7
View File
@@ -67,15 +67,15 @@ public:
{
// TODO: where should that go?
lay::PluginDeclaration::get_menu_entries (menu_entries);
menu_entries.push_back (lay::MenuEntry ("net_trace_group", "tools_menu.end"));
menu_entries.push_back (lay::MenuEntry ("lay::net_trace", "net_trace", "tools_menu.end", tl::to_string (QObject::tr ("Trace Net"))));
menu_entries.push_back (lay::MenuEntry ("", "trace_all_nets_menu", "tools_menu.end", tl::to_string (QObject::tr ("Trace All Nets")), true));
menu_entries.push_back (lay::MenuEntry ("lay::trace_all_nets", "trace_all_nets", "tools_menu.trace_all_nets_menu.end", tl::to_string (QObject::tr ("Hierarchical"))));
menu_entries.push_back (lay::MenuEntry ("lay::trace_all_nets_flat", "trace_all_nets_flat", "tools_menu.trace_all_nets_menu.end", tl::to_string (QObject::tr ("Flat"))));
menu_entries.push_back (lay::MenuEntry ("lay::edit_layer_stack", "edit_layer_stack", "tools_menu.end", tl::to_string (QObject::tr ("Edit Layer Stack"))));
menu_entries.push_back (lay::separator ("net_trace_group", "tools_menu.end"));
menu_entries.push_back (lay::menu_item ("lay::net_trace", "net_trace", "tools_menu.end", tl::to_string (QObject::tr ("Trace Net"))));
menu_entries.push_back (lay::submenu ("", "trace_all_nets_menu", "tools_menu.end", tl::to_string (QObject::tr ("Trace All Nets"))));
menu_entries.push_back (lay::menu_item ("lay::trace_all_nets", "trace_all_nets", "tools_menu.trace_all_nets_menu.end", tl::to_string (QObject::tr ("Hierarchical"))));
menu_entries.push_back (lay::menu_item ("lay::trace_all_nets_flat", "trace_all_nets_flat", "tools_menu.trace_all_nets_menu.end", tl::to_string (QObject::tr ("Flat"))));
menu_entries.push_back (lay::menu_item ("lay::edit_layer_stack", "edit_layer_stack", "tools_menu.end", tl::to_string (QObject::tr ("Edit Layer Stack"))));
}
virtual lay::Plugin *create_plugin (db::Manager * /*manager*/, lay::PluginRoot *root, lay::LayoutView *view) const
virtual lay::Plugin *create_plugin (db::Manager * /*manager*/, lay::Dispatcher *root, lay::LayoutView *view) const
{
return new NetTracerDialog (root, view);
}
src/plugins/tools/xor/lay_plugin/layXORPlugin.cc
+3 -2
View File
@@ -23,6 +23,7 @@
#include "layXORToolDialog.h"
#include "layDispatcher.h"
#include "layPlugin.h"
@@ -96,7 +97,7 @@ public:
virtual void get_menu_entries (std::vector<lay::MenuEntry> &menu_entries) const
{
lay::PluginDeclaration::get_menu_entries (menu_entries);
menu_entries.push_back (lay::MenuEntry ("lay::xor_tool", "xor_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("XOR Tool"))));
menu_entries.push_back (lay::menu_item ("lay::xor_tool", "xor_tool:edit", "tools_menu.post_verification_group", tl::to_string (QObject::tr ("XOR Tool"))));
}
virtual bool configure (const std::string & /*name*/, const std::string & /*value*/)
@@ -109,7 +110,7 @@ public:
// .. nothing yet ..
}
lay::Plugin *create_plugin (db::Manager *, lay::PluginRoot *root, lay::LayoutView *view) const
lay::Plugin *create_plugin (db::Manager *, lay::Dispatcher *root, lay::LayoutView *view) const
{
return new XORPlugin (root, view);
}
src/plugins/tools/xor/lay_plugin/layXORToolDialog.cc
+2 -2
View File
@@ -207,7 +207,7 @@ XORToolDialog::exec_dialog (lay::LayoutView *view)
}
// take current settings from the configurations
lay::PluginRoot *config_root = lay::PluginRoot::instance ();
lay::Dispatcher *config_root = lay::Dispatcher::instance ();
input_mode_t im = IMAll;
if (config_root->config_get (cfg_xor_input_mode, im, InputModeConverter ())) {
@@ -333,7 +333,7 @@ BEGIN_PROTECTED
}
}
lay::PluginRoot *config_root = lay::PluginRoot::instance ();
lay::Dispatcher *config_root = lay::Dispatcher::instance ();
config_root->config_set (cfg_xor_input_mode, InputModeConverter ().to_string ((input_mode_t) mp_ui->input_layers_cbx->currentIndex ()));
config_root->config_set (cfg_xor_output_mode, OutputModeConverter ().to_string ((output_mode_t) mp_ui->output_cbx->currentIndex ()));