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

Bugfix in the annotation area 

The annotation ID was taken from an object already deleted - on MSVC 
this becomes an issue.
This commit is contained in:
Matthias Köfferlein 2018-09-06 23:49:17 +02:00
parent ce01ce2dae
commit a78f75054a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ant/ant/antService.cc
View File

@ -921,7 +921,8 @@ Service::insert_ruler (const ant::Object &ruler, bool limit_number)
// create the ruler from the template
ant::Object *new_ruler = new ant::Object (ruler);
new_ruler->id (idmax + 1);
int new_id = idmax + 1;
new_ruler->id (new_id);
mp_view->annotation_shapes ().insert (db::DUserObject (new_ruler));
// delete surplus rulers
@ -929,7 +930,7 @@ Service::insert_ruler (const ant::Object &ruler, bool limit_number)
reduce_rulers (m_max_number_of_rulers);
}
return new_ruler->id ();
return new_id;
}
/**
@ -2082,10 +2083,12 @@ Service::change_ruler (obj_iterator pos, const ant::Object &to)
ant::Object *new_ruler = new ant::Object (to);
const ant::Object *current_ruler = dynamic_cast <const ant::Object *> (pos->ptr ());
tl_assert (current_ruler != 0);
new_ruler->id (current_ruler->id ());
int new_id = current_ruler->id ();
new_ruler->id (new_id);
mp_view->annotation_shapes ().replace (pos, db::DUserObject (new_ruler));
annotation_changed_event (new_ruler->id ());
annotation_changed_event (new_id);
// and make selection "visible"
selection_to_view ();

5
testdata/ruby/antTest.rb vendored
View File

@ -72,7 +72,7 @@ class RBA::Annotation
"diag_yx"
elsif s == OutlineBox
"diag_box"
else
else
""
end
end
@ -401,7 +401,7 @@ class Ant_TestClass < TestBase
lv = mw.current_view
aac = 0
ac = []
ac = []
asc = 0
lv.on_annotations_changed { aac += 1 }
lv.on_annotation_changed { |id| ac << id }
@ -533,4 +533,3 @@ class Ant_TestClass < TestBase
end
load("test_epilogue.rb")