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

Fixed generic DRC checks with == operations - this was sometimes not capturing the relevant cases.

This commit is contained in:
Matthias Koefferlein 2021-12-26 21:23:58 +01:00
parent 92f6f2fb67
commit 029b7b9410
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/drc/drc/built-in-macros/_drc_complex_ops.rb
View File

@ -1903,9 +1903,12 @@ class DRCOpNodeCheck < DRCOpNodeWithCompare
end end
if self.gt || self.ge if self.gt || self.ge
dmax = self.ge ? @engine._make_value(self.ge) : @engine._make_value(self.gt) + 1 if ! res
max_check = RBA::CompoundRegionOperationNode::send(factory, *(oargs + [ dmax ] + self.args + [ true ])) dmax = self.ge ? @engine._make_value(self.ge) : @engine._make_value(self.gt) + 1
if res res = RBA::CompoundRegionOperationNode::send(factory, *(oargs + [ dmax ] + self.args + [ true ]))
elsif self.mode_or
dmax = self.ge ? @engine._make_value(self.ge) : @engine._make_value(self.gt) + 1
max_check = RBA::CompoundRegionOperationNode::send(factory, *(oargs + [ dmax ] + self.args + [ true ]))
if self.check == :width || self.check == :notch if self.check == :width || self.check == :notch
# Same polygon check - we need to take both edges of the result # Same polygon check - we need to take both edges of the result
other = RBA::CompoundRegionOperationNode::new_edges(res) other = RBA::CompoundRegionOperationNode::new_edges(res)
@ -1913,13 +1916,18 @@ class DRCOpNodeCheck < DRCOpNodeWithCompare
other = RBA::CompoundRegionOperationNode::new_edge_pair_to_first_edges(res) other = RBA::CompoundRegionOperationNode::new_edge_pair_to_first_edges(res)
end end
res_max = RBA::CompoundRegionOperationNode::new_edge_pair_to_first_edges(max_check) res_max = RBA::CompoundRegionOperationNode::new_edge_pair_to_first_edges(max_check)
if self.mode_or res = RBA::CompoundRegionOperationNode::new_join([ other, res_max ])
res = RBA::CompoundRegionOperationNode::new_join([ other, res_max ])
else
res = RBA::CompoundRegionOperationNode::new_geometrical_boolean(RBA::CompoundRegionOperationNode::GeometricalOp::And, other, res_max)
end
else else
res = max_check dmax = self.ge ? @engine._make_value(self.ge) : @engine._make_value(self.gt) + 1
max_check_for_not = RBA::CompoundRegionOperationNode::send(factory, *(oargs + [ dmax ] + self.args))
if self.check == :width || self.check == :notch
# Same polygon check - we need to take both edges of the result
other = RBA::CompoundRegionOperationNode::new_edges(res)
else
other = RBA::CompoundRegionOperationNode::new_edge_pair_to_first_edges(res)
end
res_max_for_not = RBA::CompoundRegionOperationNode::new_edges(max_check_for_not)
res = RBA::CompoundRegionOperationNode::new_geometrical_boolean(RBA::CompoundRegionOperationNode::GeometricalOp::Not, other, res_max_for_not)
end end
end end