luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-08-31 18:16:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Matthias Koefferlein
2022-05-15 10:31:09 +02:00
parent b17b2714a5
commit f5b4bbb62c
57 changed files with 388 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/tools/bool/lay_plugin/layBooleanOperationsDialogs.cc
+3 -3
View File
@@ -62,7 +62,7 @@ BooleanOptionsDialog::cv_changed (int)
}
bool
BooleanOptionsDialog::exec_dialog (lay::LayoutView *view, int &cv_a, int &layer_a, int &cv_b, int &layer_b, int &cv_r, int &layer_r, int &mode, int &hier_mode, bool &min_coherence)
BooleanOptionsDialog::exec_dialog (lay::LayoutViewBase *view, int &cv_a, int &layer_a, int &cv_b, int &layer_b, int &cv_r, int &layer_r, int &mode, int &hier_mode, bool &min_coherence)
{
mp_view = view;
@@ -183,7 +183,7 @@ SizingOptionsDialog::cv_changed (int)
}
bool
SizingOptionsDialog::exec_dialog (lay::LayoutView *view, int &cv, int &layer, int &cv_r, int &layer_r, double &dx, double &dy, unsigned int &size_mode, int &hier_mode, bool &min_coherence)
SizingOptionsDialog::exec_dialog (lay::LayoutViewBase *view, int &cv, int &layer, int &cv_r, int &layer_r, double &dx, double &dy, unsigned int &size_mode, int &hier_mode, bool &min_coherence)
{
mp_view = view;
@@ -309,7 +309,7 @@ MergeOptionsDialog::cv_changed (int)
}
bool
MergeOptionsDialog::exec_dialog (lay::LayoutView *view, int &cv, int &layer, int &cv_r, int &layer_r, unsigned int &min_wc, int &hier_mode, bool &min_coherence)
MergeOptionsDialog::exec_dialog (lay::LayoutViewBase *view, int &cv, int &layer, int &cv_r, int &layer_r, unsigned int &min_wc, int &hier_mode, bool &min_coherence)
{
mp_view = view;
src/plugins/tools/bool/lay_plugin/layBooleanOperationsDialogs.h
+7 -7
View File
@@ -37,7 +37,7 @@ namespace lay
{
class CellView;
class LayoutView;
class LayoutViewBase;
/**
* @brief The boolean operation options
@@ -52,7 +52,7 @@ public:
BooleanOptionsDialog (QWidget *parent);
virtual ~BooleanOptionsDialog ();
bool exec_dialog (lay::LayoutView *view, int &cv_a, int &layer_a, int &cv_b, int &layer_b, int &cv_res, int &layer_res, int &mode, int &hier_mode, bool &min_coherence);
bool exec_dialog (lay::LayoutViewBase *view, int &cv_a, int &layer_a, int &cv_b, int &layer_b, int &cv_res, int &layer_res, int &mode, int &hier_mode, bool &min_coherence);
public slots:
void cv_changed (int);
@@ -60,7 +60,7 @@ public slots:
private:
virtual void accept ();
lay::LayoutView *mp_view;
lay::LayoutViewBase *mp_view;
};
/**
@@ -76,7 +76,7 @@ public:
SizingOptionsDialog (QWidget *parent);
virtual ~SizingOptionsDialog ();
bool exec_dialog (lay::LayoutView *view, int &cv, int &layer, int &cv_res, int &layer_res, double &dx, double &dy, unsigned int &size_mode, int &hier_mode, bool &min_coherence);
bool exec_dialog (lay::LayoutViewBase *view, int &cv, int &layer, int &cv_res, int &layer_res, double &dx, double &dy, unsigned int &size_mode, int &hier_mode, bool &min_coherence);
public slots:
void cv_changed (int);
@@ -84,7 +84,7 @@ public slots:
private:
virtual void accept ();
lay::LayoutView *mp_view;
lay::LayoutViewBase *mp_view;
};
/**
@@ -100,7 +100,7 @@ public:
MergeOptionsDialog (QWidget *parent);
virtual ~MergeOptionsDialog ();
bool exec_dialog (lay::LayoutView *view, int &cv, int &layer, int &cv_res, int &layer_res, unsigned int &min_wc, int &hier_mode, bool &min_coherence);
bool exec_dialog (lay::LayoutViewBase *view, int &cv, int &layer, int &cv_res, int &layer_res, unsigned int &min_wc, int &hier_mode, bool &min_coherence);
public slots:
void cv_changed (int);
@@ -108,7 +108,7 @@ public slots:
private:
virtual void accept ();
lay::LayoutView *mp_view;
lay::LayoutViewBase *mp_view;
};
}
src/plugins/tools/bool/lay_plugin/layBooleanOperationsPlugin.cc
+6 -6
View File
@@ -26,7 +26,7 @@
#include "layPlugin.h"
#include "layTipDialog.h"
#include "layLayoutView.h"
#include "layLayoutViewBase.h"
#include "dbShapeProcessor.h"
@@ -39,7 +39,7 @@ class BooleanOperationsPlugin
: public lay::Plugin
{
public:
BooleanOperationsPlugin (Plugin *parent, lay::LayoutView *view)
BooleanOperationsPlugin (Plugin *parent, lay::LayoutViewBase *view)
: lay::Plugin (parent), mp_view (view)
{
m_boolean_cva = -1;
@@ -100,7 +100,7 @@ public:
}
lay::BooleanOptionsDialog dialog (mp_view);
lay::BooleanOptionsDialog dialog (mp_view->widget ());
if (dialog.exec_dialog (mp_view, m_boolean_cva, m_boolean_layera, m_boolean_cvb, m_boolean_layerb, m_boolean_cvr, m_boolean_layerr, m_boolean_mode, m_boolean_hier_mode, m_boolean_mincoh)) {
mp_view->cancel ();
@@ -237,7 +237,7 @@ public:
}
lay::MergeOptionsDialog dialog (mp_view);
lay::MergeOptionsDialog dialog (mp_view->widget ());
if (dialog.exec_dialog (mp_view, m_boolean_cva, m_boolean_layera, m_boolean_cvr, m_boolean_layerr, m_boolean_minwc, m_boolean_hier_mode, m_boolean_mincoh)) {
mp_view->cancel ();
@@ -352,7 +352,7 @@ public:
}
lay::SizingOptionsDialog dialog (mp_view);
lay::SizingOptionsDialog dialog (mp_view->widget ());
if (dialog.exec_dialog (mp_view, m_boolean_cva, m_boolean_layera, m_boolean_cvr, m_boolean_layerr, m_boolean_sizex, m_boolean_sizey, m_boolean_size_mode, m_boolean_hier_mode, m_boolean_mincoh)) {
mp_view->cancel ();
@@ -445,7 +445,7 @@ public:
}
private:
lay::LayoutView *mp_view;
lay::LayoutViewBase *mp_view;
int m_boolean_cva, m_boolean_cvb, m_boolean_cvr;
int m_boolean_layera, m_boolean_layerb, m_boolean_layerr;
int m_boolean_hier_mode, m_boolean_mode;
src/plugins/tools/diff/lay_plugin/layDiffPlugin.cc
+3 -3
View File
@@ -24,7 +24,7 @@
#include "layDispatcher.h"
#include "layPlugin.h"
#include "layLayoutView.h"
#include "layLayoutViewBase.h"
namespace lay
{
@@ -33,7 +33,7 @@ class DiffPlugin
: public lay::Plugin
{
public:
DiffPlugin (Plugin *parent, lay::LayoutView *view)
DiffPlugin (Plugin *parent, lay::LayoutViewBase *view)
: lay::Plugin (parent), mp_view (view)
{
mp_dialog = new lay::DiffToolDialog (0);
@@ -59,7 +59,7 @@ public:
}
private:
lay::LayoutView *mp_view;
lay::LayoutViewBase *mp_view;
lay::DiffToolDialog *mp_dialog;
};
src/plugins/tools/diff/lay_plugin/layDiffToolDialog.cc
+2 -2
View File
@@ -30,7 +30,7 @@
#include "tlTimer.h"
#include "tlProgress.h"
#include "layCellView.h"
#include "layLayoutView.h"
#include "layLayoutViewBase.h"
#include "tlExceptions.h"
#include "ui_DiffToolDialog.h"
@@ -608,7 +608,7 @@ DiffToolDialog::~DiffToolDialog ()
}
int
DiffToolDialog::exec_dialog (lay::LayoutView *view)
DiffToolDialog::exec_dialog (lay::LayoutViewBase *view)
{
mp_view = view;
src/plugins/tools/diff/lay_plugin/layDiffToolDialog.h
+3 -3
View File
@@ -36,7 +36,7 @@ namespace Ui
namespace lay
{
class LayoutView;
class LayoutViewBase;
}
namespace lay
@@ -57,7 +57,7 @@ public:
DiffToolDialog (QWidget *parent);
~DiffToolDialog ();
int exec_dialog (lay::LayoutView *view);
int exec_dialog (lay::LayoutViewBase *view);
protected slots:
void xor_changed () { update (); }
@@ -69,7 +69,7 @@ protected:
private:
Ui::DiffToolDialog *mp_ui;
lay::LayoutView *mp_view;
lay::LayoutViewBase *mp_view;
};
}
src/plugins/tools/net_tracer/lay_plugin/layNetTracerDialog.cc
+1 -1
View File
@@ -53,7 +53,7 @@ namespace lay
// -----------------------------------------------------------------------------------
// NetTracerDialog implementation
NetTracerDialog::NetTracerDialog (lay::Dispatcher *root, lay::LayoutView *view)
NetTracerDialog::NetTracerDialog (lay::Dispatcher *root, LayoutViewBase *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
+3 -3
View File
@@ -57,7 +57,7 @@ class NetTracerDialog
Q_OBJECT
public:
NetTracerDialog (lay::Dispatcher *root, lay::LayoutView *view);
NetTracerDialog (lay::Dispatcher *root, lay::LayoutViewBase *view);
virtual ~NetTracerDialog ();
virtual bool mouse_move_event (const db::DPoint &p, unsigned int buttons, bool prio);
@@ -108,7 +108,7 @@ private:
lay::FileDialog *mp_export_file_dialog;
std::string m_export_file_name;
lay::LayoutView *mp_view;
lay::LayoutViewBase *mp_view;
void commit ();
size_t get_trace_depth ();
@@ -124,7 +124,7 @@ private:
bool get_net_tracer_setup (const lay::CellView &cv, db::NetTracerData &data);
void trace_all_nets (db::LayoutToNetlist *l2ndb, const lay::CellView &cv, bool flat);
lay::LayoutView *view ()
lay::LayoutViewBase *view ()
{
return mp_view;
}
src/plugins/tools/view_25d/lay_plugin/layD25View.cc
+2 -2
View File
@@ -38,7 +38,7 @@ namespace lay
const double initial_elevation = 15.0;
D25View::D25View (lay::Dispatcher *root, LayoutView *view)
D25View::D25View (lay::Dispatcher *root, LayoutViewBase *view)
: lay::Browser (root, view, "d25_view"),
dm_rerun_macro (this, &D25View::rerun_macro),
dm_fit (this, &D25View::fit)
@@ -146,7 +146,7 @@ D25View::menu_activated (const std::string &symbol)
}
D25View *
D25View::open (lay::LayoutView *view)
D25View::open (lay::LayoutViewBase *view)
{
D25View *d25_view = view->get_plugin<lay::D25View> ();
if (d25_view) {
src/plugins/tools/view_25d/lay_plugin/layD25View.h
+3 -3
View File
@@ -37,7 +37,7 @@ namespace Ui
namespace lay
{
class LayoutView;
class LayoutViewBase;
}
namespace db
@@ -57,14 +57,14 @@ class D25View
Q_OBJECT
public:
D25View (lay::Dispatcher *root, lay::LayoutView *view);
D25View (lay::Dispatcher *root, lay::LayoutViewBase *view);
~D25View ();
virtual void menu_activated (const std::string &symbol);
virtual void deactivated ();
virtual void activated ();
static D25View *open (lay::LayoutView *view);
static D25View *open (lay::LayoutViewBase *view);
void close ();
void clear ();
void begin (const std::string &generator);
src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc
+1 -1
View File
@@ -711,7 +711,7 @@ D25ViewWidget::finish ()
}
void
D25ViewWidget::attach_view (LayoutView *view)
D25ViewWidget::attach_view (LayoutViewBase *view)
{
mp_view = view;
}
src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.h
+3 -3
View File
@@ -57,7 +57,7 @@ namespace tl
namespace lay
{
class LayoutView;
class LayoutViewBase;
class LayerPropertiesNode;
class D25ViewWidget;
@@ -106,7 +106,7 @@ public:
void mouseReleaseEvent (QMouseEvent *event);
void mouseMoveEvent (QMouseEvent *event);
void attach_view(lay::LayoutView *view);
void attach_view(lay::LayoutViewBase *view);
QVector3D hit_point_with_scene(const QVector3D &line_dir);
void refresh ();
@@ -187,7 +187,7 @@ private:
double m_scale_factor;
double m_vscale_factor;
QVector3D m_displacement;
lay::LayoutView *mp_view;
lay::LayoutViewBase *mp_view;
db::DBox m_bbox;
double m_zmin, m_zmax;
bool m_zset;
src/plugins/tools/xor/lay_plugin/layXORPlugin.cc
+2 -2
View File
@@ -35,7 +35,7 @@ class XORPlugin
: public lay::Plugin
{
public:
XORPlugin (Plugin *parent, lay::LayoutView *view)
XORPlugin (Plugin *parent, lay::LayoutViewBase *view)
: lay::Plugin (parent), mp_view (view)
{
mp_dialog = new lay::XORToolDialog (0);
@@ -61,7 +61,7 @@ public:
}
private:
lay::LayoutView *mp_view;
lay::LayoutViewBase *mp_view;
lay::XORToolDialog *mp_dialog;
};
src/plugins/tools/xor/lay_plugin/layXORToolDialog.cc
+1 -1
View File
@@ -186,7 +186,7 @@ XORToolDialog::~XORToolDialog ()
}
int
XORToolDialog::exec_dialog (lay::LayoutView *view)
XORToolDialog::exec_dialog (lay::LayoutViewBase *view)
{
mp_view = view;
src/plugins/tools/xor/lay_plugin/layXORToolDialog.h
+3 -3
View File
@@ -34,7 +34,7 @@ namespace Ui
namespace lay
{
class LayoutView;
class LayoutViewBase;
}
namespace lay
@@ -61,7 +61,7 @@ public:
XORToolDialog (QWidget *parent);
~XORToolDialog ();
int exec_dialog (lay::LayoutView *view);
int exec_dialog (lay::LayoutViewBase *view);
protected:
void accept ();
@@ -74,7 +74,7 @@ protected slots:
private:
Ui::XORToolDialog *mp_ui;
tl::weak_ptr<lay::LayoutView> mp_view;
tl::weak_ptr<lay::LayoutViewBase> mp_view;
};
}