From 46b47ff0d9a6bc3f0c1bd62b4c27e807b8bdac95 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Mon, 22 Apr 2019 22:00:47 +0200 Subject: [PATCH] WIP: netlist browser - removed self test, is unit test now. --- .../laybasic/layNetlistBrowserPage.cc | 47 ------------------- src/laybasic/laybasic/layNetlistBrowserPage.h | 2 - 2 files changed, 49 deletions(-) diff --git a/src/laybasic/laybasic/layNetlistBrowserPage.cc b/src/laybasic/laybasic/layNetlistBrowserPage.cc index 6e7de5d9a..082155bb3 100644 --- a/src/laybasic/laybasic/layNetlistBrowserPage.cc +++ b/src/laybasic/laybasic/layNetlistBrowserPage.cc @@ -405,44 +405,6 @@ NetlistBrowserModel::circuit_net_device_terminal_other_index_from_id (void *id) return reinterpret_cast (id) - 1; } -void -NetlistBrowserModel::self_test (const QModelIndex &p) -{ - int rows = rowCount (p); - for (int r = 0; r != rows; ++r) { - - QModelIndex c, pp; - - c = index (r, 0, p); - if (c.column () != 0) { - tl_assert (false); - } - pp = parent (c); - if (pp.isValid () && pp.column () != 0) { - tl_assert (false); - } - if (pp.isValid () && pp.row () != r) { - tl_assert (false); - } - if (pp.isValid () && pp.internalId () != p.internalId ()) { - tl_assert (false); - } - - c = index (r, 1, p); - if (c.column () != 1) { - tl_assert (false); - } - pp = parent (c); - if (pp.isValid () && pp.column () != 1) { - tl_assert (false); - } - - self_test (c); - - } -} - - int NetlistBrowserModel::columnCount (const QModelIndex & /*parent*/) const { @@ -1061,15 +1023,6 @@ NetlistBrowserPage::set_l2ndb (db::LayoutToNetlist *database) QAbstractItemModel *tree_model = directory_tree->model (); NetlistBrowserModel *new_model = new NetlistBrowserModel (this, database); -#if !defined(NDEBUG) - try { - new_model->self_test (); // might throw an exception! - } catch (...) { - delete new_model; - mp_database.reset (0); - throw; - } -#endif directory_tree->setModel (new_model); // @@@ connect (directory_tree->selectionModel (), SIGNAL (selectionChanged (const QItemSelection &, const QItemSelection &)), this, SLOT (directory_selection_changed (const QItemSelection &, const QItemSelection &))); diff --git a/src/laybasic/laybasic/layNetlistBrowserPage.h b/src/laybasic/laybasic/layNetlistBrowserPage.h index bb4fe932d..64e1d8dba 100644 --- a/src/laybasic/laybasic/layNetlistBrowserPage.h +++ b/src/laybasic/laybasic/layNetlistBrowserPage.h @@ -78,8 +78,6 @@ public: virtual QModelIndex parent (const QModelIndex &index) const; virtual int rowCount (const QModelIndex &parent) const; - void self_test (const QModelIndex &index = QModelIndex ()); - private: void *make_id_circuit (size_t circuit_index) const;