luke/klayout
1
0
Fork 0
mirror of https://github.com/KLayout/klayout.git synced 2026-09-06 09:17:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into lefdef-enhancments

Browse Source
This commit is contained in:
Matthias Koefferlein
2020-05-01 16:00:58 +02:00
parent 751340c963 86739794a0
commit 0e68b910fa
656 changed files with 29174 additions and 28910 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/streamers/dxf/db_plugin/dbDXFReader.cc
+2 -5
View File
@@ -1404,7 +1404,6 @@ DXFReader::read_entities (db::Layout &layout, db::Cell &cell, const db::DVector
std::string layer;
int flags = 0;
double width1 = 0.0, width2 = 0.0;
unsigned int got_width = 0;
double common_width1 = 0.0, common_width2 = 0.0;
unsigned int common_width_set = 0;
double ex = 0.0, ey = 0.0, ez = 1.0;
@@ -1415,6 +1414,7 @@ DXFReader::read_entities (db::Layout &layout, db::Cell &cell, const db::DVector
unsigned int xy_flags = 0;
double x = 0.0, y = 0.0;
unsigned int got_width = 0;
while ((g = read_group_code ()) != 0) {
@@ -1443,7 +1443,6 @@ DXFReader::read_entities (db::Layout &layout, db::Cell &cell, const db::DVector
if (got_width == 3) {
widths.push_back (std::make_pair (seg_start, width1));
widths.push_back (std::make_pair (points.size () - 1, width2));
got_width = 0;
}
got_width = 0;
@@ -1514,7 +1513,7 @@ DXFReader::read_entities (db::Layout &layout, db::Cell &cell, const db::DVector
const std::string &e = read_string (true);
if (e == "VERTEX") {
got_width = 0;
unsigned int got_width = 0;
double x = 0.0, y = 0.0;
double bnew = 0.0;
@@ -1549,7 +1548,6 @@ DXFReader::read_entities (db::Layout &layout, db::Cell &cell, const db::DVector
if (got_width == 3) {
widths.push_back (std::make_pair (seg_start, width1));
widths.push_back (std::make_pair (points.size () - 1, width2));
got_width = 0;
}
} else if (e == "SEQEND") {
@@ -2301,7 +2299,6 @@ DXFReader::read_entities (db::Layout &layout, db::Cell &cell, const db::DVector
// close previous loop if necessary
finish_loop (loop_start, iedges.size (), iedges);
loop_start = iedges.size ();
// create the polygons
std::pair <bool, unsigned int> ll = open_layer (layout, layer);
src/plugins/streamers/dxf/db_plugin/gsiDeclDbDXF.cc
+2 -1
View File
@@ -383,4 +383,5 @@ gsi::ClassExt<db::SaveLayoutOptions> dxf_writer_options (
""
);
}
}
src/plugins/streamers/oasis/db_plugin/gsiDeclDbOASIS.cc
+2 -1
View File
@@ -292,4 +292,5 @@ gsi::ClassExt<db::SaveLayoutOptions> oasis_writer_options (
""
);
}
}
src/plugins/tools/net_tracer/db_plugin/gsiDeclDbNetTracer.cc
+1
View File
@@ -1,3 +1,4 @@
/*
KLayout Layout Viewer