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

Bugfixes for XOR tool 

1.) Wrong scaling of output when using output to layout A or B and
    different DBU's were present
2.) A threading issue when delivering outputs to layout A or B resulting
    in random crashes and weired behavior. This happened when threading
    was enabled.
This commit is contained in:
Matthias Koefferlein 2017-07-18 23:31:09 +02:00
parent 45b774a3af
commit eb9363eca1
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ext/extXORToolDialog.cc
View File

@ -27,6 +27,7 @@
#include "dbShapeProcessor.h"
#include "dbRecursiveShapeIterator.h"
#include "dbClip.h"
#include "dbLayoutUtils.h"
#include "tlTimer.h"
#include "tlProgress.h"
#include "tlThreadedWorkers.h"
@ -436,7 +437,7 @@ public:
return m_tolerances;
}
const std::vector <std::vector <unsigned int> > sub_output_layers () const
const std::vector <std::vector <unsigned int> > &sub_output_layers () const
{
return m_sub_output_layers;
}
@ -490,7 +491,16 @@ public:
subcell = m_sub_cells[tol_index];
layout_layer = m_sub_output_layers[tol_index][layer_index];
subcell->shapes (layout_layer).insert (polygon);
double factor = 1.0;
if (subcell->layout ()) {
factor = dbu () / subcell->layout ()->dbu ();
}
if (tl::equal (factor, 1.0)) {
subcell->shapes (layout_layer).insert (polygon);
} else {
subcell->shapes (layout_layer).insert (db::Polygon (polygon * factor));
}
}
}
@ -1290,6 +1300,11 @@ XORToolDialog::run_xor ()
// into a global one ..
tl::RelativeProgress progress (tl::to_string (QObject::tr ("Performing ")) + op_name, todo_count, 1);
// We need to lock the layouts during the processing - in OMNewLayerA and OMNewLayerB mode
// we actually modify the layout we iterate over
db::LayoutLocker locker_a (& cva->layout ());
db::LayoutLocker locker_b (& cvb->layout ());
try {
job.start ();