Merge branch 'master' into 2.5d-view-devel

This commit is contained in:
Matthias Koefferlein
2020-08-30 23:40:54 +02:00
1156 changed files with 52326 additions and 35239 deletions
@@ -21,8 +21,8 @@
*/
#ifndef HDR_layDialogs
#define HDR_layDialogs
#ifndef HDR_layBooleanOperationsDialogs
#define HDR_layBooleanOperationsDialogs
#include "ui_BooleanOptionsDialog.h"
#include "ui_SizingOptionsDialog.h"
@@ -224,6 +224,10 @@ RdbDifferenceReceiver::produce_cell_inst (const db::CellInstArrayWithProperties
unsigned long amax, bmax;
if (ci.is_regular_array (a, b, amax, bmax)) {
r += tl::sprintf (" [a=%s, b=%s, na=%ld, nb=%ld]", a.to_string (), b.to_string (), amax, bmax);
} else if (ci.size () > 1) {
r += " (+";
r += tl::to_string (ci.size () - 1);
r += " irregular placements)";
}
item->add_value (r);
@@ -501,6 +501,13 @@ NetTracerTechnologyComponent::NetTracerTechnologyComponent (const NetTracerTechn
m_symbols = d.m_symbols;
}
NetTracerTechnologyComponent &NetTracerTechnologyComponent::operator= (const NetTracerTechnologyComponent &d)
{
m_connections = d.m_connections;
m_symbols = d.m_symbols;
return *this;
}
NetTracerData
NetTracerTechnologyComponent::get_tracer_data (const db::Layout &layout) const
{
@@ -375,6 +375,7 @@ public:
NetTracerTechnologyComponent ();
NetTracerTechnologyComponent (const NetTracerTechnologyComponent &d);
NetTracerTechnologyComponent &operator= (const NetTracerTechnologyComponent &d);
const_iterator begin () const
{
@@ -1,3 +1,4 @@
/*
KLayout Layout Viewer