From 53490a9faf4987e0e6e26fa548eb0d72f2974a77 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 15 May 2022 01:14:29 +0200 Subject: [PATCH] WIP --- src/edt/edt/edt.pro | 14 +++++++++----- src/edt/edt/edtDialogs.cc | 6 +++--- src/edt/edt/edtDialogs.h | 8 ++++---- src/edt/edt/edtEditorOptionsPages.cc | 2 +- src/edt/edt/edtEditorOptionsPages.h | 12 ++++++------ src/edt/edt/edtInstPropertiesPage.cc | 2 +- src/edt/edt/edtMainService.cc | 4 ++-- src/edt/edt/edtMainService.h | 6 +++--- src/edt/edt/edtPCellParametersPage.cc | 4 ++-- src/edt/edt/edtPCellParametersPage.h | 6 +++--- src/edt/edt/edtPartialService.cc | 4 ++-- src/edt/edt/edtPartialService.h | 6 +++--- src/edt/edt/edtPlugin.cc | 16 ++++++++-------- src/edt/edt/edtPlugin.h | 4 ++-- src/edt/edt/edtPropertiesPages.cc | 2 +- src/edt/edt/edtRecentConfigurationPage.cc | 6 +++--- src/edt/edt/edtRecentConfigurationPage.h | 4 ++-- src/edt/edt/edtService.cc | 6 +++--- src/edt/edt/edtService.h | 8 ++++---- src/edt/edt/edtServiceImpl.cc | 14 +++++++------- src/edt/edt/edtServiceImpl.h | 13 +++++++------ src/edt/edt/edtUtils.cc | 6 +++--- src/edt/edt/edtUtils.h | 6 +++--- src/edt/edt/gsiDeclEdt.cc | 22 +++++++++++----------- 24 files changed, 93 insertions(+), 88 deletions(-) diff --git a/src/edt/edt/edt.pro b/src/edt/edt/edt.pro index 087503794..5a0ce9312 100644 --- a/src/edt/edt/edt.pro +++ b/src/edt/edt/edt.pro @@ -80,10 +80,14 @@ SOURCES += \ INCLUDEPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC DEPENDPATH += $$TL_INC $$GSI_INC $$LAYBASIC_INC $$DB_INC -# Note: this accounts for UI-generated headers placed into the output folders in -# shadow builds: -INCLUDEPATH += $$DESTDIR/laybasic/laybasic -DEPENDPATH += $$DESTDIR/laybasic/laybasic - LIBS += -L$$DESTDIR -lklayout_tl -lklayout_gsi -lklayout_laybasic -lklayout_db +!equals(HAVE_QT, "0") { + + INCLUDEPATH += $$LAYUI_INC + DEPENDPATH += $$LAYUI_INC + + LIBS += -lklayout_layui + +} + diff --git a/src/edt/edt/edtDialogs.cc b/src/edt/edt/edtDialogs.cc index 37f6cef49..1486b2abf 100644 --- a/src/edt/edt/edtDialogs.cc +++ b/src/edt/edt/edtDialogs.cc @@ -28,7 +28,7 @@ #include "edtDialogs.h" #include "layObjectInstPath.h" #include "layCellView.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "layMarker.h" #include "tlException.h" #include "tlExceptions.h" @@ -105,7 +105,7 @@ InstantiationForm::double_clicked (QListWidgetItem *item) } void -InstantiationForm::show (lay::LayoutView *view, const lay::ObjectInstPath &path) +InstantiationForm::show (lay::LayoutViewBase *view, const lay::ObjectInstPath &path) { mp_view = view; mp_path = &path; @@ -233,7 +233,7 @@ ChangeLayerOptionsDialog::~ChangeLayerOptionsDialog () } bool -ChangeLayerOptionsDialog::exec_dialog (lay::LayoutView *view, int cv_index, unsigned int &new_layer) +ChangeLayerOptionsDialog::exec_dialog (lay::LayoutViewBase *view, int cv_index, unsigned int &new_layer) { std::vector > ll; diff --git a/src/edt/edt/edtDialogs.h b/src/edt/edt/edtDialogs.h index b0ee473a9..5864a8d54 100644 --- a/src/edt/edt/edtDialogs.h +++ b/src/edt/edt/edtDialogs.h @@ -46,7 +46,7 @@ namespace lay { - class LayoutView; + class LayoutViewBase; class Marker; class ObjectInstPath; } @@ -82,7 +82,7 @@ public: InstantiationForm (QWidget *parent); virtual ~InstantiationForm (); - void show (lay::LayoutView *view, const lay::ObjectInstPath &path); + void show (lay::LayoutViewBase *view, const lay::ObjectInstPath &path); public slots: void display_mode_changed (bool); @@ -91,7 +91,7 @@ public slots: private: void update (); - lay::LayoutView *mp_view; + lay::LayoutViewBase *mp_view; const lay::ObjectInstPath *mp_path; lay::Marker *mp_marker; bool m_enable_cb_callbacks; @@ -110,7 +110,7 @@ public: ChangeLayerOptionsDialog (QWidget *parent); virtual ~ChangeLayerOptionsDialog (); - bool exec_dialog (lay::LayoutView *view, int cv_index, unsigned int &new_layer); + bool exec_dialog (lay::LayoutViewBase *view, int cv_index, unsigned int &new_layer); }; /** diff --git a/src/edt/edt/edtEditorOptionsPages.cc b/src/edt/edt/edtEditorOptionsPages.cc index ff6b298d8..3ed5b6e20 100644 --- a/src/edt/edt/edtEditorOptionsPages.cc +++ b/src/edt/edt/edtEditorOptionsPages.cc @@ -33,7 +33,7 @@ #include "edtPropertiesPageUtils.h" #include "tlExceptions.h" #include "layPlugin.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "layCellSelectionForm.h" #include "layQtTools.h" #include "ui_EditorOptionsGeneric.h" diff --git a/src/edt/edt/edtEditorOptionsPages.h b/src/edt/edt/edtEditorOptionsPages.h index 394b76025..9ba3ee41e 100644 --- a/src/edt/edt/edtEditorOptionsPages.h +++ b/src/edt/edt/edtEditorOptionsPages.h @@ -52,7 +52,7 @@ namespace lay { class PluginDeclaration; class Dispatcher; - class LayoutView; + class LayoutViewBase; class Plugin; } @@ -70,7 +70,7 @@ class EditorOptionsGeneric Q_OBJECT public: - EditorOptionsGeneric (lay::LayoutView *view, lay::Dispatcher *dispatcher); + EditorOptionsGeneric (lay::LayoutViewBase *view, lay::Dispatcher *dispatcher); ~EditorOptionsGeneric (); virtual std::string title () const; @@ -93,7 +93,7 @@ class EditorOptionsText : public lay::EditorOptionsPage { public: - EditorOptionsText (lay::LayoutView *view, lay::Dispatcher *dispatcher); + EditorOptionsText (lay::LayoutViewBase *view, lay::Dispatcher *dispatcher); ~EditorOptionsText (); virtual std::string title () const; @@ -114,7 +114,7 @@ class EditorOptionsPath Q_OBJECT public: - EditorOptionsPath (lay::LayoutView *view, lay::Dispatcher *dispatcher); + EditorOptionsPath (lay::LayoutViewBase *view, lay::Dispatcher *dispatcher); ~EditorOptionsPath (); virtual std::string title () const; @@ -138,7 +138,7 @@ class EditorOptionsInst Q_OBJECT public: - EditorOptionsInst (lay::LayoutView *view, lay::Dispatcher *root); + EditorOptionsInst (lay::LayoutViewBase *view, lay::Dispatcher *root); ~EditorOptionsInst (); virtual std::string title () const; @@ -170,7 +170,7 @@ class EditorOptionsInstPCellParam Q_OBJECT public: - EditorOptionsInstPCellParam (lay::LayoutView *view, lay::Dispatcher *root); + EditorOptionsInstPCellParam (lay::LayoutViewBase *view, lay::Dispatcher *root); ~EditorOptionsInstPCellParam (); virtual std::string title () const; diff --git a/src/edt/edt/edtInstPropertiesPage.cc b/src/edt/edt/edtInstPropertiesPage.cc index e1b601e91..cde690911 100644 --- a/src/edt/edt/edtInstPropertiesPage.cc +++ b/src/edt/edt/edtInstPropertiesPage.cc @@ -32,7 +32,7 @@ #include "edtDialogs.h" #include "layDialogs.h" #include "layObjectInstPath.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "layCellSelectionForm.h" #include "layQtTools.h" #include "tlExceptions.h" diff --git a/src/edt/edt/edtMainService.cc b/src/edt/edt/edtMainService.cc index 73957aebd..56a5101e6 100644 --- a/src/edt/edt/edtMainService.cc +++ b/src/edt/edt/edtMainService.cc @@ -26,7 +26,7 @@ #include "dbLibrary.h" #include "dbLibraryManager.h" #include "tlExceptions.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "laySelector.h" #include "layFinder.h" #include "layLayerProperties.h" @@ -59,7 +59,7 @@ namespace edt // ----------------------------------------------------------------------------- // Main Service implementation -MainService::MainService (db::Manager *manager, lay::LayoutView *view, lay::Dispatcher *root) +MainService::MainService (db::Manager *manager, lay::LayoutViewBase *view, lay::Dispatcher *root) : lay::Plugin (view), lay::Editable (view), db::Object (manager), diff --git a/src/edt/edt/edtMainService.h b/src/edt/edt/edtMainService.h index 87d74e307..e6b26f98b 100644 --- a/src/edt/edt/edtMainService.h +++ b/src/edt/edt/edtMainService.h @@ -64,7 +64,7 @@ public: /** * @brief The constructor */ - MainService (db::Manager *manager, lay::LayoutView *view, lay::Dispatcher *root); + MainService (db::Manager *manager, lay::LayoutViewBase *view, lay::Dispatcher *root); /** * @brief The destructor @@ -74,7 +74,7 @@ public: /** * @brief Access to the view object */ - lay::LayoutView *view () const + lay::LayoutViewBase *view () const { return mp_view; } @@ -196,7 +196,7 @@ public: private: // The layout view that this service is attached to - lay::LayoutView *mp_view; + lay::LayoutViewBase *mp_view; lay::Dispatcher *mp_root; bool m_needs_update; diff --git a/src/edt/edt/edtPCellParametersPage.cc b/src/edt/edt/edtPCellParametersPage.cc index 1bf4c98e7..4edab8ab7 100644 --- a/src/edt/edt/edtPCellParametersPage.cc +++ b/src/edt/edt/edtPCellParametersPage.cc @@ -26,7 +26,7 @@ #include "edtPropertiesPageUtils.h" #include "layWidgets.h" #include "layQtTools.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "tlScriptError.h" #include @@ -233,7 +233,7 @@ PCellParametersPage::lazy_evaluation () } void -PCellParametersPage::setup (lay::LayoutView *view, int cv_index, const db::PCellDeclaration *pcell_decl, const db::pcell_parameters_type ¶meters) +PCellParametersPage::setup (lay::LayoutViewBase *view, int cv_index, const db::PCellDeclaration *pcell_decl, const db::pcell_parameters_type ¶meters) { mp_pcell_decl.reset (const_cast (pcell_decl)); // no const weak_ptr ... mp_view = view; diff --git a/src/edt/edt/edtPCellParametersPage.h b/src/edt/edt/edtPCellParametersPage.h index aa5a6ef38..83eadfea1 100644 --- a/src/edt/edt/edtPCellParametersPage.h +++ b/src/edt/edt/edtPCellParametersPage.h @@ -35,7 +35,7 @@ namespace lay { - class LayoutView; + class LayoutViewBase; } namespace edt @@ -80,7 +80,7 @@ public: * @param pcell_decl The PCell declaration * @param parameters The parameter values to show (if empty, the default values are used) */ - void setup (lay::LayoutView *view, int cv_index, const db::PCellDeclaration *pcell_decl, const db::pcell_parameters_type ¶meters); + void setup (lay::LayoutViewBase *view, int cv_index, const db::PCellDeclaration *pcell_decl, const db::pcell_parameters_type ¶meters); /** * @brief Gets the pages current state @@ -141,7 +141,7 @@ private: QFrame *mp_error_frame, *mp_update_frame; tl::weak_ptr mp_pcell_decl; std::vector m_widgets; - lay::LayoutView *mp_view; + lay::LayoutViewBase *mp_view; int m_cv_index; db::pcell_parameters_type m_parameters; bool m_dense; diff --git a/src/edt/edt/edtPartialService.cc b/src/edt/edt/edtPartialService.cc index 91bd17582..7f89ef2fa 100644 --- a/src/edt/edt/edtPartialService.cc +++ b/src/edt/edt/edtPartialService.cc @@ -22,7 +22,7 @@ #include "dbVector.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "laySnap.h" #include "layFinder.h" #include "tlProgress.h" @@ -1011,7 +1011,7 @@ PartialShapeFinder::visit_cell (const db::Cell &cell, const db::Box &search_box, // ----------------------------------------------------------------------------- // Main Service implementation -PartialService::PartialService (db::Manager *manager, lay::LayoutView *view, lay::Dispatcher *root) : +PartialService::PartialService (db::Manager *manager, lay::LayoutViewBase *view, lay::Dispatcher *root) : #if defined(HAVE_QT) QObject (), #endif diff --git a/src/edt/edt/edtPartialService.h b/src/edt/edt/edtPartialService.h index 9e59b3b1f..a0f7b0e78 100644 --- a/src/edt/edt/edtPartialService.h +++ b/src/edt/edt/edtPartialService.h @@ -155,7 +155,7 @@ public: /** * @brief The constructor */ - PartialService (db::Manager *manager, lay::LayoutView *view, lay::Dispatcher *root); + PartialService (db::Manager *manager, lay::LayoutViewBase *view, lay::Dispatcher *root); /** * @brief The destructor @@ -165,7 +165,7 @@ public: /** * @brief Access to the view object */ - lay::LayoutView *view () const + lay::LayoutViewBase *view () const { tl_assert (mp_view != 0); return mp_view; @@ -306,7 +306,7 @@ protected: private: // The layout view that this service is attached to - lay::LayoutView *mp_view; + lay::LayoutViewBase *mp_view; lay::Dispatcher *mp_root; bool m_dragging; bool m_keep_selection; diff --git a/src/edt/edt/edtPlugin.cc b/src/edt/edt/edtPlugin.cc index 0f3d01f22..5da6ed90a 100644 --- a/src/edt/edt/edtPlugin.cc +++ b/src/edt/edt/edtPlugin.cc @@ -27,7 +27,7 @@ #endif #include "layDispatcher.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "edtPlugin.h" #include "edtConfig.h" #include "edtService.h" @@ -56,7 +56,7 @@ edt::RecentConfigurationPage::ConfigurationDescriptor shape_cfg_descriptors[] = #if defined(HAVE_QT) static -void get_shape_editor_options_pages (std::vector &ret, lay::LayoutView *view, lay::Dispatcher *dispatcher) +void get_shape_editor_options_pages (std::vector &ret, lay::LayoutViewBase *view, lay::Dispatcher *dispatcher) { ret.push_back (new RecentConfigurationPage (view, dispatcher, "edit-recent-shape-param", &shape_cfg_descriptors[0], &shape_cfg_descriptors[sizeof (shape_cfg_descriptors) / sizeof (shape_cfg_descriptors[0])])); @@ -76,7 +76,7 @@ void get_text_options (std::vector < std::pair > &opti #if defined(HAVE_QT) static -void get_text_editor_options_pages (std::vector &ret, lay::LayoutView *view, lay::Dispatcher *dispatcher) +void get_text_editor_options_pages (std::vector &ret, lay::LayoutViewBase *view, lay::Dispatcher *dispatcher) { static edt::RecentConfigurationPage::ConfigurationDescriptor text_cfg_descriptors[] = { @@ -106,7 +106,7 @@ void get_path_options (std::vector < std::pair > &opti #if defined(HAVE_QT) static -void get_path_editor_options_pages (std::vector &ret, lay::LayoutView *view, lay::Dispatcher *dispatcher) +void get_path_editor_options_pages (std::vector &ret, lay::LayoutViewBase *view, lay::Dispatcher *dispatcher) { static edt::RecentConfigurationPage::ConfigurationDescriptor path_cfg_descriptors[] = { @@ -146,7 +146,7 @@ void get_inst_options (std::vector < std::pair > &opti #if defined(HAVE_QT) static -void get_inst_editor_options_pages (std::vector &ret, lay::LayoutView *view, lay::Dispatcher *dispatcher) +void get_inst_editor_options_pages (std::vector &ret, lay::LayoutViewBase *view, lay::Dispatcher *dispatcher) { static edt::RecentConfigurationPage::ConfigurationDescriptor inst_cfg_descriptors[] = { @@ -182,7 +182,7 @@ public: #if defined(HAVE_QT) PluginDeclaration (const std::string &title, const std::string &mouse_mode, void (*option_get_f) (std::vector < std::pair > &) = 0, - void (*pages_f) (std::vector &, lay::LayoutView *, lay::Dispatcher *) = 0) + void (*pages_f) (std::vector &, lay::LayoutViewBase *, lay::Dispatcher *) = 0) : m_title (title), m_mouse_mode (mouse_mode), mp_option_get_f (option_get_f), mp_pages_f (pages_f) { // .. nothing yet .. @@ -254,7 +254,7 @@ private: void (*mp_option_get_f) (std::vector < std::pair > &options); #if defined(HAVE_QT) - void (*mp_pages_f) (std::vector &, lay::LayoutView *, lay::Dispatcher *); + void (*mp_pages_f) (std::vector &, lay::LayoutViewBase *, lay::Dispatcher *); #else void (*mp_pages_f) (); #endif @@ -469,7 +469,7 @@ private: static tl::RegisteredClass config_decl_main (new edt::MainPluginDeclaration (tl::to_string (tr ("Instances and shapes"))), 4000, "edt::MainService"); void -commit_recent (lay::LayoutView *view) +commit_recent (lay::LayoutViewBase *view) { #if defined(HAVE_QT) lay::EditorOptionsPages *eo_pages = view->editor_options_pages (); diff --git a/src/edt/edt/edtPlugin.h b/src/edt/edt/edtPlugin.h index d70ade213..4b036e553 100644 --- a/src/edt/edt/edtPlugin.h +++ b/src/edt/edt/edtPlugin.h @@ -32,7 +32,7 @@ namespace lay { class Dispatcher; class EditorOptionsPage; - class LayoutView; + class LayoutViewBase; } namespace edt @@ -49,7 +49,7 @@ namespace edt /** * @brief Commits the current configuration for the recently used configuration list */ - void commit_recent (lay::LayoutView *view); + void commit_recent (lay::LayoutViewBase *view); } #endif diff --git a/src/edt/edt/edtPropertiesPages.cc b/src/edt/edt/edtPropertiesPages.cc index 7a34c1981..7f01f3158 100644 --- a/src/edt/edt/edtPropertiesPages.cc +++ b/src/edt/edt/edtPropertiesPages.cc @@ -28,7 +28,7 @@ #include "edtPropertiesPageUtils.h" #include "layDialogs.h" #include "layObjectInstPath.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "layQtTools.h" #include "tlExceptions.h" #include "tlString.h" diff --git a/src/edt/edt/edtRecentConfigurationPage.cc b/src/edt/edt/edtRecentConfigurationPage.cc index 09c4a50ed..f184cb692 100644 --- a/src/edt/edt/edtRecentConfigurationPage.cc +++ b/src/edt/edt/edtRecentConfigurationPage.cc @@ -25,7 +25,7 @@ #include "edtRecentConfigurationPage.h" #include "edtUtils.h" #include "layDispatcher.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "layLayerTreeModel.h" #include "dbLibraryManager.h" #include "dbLibrary.h" @@ -133,7 +133,7 @@ RecentConfigurationPage::set_stored_values (const std::list[@]) db::LayerProperties lp; @@ -181,7 +181,7 @@ RecentConfigurationPage::render_to (QTreeWidgetItem *item, int column, const std case RecentConfigurationPage::Layer: { - int icon_size = view ()->style ()->pixelMetric (QStyle::PM_ButtonIconSize); + int icon_size = view ()->widget ()->style ()->pixelMetric (QStyle::PM_ButtonIconSize); lay::LayerPropertiesConstIterator l; try { l = lp_iter_from_string (view (), values [column]); diff --git a/src/edt/edt/edtRecentConfigurationPage.h b/src/edt/edt/edtRecentConfigurationPage.h index ab8c88800..00997fd0f 100644 --- a/src/edt/edt/edtRecentConfigurationPage.h +++ b/src/edt/edt/edtRecentConfigurationPage.h @@ -33,7 +33,7 @@ namespace lay { - class LayoutView; + class LayoutViewBase; } namespace edt @@ -78,7 +78,7 @@ public: }; template - RecentConfigurationPage (lay::LayoutView *view, lay::Dispatcher *dispatcher, const std::string &recent_cfg_name, Iter begin_cfg, Iter end_cfg) + RecentConfigurationPage (lay::LayoutViewBase *view, lay::Dispatcher *dispatcher, const std::string &recent_cfg_name, Iter begin_cfg, Iter end_cfg) : EditorOptionsPage (view, dispatcher), m_recent_cfg_name (recent_cfg_name), m_cfg (begin_cfg, end_cfg) { init (); diff --git a/src/edt/edt/edtService.cc b/src/edt/edt/edtService.cc index dd439ebed..7e3320bee 100644 --- a/src/edt/edt/edtService.cc +++ b/src/edt/edt/edtService.cc @@ -31,7 +31,7 @@ # include "edtDialogs.h" #endif #include "layFinder.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "laySnap.h" #include "tlProgress.h" #include "tlTimer.h" @@ -62,7 +62,7 @@ ac_from_buttons (unsigned int buttons) // ------------------------------------------------------------- -Service::Service (db::Manager *manager, lay::LayoutView *view, db::ShapeIterator::flags_type flags) +Service::Service (db::Manager *manager, lay::LayoutViewBase *view, db::ShapeIterator::flags_type flags) : lay::EditorServiceBase (view), db::Object (manager), mp_view (view), @@ -82,7 +82,7 @@ Service::Service (db::Manager *manager, lay::LayoutView *view, db::ShapeIterator // .. nothing yet .. } -Service::Service (db::Manager *manager, lay::LayoutView *view) +Service::Service (db::Manager *manager, lay::LayoutViewBase *view) : lay::EditorServiceBase (view), db::Object (manager), mp_view (view), diff --git a/src/edt/edt/edtService.h b/src/edt/edt/edtService.h index 15121657a..cd05cd739 100644 --- a/src/edt/edt/edtService.h +++ b/src/edt/edt/edtService.h @@ -83,12 +83,12 @@ public: /** * @brief The constructor for an service selecting shapes */ - Service (db::Manager *manager, lay::LayoutView *view, db::ShapeIterator::flags_type shape_types); + Service (db::Manager *manager, lay::LayoutViewBase *view, db::ShapeIterator::flags_type shape_types); /** * @brief The constructor for an service selecting instances */ - Service (db::Manager *manager, lay::LayoutView *view); + Service (db::Manager *manager, lay::LayoutViewBase *view); /** * @brief The destructor @@ -244,7 +244,7 @@ public: /** * @brief Access to the view object */ - lay::LayoutView *view () const + lay::LayoutViewBase *view () const { tl_assert (mp_view != 0); return mp_view; @@ -560,7 +560,7 @@ protected: private: // The layout view that the editor service is attached to - lay::LayoutView *mp_view; + lay::LayoutViewBase *mp_view; // The marker objects representing the selection std::vector m_markers; diff --git a/src/edt/edt/edtServiceImpl.cc b/src/edt/edt/edtServiceImpl.cc index ba5605954..60cd2ee29 100644 --- a/src/edt/edt/edtServiceImpl.cc +++ b/src/edt/edt/edtServiceImpl.cc @@ -37,7 +37,7 @@ #include "dbEdgeProcessor.h" #include "layMarker.h" #include "layLayerProperties.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #if defined(HAVE_QT) # include "layTipDialog.h" @@ -54,7 +54,7 @@ namespace edt // ----------------------------------------------------------------------------- // ShapeEditService implementation -ShapeEditService::ShapeEditService (db::Manager *manager, lay::LayoutView *view, db::ShapeIterator::flags_type shape_types) +ShapeEditService::ShapeEditService (db::Manager *manager, lay::LayoutViewBase *view, db::ShapeIterator::flags_type shape_types) : edt::Service (manager, view, shape_types), m_layer (0), m_cv_index (0), mp_cell (0), mp_layout (0), m_combine_mode (CM_Add) { @@ -373,7 +373,7 @@ ShapeEditService::deliver_shape (const db::Box &box) // ----------------------------------------------------------------------------- // PolygonService implementation -PolygonService::PolygonService (db::Manager *manager, lay::LayoutView *view) +PolygonService::PolygonService (db::Manager *manager, lay::LayoutViewBase *view) : ShapeEditService (manager, view, db::ShapeIterator::Polygons), m_closure_set (false), m_closure () { @@ -705,7 +705,7 @@ PolygonService::update_marker () // ----------------------------------------------------------------------------- // BoxService implementation -BoxService::BoxService (db::Manager *manager, lay::LayoutView *view) +BoxService::BoxService (db::Manager *manager, lay::LayoutViewBase *view) : ShapeEditService (manager, view, db::ShapeIterator::Boxes) { // .. nothing yet .. @@ -799,7 +799,7 @@ BoxService::selection_applies (const lay::ObjectInstPath &sel) const // ----------------------------------------------------------------------------- // TextService implementation -TextService::TextService (db::Manager *manager, lay::LayoutView *view) +TextService::TextService (db::Manager *manager, lay::LayoutViewBase *view) : ShapeEditService (manager, view, db::ShapeIterator::Texts), m_rot (0) { @@ -991,7 +991,7 @@ TextService::configure (const std::string &name, const std::string &value) // ----------------------------------------------------------------------------- // PathService implementation -PathService::PathService (db::Manager *manager, lay::LayoutView *view) +PathService::PathService (db::Manager *manager, lay::LayoutViewBase *view) : ShapeEditService (manager, view, db::ShapeIterator::Paths), m_width (0.1), m_bgnext (0.0), m_endext (0.0), m_type (Flush), m_needs_update (true) { @@ -1232,7 +1232,7 @@ PathService::config_finalize () // ----------------------------------------------------------------------------- // InstService implementation -InstService::InstService (db::Manager *manager, lay::LayoutView *view) +InstService::InstService (db::Manager *manager, lay::LayoutViewBase *view) : edt::Service (manager, view), m_angle (0.0), m_scale (1.0), m_mirror (false), m_is_pcell (false), diff --git a/src/edt/edt/edtServiceImpl.h b/src/edt/edt/edtServiceImpl.h index 9d9ebc2f8..1de7c70a6 100644 --- a/src/edt/edt/edtServiceImpl.h +++ b/src/edt/edt/edtServiceImpl.h @@ -32,6 +32,7 @@ namespace lay { class CellView; + class LayoutViewBase; class LayerPropertiesConstIterator; } @@ -45,7 +46,7 @@ class ShapeEditService : public edt::Service { public: - ShapeEditService (db::Manager *manager, lay::LayoutView *view, db::ShapeIterator::flags_type shape_types); + ShapeEditService (db::Manager *manager, lay::LayoutViewBase *view, db::ShapeIterator::flags_type shape_types); protected: void get_edit_layer (); @@ -86,7 +87,7 @@ class PolygonService : public ShapeEditService { public: - PolygonService (db::Manager *manager, lay::LayoutView *view); + PolygonService (db::Manager *manager, lay::LayoutViewBase *view); #if defined(HAVE_QT) virtual lay::PropertiesPage *properties_page (db::Manager *manager, QWidget *parent); @@ -119,7 +120,7 @@ class BoxService : public ShapeEditService { public: - BoxService (db::Manager *manager, lay::LayoutView *view); + BoxService (db::Manager *manager, lay::LayoutViewBase *view); #if defined(HAVE_QT) virtual lay::PropertiesPage *properties_page (db::Manager *manager, QWidget *parent); @@ -146,7 +147,7 @@ class TextService : public ShapeEditService { public: - TextService (db::Manager *manager, lay::LayoutView *view); + TextService (db::Manager *manager, lay::LayoutViewBase *view); ~TextService (); #if defined(HAVE_QT) @@ -180,7 +181,7 @@ class PathService : public ShapeEditService { public: - PathService (db::Manager *manager, lay::LayoutView *view); + PathService (db::Manager *manager, lay::LayoutViewBase *view); ~PathService (); #if defined(HAVE_QT) @@ -219,7 +220,7 @@ class InstService : public edt::Service { public: - InstService (db::Manager *manager, lay::LayoutView *view); + InstService (db::Manager *manager, lay::LayoutViewBase *view); #if defined(HAVE_QT) virtual lay::PropertiesPage *properties_page (db::Manager *manager, QWidget *parent); diff --git a/src/edt/edt/edtUtils.cc b/src/edt/edt/edtUtils.cc index 4b04d9de8..e4e6c69c0 100644 --- a/src/edt/edt/edtUtils.cc +++ b/src/edt/edt/edtUtils.cc @@ -29,7 +29,7 @@ #include "edtService.h" #include "layCellView.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" #include "layEditable.h" #include "tlException.h" @@ -77,7 +77,7 @@ std::map pcell_parameters_from_string (const std::stri // ------------------------------------------------------------- // SelectionIterator implementation -SelectionIterator::SelectionIterator (lay::LayoutView *view, bool including_transient) +SelectionIterator::SelectionIterator (lay::LayoutViewBase *view, bool including_transient) : m_transient_mode (false) { mp_edt_services = view->get_plugins (); @@ -145,7 +145,7 @@ SelectionIterator::next () // TransformationsVariants implementation // for a lay::LayoutView -TransformationVariants::TransformationVariants (const lay::LayoutView *view, bool per_cv_and_layer, bool per_cv) +TransformationVariants::TransformationVariants (const lay::LayoutViewBase *view, bool per_cv_and_layer, bool per_cv) { // build the transformation variants cache diff --git a/src/edt/edt/edtUtils.h b/src/edt/edt/edtUtils.h index 83189a84d..dc2a0c293 100644 --- a/src/edt/edt/edtUtils.h +++ b/src/edt/edt/edtUtils.h @@ -38,7 +38,7 @@ namespace lay { - class LayoutView; + class LayoutViewBase; } namespace edt { @@ -82,7 +82,7 @@ public: class TransformationVariants { public: - TransformationVariants (const lay::LayoutView *view, bool per_cv_and_layer = true, bool per_cv = true); + TransformationVariants (const lay::LayoutViewBase *view, bool per_cv_and_layer = true, bool per_cv = true); const std::vector *per_cv_and_layer (unsigned int cv, unsigned int layer) const; const std::vector *per_cv (unsigned int cv) const; @@ -107,7 +107,7 @@ public: * * If "including_transient" is true, the transient selection will be used as fallback. */ - SelectionIterator (lay::LayoutView *view, bool including_transient = true); + SelectionIterator (lay::LayoutViewBase *view, bool including_transient = true); /** * @brief Returns a value indicating whether the transient selection is taken diff --git a/src/edt/edt/gsiDeclEdt.cc b/src/edt/edt/gsiDeclEdt.cc index 75e96b0f4..95a55f333 100644 --- a/src/edt/edt/gsiDeclEdt.cc +++ b/src/edt/edt/gsiDeclEdt.cc @@ -25,7 +25,7 @@ #include "edtService.h" #include "dbRecursiveShapeIterator.h" #include "layObjectInstPath.h" -#include "layLayoutView.h" +#include "layLayoutViewBase.h" namespace gsi { @@ -489,7 +489,7 @@ private: // extend the layout view by "edtService" specific methods -static std::vector object_selection (const lay::LayoutView *view) +static std::vector object_selection (const lay::LayoutViewBase *view) { std::vector result; std::vector edt_services = view->get_plugins (); @@ -501,7 +501,7 @@ static std::vector object_selection (const la return result; } -static void set_object_selection (const lay::LayoutView *view, const std::vector &all_selected) +static void set_object_selection (const lay::LayoutViewBase *view, const std::vector &all_selected) { std::vector sel; @@ -521,7 +521,7 @@ static void set_object_selection (const lay::LayoutView *view, const std::vector } } -static bool has_object_selection (const lay::LayoutView *view) +static bool has_object_selection (const lay::LayoutViewBase *view) { std::vector edt_services = view->get_plugins (); for (std::vector::const_iterator s = edt_services.begin (); s != edt_services.end (); ++s) { @@ -532,7 +532,7 @@ static bool has_object_selection (const lay::LayoutView *view) return false; } -static void clear_object_selection (const lay::LayoutView *view) +static void clear_object_selection (const lay::LayoutViewBase *view) { std::vector edt_services = view->get_plugins (); for (std::vector::const_iterator s = edt_services.begin (); s != edt_services.end (); ++s) { @@ -540,7 +540,7 @@ static void clear_object_selection (const lay::LayoutView *view) } } -static void select_object (const lay::LayoutView *view, const edt::Service::objects::value_type &object) +static void select_object (const lay::LayoutViewBase *view, const edt::Service::objects::value_type &object) { std::vector edt_services = view->get_plugins (); for (std::vector::const_iterator s = edt_services.begin (); s != edt_services.end (); ++s) { @@ -551,7 +551,7 @@ static void select_object (const lay::LayoutView *view, const edt::Service::obje } } -static void unselect_object (const lay::LayoutView *view, const edt::Service::objects::value_type &object) +static void unselect_object (const lay::LayoutViewBase *view, const edt::Service::objects::value_type &object) { std::vector edt_services = view->get_plugins (); for (std::vector::const_iterator s = edt_services.begin (); s != edt_services.end (); ++s) { @@ -562,7 +562,7 @@ static void unselect_object (const lay::LayoutView *view, const edt::Service::ob } } -static bool has_transient_object_selection (const lay::LayoutView *view) +static bool has_transient_object_selection (const lay::LayoutViewBase *view) { std::vector edt_services = view->get_plugins (); for (std::vector::const_iterator s = edt_services.begin (); s != edt_services.end (); ++s) { @@ -573,18 +573,18 @@ static bool has_transient_object_selection (const lay::LayoutView *view) return false; } -static EditableSelectionIterator begin_objects_selected (const lay::LayoutView *view) +static EditableSelectionIterator begin_objects_selected (const lay::LayoutViewBase *view) { return EditableSelectionIterator (view->get_plugins (), false); } -static EditableSelectionIterator begin_objects_selected_transient (const lay::LayoutView *view) +static EditableSelectionIterator begin_objects_selected_transient (const lay::LayoutViewBase *view) { return EditableSelectionIterator (view->get_plugins (), true); } static -gsi::ClassExt layout_view_decl ( +gsi::ClassExt layout_view_decl ( gsi::method_ext ("has_object_selection?", &has_object_selection, "@brief Returns true, if geometrical objects (shapes or cell instances) are selected in this view" ) +