luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed #153 (crash on Apply when changing guiding shape properties)

This commit is contained in:
Matthias Koefferlein 2018-08-25 19:07:30 +02:00
parent e8a5d6ac0c
commit 842f39da45
3 changed files with 85 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/edt/edt/edtPropertiesPages.cc
View File

@ -251,6 +251,8 @@ ShapePropertiesPage::do_apply (bool current_only)
for (std::vector<edt::Service::obj_iterator>::const_iterator p = m_selection_ptrs.begin (); p != m_selection_ptrs.end (); ++p) {
size_t index = p - m_selection_ptrs.begin ();
edt::Service::obj_iterator pos = *p;
// only update objects from the same layout - this is not practical limitation but saves a lot of effort for
@ -259,6 +261,9 @@ ShapePropertiesPage::do_apply (bool current_only)
continue;
}
const lay::CellView &cv = mp_service->view ()->cellview (pos->cv_index ());
db::Layout &layout = cv->layout ();
tl_assert (! pos->is_cell_inst ());
if (pos->shape ().is_array_member ()) {
@ -271,10 +276,8 @@ ShapePropertiesPage::do_apply (bool current_only)
std::map<db::Shape, db::Shape>::const_iterator s = shapes_seen.find (pos->shape ());
if (s == shapes_seen.end ()) {
const lay::CellView &cv = mp_service->view ()->cellview (pos->cv_index ());
db::Shapes &shapes = cv->layout ().cell (pos->cell_index ()).shapes (pos->layer ());
double dbu = cv->layout ().dbu ();
db::Shapes &shapes = layout.cell (pos->cell_index ()).shapes (pos->layer ());
double dbu = layout.dbu ();
if (!current_only || pos->shape () == current) {
new_shape = applicator->do_apply (shapes, pos->shape (), dbu, relative_mode);
@ -288,8 +291,6 @@ ShapePropertiesPage::do_apply (bool current_only)
if (new_shape != pos->shape ()) {
size_t index = p - m_selection_ptrs.begin ();
// change selection to new shape
new_sel[index].set_shape (new_shape);
@ -298,21 +299,34 @@ ShapePropertiesPage::do_apply (bool current_only)
update_required = true;
}
}
// handle the case of guiding shape updates
std::pair<bool, lay::ObjectInstPath> gs = mp_service->handle_guiding_shape_changes (new_sel[index]);
if (gs.first) {
new_sel[index] = gs.second;
mp_service->select (*pos, lay::Editable::Reset);
mp_service->select (new_sel [index], lay::Editable::Add);
update_required = true;
}
}
if (update_required) {
mp_service->view ()->cellview (cv_index)->layout ().cleanup ();
recompute_selection_ptrs (new_sel);
}
} catch (...) {
mp_service->view ()->cellview (cv_index)->layout ().cleanup ();
recompute_selection_ptrs (new_sel);
throw;
}
mp_service->handle_guiding_shape_changes ();
update ();
}

90
src/edt/edt/edtService.cc
View File

