From 8919916da91ba9f92cf594fbaee569e8675c23ab Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 25 Sep 2022 11:22:45 +0200 Subject: [PATCH] WIP: some debugging --- .../tools/net_tracer/db_plugin/dbNetTracerPlugin.cc | 2 ++ .../lay_plugin/layNetTracerConnectivityEditor.cc | 10 +++++++--- .../lay_plugin/layNetTracerConnectivityEditor.h | 2 +- .../lay_plugin/layNetTracerTechComponentEditor.cc | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/plugins/tools/net_tracer/db_plugin/dbNetTracerPlugin.cc b/src/plugins/tools/net_tracer/db_plugin/dbNetTracerPlugin.cc index 4c5632c23..ed67acd05 100644 --- a/src/plugins/tools/net_tracer/db_plugin/dbNetTracerPlugin.cc +++ b/src/plugins/tools/net_tracer/db_plugin/dbNetTracerPlugin.cc @@ -122,6 +122,8 @@ public: FallbackXMLWriteAdapator (&NetTracerConnectivity::add_symbol), "symbols") + // 0.28 definitions tl::make_element ((NetTracerTechnologyComponent::const_iterator (NetTracerTechnologyComponent::*) () const) &NetTracerTechnologyComponent::begin, (NetTracerTechnologyComponent::const_iterator (NetTracerTechnologyComponent::*) () const) &NetTracerTechnologyComponent::end, (void (NetTracerTechnologyComponent::*) (const NetTracerConnectivity &)) &NetTracerTechnologyComponent::push_back, "connectivity", + tl::make_member (&NetTracerConnectivity::name, &NetTracerConnectivity::set_name, "name") + + tl::make_member (&NetTracerConnectivity::description, &NetTracerConnectivity::set_description, "description") + tl::make_member ((NetTracerConnectivity::const_iterator (NetTracerConnectivity::*) () const) &NetTracerConnectivity::begin, (NetTracerConnectivity::const_iterator (NetTracerConnectivity::*) () const) &NetTracerConnectivity::end, &NetTracerConnectivity::add, "connection") + tl::make_member ((NetTracerConnectivity::const_symbol_iterator (NetTracerConnectivity::*) () const) &NetTracerConnectivity::begin_symbols, (NetTracerConnectivity::const_symbol_iterator (NetTracerConnectivity::*) () const) &NetTracerConnectivity::end_symbols, &NetTracerConnectivity::add_symbol, "symbols") ) diff --git a/src/plugins/tools/net_tracer/lay_plugin/layNetTracerConnectivityEditor.cc b/src/plugins/tools/net_tracer/lay_plugin/layNetTracerConnectivityEditor.cc index 83e935546..5458327ec 100644 --- a/src/plugins/tools/net_tracer/lay_plugin/layNetTracerConnectivityEditor.cc +++ b/src/plugins/tools/net_tracer/lay_plugin/layNetTracerConnectivityEditor.cc @@ -293,10 +293,14 @@ NetTracerConnectivityEditor::NetTracerConnectivityEditor (QWidget *parent) symbol_table->verticalHeader ()->hide (); } -const db::NetTracerConnectivity & -NetTracerConnectivityEditor::get_connectiviy () +void +NetTracerConnectivityEditor::get_connectivity (db::NetTracerConnectivity &data) { - return m_data; + std::string name = data.name (); + std::string description = data.description (); + data = m_data; + data.set_name (name); + data.set_description (description); } void diff --git a/src/plugins/tools/net_tracer/lay_plugin/layNetTracerConnectivityEditor.h b/src/plugins/tools/net_tracer/lay_plugin/layNetTracerConnectivityEditor.h index 64377b4a1..beed78303 100644 --- a/src/plugins/tools/net_tracer/lay_plugin/layNetTracerConnectivityEditor.h +++ b/src/plugins/tools/net_tracer/lay_plugin/layNetTracerConnectivityEditor.h @@ -58,7 +58,7 @@ public: NetTracerConnectivityEditor (QWidget *parent); void set_connectivity (const db::NetTracerConnectivity &data); - const db::NetTracerConnectivity &get_connectiviy(); + void get_connectivity (db::NetTracerConnectivity &); public slots: void add_clicked (); diff --git a/src/plugins/tools/net_tracer/lay_plugin/layNetTracerTechComponentEditor.cc b/src/plugins/tools/net_tracer/lay_plugin/layNetTracerTechComponentEditor.cc index cfe49d8d4..662f5e235 100644 --- a/src/plugins/tools/net_tracer/lay_plugin/layNetTracerTechComponentEditor.cc +++ b/src/plugins/tools/net_tracer/lay_plugin/layNetTracerTechComponentEditor.cc @@ -203,7 +203,7 @@ NetTracerTechComponentEditor::commit_current (QTreeWidgetItem *current) { int row = current ? stack_tree->indexOfTopLevelItem (current) : -1; if (row >= 0 && row < int (m_data.size ())) { - m_data.begin () [row] = connectivity_editor_widget->get_connectiviy (); + connectivity_editor_widget->get_connectivity (m_data.begin () [row]); } }