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

pull_interacting and interacting/not_interacting for region/text combinations in DRC.

This commit is contained in:
Matthias Koefferlein 2020-05-16 00:18:54 +02:00
parent 33a909a327
commit ad0cd2f10c
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/drc/drc/built-in-macros/_drc_layer.rb
View File

@ -1740,6 +1740,8 @@ CODE
requires_edges_texts_or_region("#{f}") requires_edges_texts_or_region("#{f}")
if @data.is_a?(RBA::Text) if @data.is_a?(RBA::Text)
other.requires_region("#{f}") other.requires_region("#{f}")
elsif @data.is_a?(RBA::Region)
other.requires_edges_texts_or_region("#{f}")
else else
other.requires_edges_or_region("#{f}") other.requires_edges_or_region("#{f}")
end end
@ -1786,10 +1788,12 @@ CODE
eval <<"CODE" eval <<"CODE"
def #{f}(other) def #{f}(other)
other.requires_edges_texts_or_region("#{f}") other.requires_edges_texts_or_region("#{f}")
if @data.is_a?(RBA::Texts) if @data.is_a?(RBA::Text)
other.requires_region("#{f}") other.requires_region("#{f}")
elsif @data.is_a?(RBA::Region)
other.requires_edges_texts_or_region("#{f}")
else else
requires_edges_or_region("#{f}") other.requires_edges_or_region("#{f}")
end end
DRCLayer::new(@engine, @engine._tcmd(@data, 0, @data.class, :#{f}, other.data)) DRCLayer::new(@engine, @engine._tcmd(@data, 0, @data.class, :#{f}, other.data))
end end
@ -1822,12 +1826,7 @@ CODE
def #{f}(other) def #{f}(other)
other.requires_region("#{f}") other.requires_region("#{f}")
requires_edges("#{f}") requires_edges("#{f}")
if @engine.is_tiled? DRCLayer::new(@engine, @engine._tcmd(@data, 0, @data.class, :#{f}, other.data))
@data = @engine._tcmd(@data, 0, @data.class, :#{f}, other.data)
DRCLayer::new(@engine, @data)
else
DRCLayer::new(@engine, @engine._tcmd(@data, 0, @data.class, :#{f}, other.data))
end
end end
CODE CODE
end end
@ -1837,12 +1836,7 @@ CODE
def #{f}(other) def #{f}(other)
other.requires_edges("#{f}") other.requires_edges("#{f}")
requires_edges("#{f}") requires_edges("#{f}")
if @engine.is_tiled? DRCLayer::new(@engine, @engine._tcmd(@data, 0, @data.class, :#{f}, other.data))
@data = @engine._tcmd(@data, 0, @data.class, :#{f}, other.data)
DRCLayer::new(@engine, @data)
else
DRCLayer::new(@engine, @engine._tcmd(@data, 0, @data.class, :#{f}, other.data))
end
end end
CODE CODE
end end