@ -1480,30 +1480,23 @@ Service::add_selection (const lay::ObjectInstPath &sel)
selection_to_view ();
}
bool
Service::handle_guiding_shape_changes ()
std::pair<bool, lay::ObjectInstPath>
Service::handle_guiding_shape_changes (const lay::ObjectInstPath &obj) const
{
// just allow one guiding shape to be selected
if (m_selection.empty ()) {
return false;
}
objects::const_iterator s = m_selection.begin ();
unsigned int cv_index = s->cv_index ();
unsigned int cv_index = obj.cv_index ();
lay::CellView cv = view ()->cellview (cv_index);
db::Layout *layout = &cv->layout ();
if (s->is_cell_inst () || s->layer () != layout->guiding_shape_layer ()) {
return false;
if (obj.is_cell_inst () || obj.layer () != layout->guiding_shape_layer ()) {
return std::make_pair (false, lay::ObjectInstPath ());
}
if (! s->shape ().has_prop_id ()) {
return false;
if (! obj.shape ().has_prop_id ()) {
return std::make_pair (false, lay::ObjectInstPath ());
}
if (! layout->is_pcell_instance (s->cell_index ()).first) {
return false;
if (! layout->is_pcell_instance (obj.cell_index ()).first) {
return std::make_pair (false, lay::ObjectInstPath ());
}
db::cell_index_type top_cell = std::numeric_limits<db::cell_index_type>::max ();
@ -1512,37 +1505,38 @@ Service::handle_guiding_shape_changes ()
db::pcell_parameters_type parameters_for_pcell;
// determine parent cell and instance if required
lay::ObjectInstPath::iterator e = s->end ();
if (e == s->begin ()) {
top_cell = s->cell_index ();
lay::ObjectInstPath::iterator e = obj.end ();
if (e == obj.begin ()) {
top_cell = obj.cell_index ();
} else {
--e;
db::cell_index_type pc = s->topcell ();
if (e != s->begin ()) {
db::cell_index_type pc = obj.topcell ();
if (e != obj.begin ()) {
--e;
pc = e->inst_ptr.cell_index ();
}
parent_cell = pc;
parent_inst = s->back ().inst_ptr;
parent_inst = obj.back ().inst_ptr;
}
db::property_names_id_type pn = layout->properties_repository ().prop_name_id ("name");
const db::PropertiesRepository::properties_set &input_props = layout->properties_repository ().properties (s->shape ().prop_id ());
const db::PropertiesRepository::properties_set &input_props = layout->properties_repository ().properties (obj.shape ().prop_id ());
db::PropertiesRepository::properties_set::const_iterator input_pv = input_props.find (pn);
if (input_pv == input_props.end ()) {
return false;
return std::make_pair (false, lay::ObjectInstPath ());
}
std::string shape_name = input_pv->second.to_string ();
// Hint: get_parameters_from_pcell_and_guiding_shapes invalidates the shapes because it resets the changed
// guiding shapes. We must not access s->shape after that.
if (! get_parameters_from_pcell_and_guiding_shapes (layout, s->cell_index (), parameters_for_pcell)) {
return false;
if (! get_parameters_from_pcell_and_guiding_shapes (layout, obj.cell_index (), parameters_for_pcell)) {
return std::make_pair (false, lay::ObjectInstPath ());
}
std::vector<lay::ObjectInstPath> new_sel;
bool found = false;
lay::ObjectInstPath new_obj = obj;
if (parent_cell != std::numeric_limits <db::cell_index_type>::max ()) {
@ -1550,21 +1544,20 @@ Service::handle_guiding_shape_changes ()
// try to identify the selected shape in the new shapes and select this one
db::Shapes::shape_iterator sh = layout->cell (new_inst.cell_index ()).shapes (layout->guiding_shape_layer ()).begin (db::ShapeIterator::All);
while (! sh.at_end ()) {
while (! sh.at_end () && !found) {
const db::PropertiesRepository::properties_set &props = layout->properties_repository ().properties (sh->prop_id ());
db::PropertiesRepository::properties_set::const_iterator pv = props.find (pn);
if (pv != props.end ()) {
if (pv->second.to_string () == shape_name) {
new_sel.push_back (*s);
new_sel.back ().back ().inst_ptr = new_inst;
new_sel.back ().back ().array_inst = new_inst.begin ();
new_sel.back ().set_shape (*sh);
break;
new_obj.back ().inst_ptr = new_inst;
new_obj.back ().array_inst = new_inst.begin ();
new_obj.set_shape (*sh);
found = true;
}
}
++sh;
}
}
if (top_cell != std::numeric_limits <db::cell_index_type>::max ()) {
@ -1572,12 +1565,33 @@ Service::handle_guiding_shape_changes ()
// Currently there is not way to create such a configuration ...
}
// remove superfluous proxies
layout->cleanup ();
return std::make_pair (found, new_obj);
}
set_selection (new_sel.begin (), new_sel.end ());
bool
Service::handle_guiding_shape_changes ()
{
// just allow one guiding shape to be selected
if (m_selection.empty ()) {
return false;
}
return true;
std::pair<bool, lay::ObjectInstPath> gs = handle_guiding_shape_changes (*m_selection.begin ());
if (gs.first) {
// remove superfluous proxies
view ()->cellview (gs.second.cv_index ())->layout ().cleanup ();
// re-set the selection
std::vector<lay::ObjectInstPath> new_sel;
new_sel.push_back (gs.second);
set_selection (new_sel.begin (), new_sel.end ());
return true;
} else {
return false;
}
}

10
src/edt/edt/edtService.h
View File

@ -342,9 +342,19 @@ public:
* @brief Handle changes in the guiding shapes, i.e. create PCell variants
*
* @return true, if PCell's have been updated, indicating that our selection is no longer valid
*
* This version assumes there is only one guiding shape selected and will update the selection.
* It will also call layout.cleanup() if required.
*/
bool handle_guiding_shape_changes ();
/**
* @brief Handle changes in a specific guiding shape, i.e. create new PCell variants if required
*
* @return A pair of bool (indicating that the object path has changed) and the new guiding shape path
*/
std::pair<bool, lay::ObjectInstPath> handle_guiding_shape_changes (const lay::ObjectInstPath &obj) const;
protected:
/**
* @brief Update m_markers to reflect the selection