[kicad:model] Renamed Pin::layer to Pin::unit to unify with Draw::unit and kicad naming

Author: sebcaux

src/kicad/model/pin.cpp

@@ -25,7 +25,7 @@ Pin::Pin()
       _pinType(Pin::Normal),
       _electricalType(Pin::Input)
 {
-    _layer = 1;
+    _unit = 1;
     _length = 300;
     _textNameSize = 50;
     _textPadSize = 50;
@@ -39,7 +39,7 @@ Pin::Pin(const QString &name, const QString &padName)
       _pinType(Pin::Normal),
       _electricalType(Pin::Input)
 {
-    _layer = 1;
+    _unit = 1;
     _length = 300;
     _textNameSize = 50;
     _textPadSize = 50;
@@ -59,7 +59,7 @@ Pin::Pin(const Pin &other)
     _direction = other._direction;
     _pinType = other._pinType;
     _electricalType = other._electricalType;
-    _layer = other._layer;
+    _unit = other._unit;
     _length = other._length;
 
     _textNameSize = other._textNameSize;
@@ -215,16 +215,16 @@ void Pin::setTextPadSize(int textPadSize)
     }
 }
 
-int Pin::layer() const
+int Pin::unit() const
 {
-    return _layer;
+    return _unit;
 }
 
-void Pin::setLayer(int layer)
+void Pin::setUnit(int unit)
 {
-    if (layer > 0)
+    if (unit > 0)
     {
-        _layer = layer;
+        _unit = unit;
     }
 }
 

src/kicad/model/pin.h

@@ -99,8 +99,8 @@ class KICAD_EXPORT Pin
     int textPadSize() const;
     void setTextPadSize(int textPadSize);
 
-    int layer() const;  // change to unit
-    void setLayer(int layer);
+    int unit() const;
+    void setUnit(int unit);
 
     int length() const;
     void setLength(int length);
@@ -123,7 +123,7 @@ class KICAD_EXPORT Pin
     ElectricalType _electricalType;
     int _textNameSize;
     int _textPadSize;
-    int _layer;
+    int _unit;
     int _length;
 
     QString _className;

src/kicad/parser/kicadlibparser.cpp

@@ -230,7 +230,7 @@ void KicadLibParser::writePin(Pin *pin)
             << " "  // name text size
             << "50"
             << " "  // pad name text size
-            << pin->layer() << " "
+            << pin->unit() << " "
             << "1"
             << " " << pinElectricalTypeString(pin->electricalType());
     if (pin->pinType() != Pin::Normal)
@@ -641,7 +641,7 @@ Pin *KicadLibParser::readPin()
         delete pin;
         return nullptr;
     }
-    pin->setLayer(layer);
+    pin->setUnit(layer);
 
     QString dummy;
     _stream.skipWhiteSpace();

src/kicad/pinruler/pinruler.cpp

@@ -70,7 +70,7 @@ void PinRuler::organize(Component *component)
         }
         else
         {
-            pin->setLayer(1);
+            pin->setUnit(1);
             QString className;  // = rules.first()->className(pin->name());
             for (PinRule *rule : rules)
             {

src/kicad/viewer/componentitem.cpp

@@ -27,9 +27,9 @@
 
 const int ComponentItem::ratio = 5;
 
-ComponentItem::ComponentItem(Component *component, int layer)
+ComponentItem::ComponentItem(Component *component, int unit)
 {
-    setComponent(component, layer);
+    setComponent(component, unit);
     _showElectricalType = true;
 }
 
@@ -50,16 +50,16 @@ Component *ComponentItem::component() const
     return _component;
 }
 
-void ComponentItem::setComponent(Component *component, int layer)
+void ComponentItem::setComponent(Component *component, int unit)
 {
     prepareGeometryChange();
     _component = component;
     _pinItemMap.clear();
-    _layer = layer;
+    _unit = unit;
 
     for (Pin *pin : component->pins())
     {
-        if (pin->layer() == _layer || pin->layer() == 0)
+        if (pin->unit() == _unit || pin->unit() == 0)
         {
             PinItem *pinItem = new PinItem(pin);
             pinItem->setParentItem(this);
@@ -68,7 +68,7 @@ void ComponentItem::setComponent(Component *component, int layer)
     }
     for (Draw *draw : component->draws())
     {
-        if (draw->unit() == _layer || draw->unit() == 0)
+        if (draw->unit() == _unit || draw->unit() == 0)
         {
             DrawItem *drawItem = DrawItem::fromDraw(draw);
             if (drawItem != nullptr)

src/kicad/viewer/componentitem.h

@@ -31,7 +31,7 @@ class PinItem;
 class KICAD_EXPORT ComponentItem : public QGraphicsItem
 {
 public:
-    ComponentItem(Component *component = nullptr, int layer = 1);
+    ComponentItem(Component *component = nullptr, int unit = 1);
 
     enum
     {
@@ -46,7 +46,7 @@ class KICAD_EXPORT ComponentItem : public QGraphicsItem
     QRectF boundingRect() const override;
 
     Component *component() const;
-    void setComponent(Component *component, int layer = 1);
+    void setComponent(Component *component, int unit = 1);
 
     PinItem *pinItem(Pin *pin);
     void removePin(Pin *pin);
@@ -58,7 +58,7 @@ class KICAD_EXPORT ComponentItem : public QGraphicsItem
 
 private:
     Component *_component;
-    int _layer;
+    int _unit;
     bool _showElectricalType;
 
     QRectF _numRect;