libetherpix

@@ -29,6 +29,11 @@ Chain::Chain(unsigned int pixelCnt):

 {

 }

+void Chain::addPixel(Pixel const &pixel)

+{

+  mPixels.push_back(pixel);

+}

+

 int Chain::pixCoord(const Point &pix0, const Point &pixSz,

                     unsigned int width, unsigned int height,

                     unsigned int distriNo, unsigned int chainNo)

@@ -29,11 +29,13 @@

 class Chain {

 public:

   Chain(unsigned int pixelCnt);

+  void addPixel(Pixel const &pixel);

   int pixCoord(const Point &pix0, const Point &pixSz,

                unsigned int width, unsigned int height,

                unsigned int distriNo, unsigned int chainNo);

   void writePixels(std::ostream & strm) const;

   size_t countPixels() const;

+private:

   unsigned int mPixelCnt;

   std::vector<Pixel> mPixels;

 };

@@ -31,6 +31,21 @@ Distri::Distri(unsigned int no, unsigned int chainCnt, unsigned int pixelCnt):

 {

 }

+unsigned int Distri::getNo() const

+{

+  return mNo;

+}

+

+void Distri::addChain(Chain const &chain)

+{

+  mChains.push_back(chain);

+}

+

+Chain & Distri::accessLastChain()

+{

+  return mChains.back();

+}

+

 int Distri::pixCoord(const Point &pix0, const Point &pixSz,

                      unsigned int width, unsigned int height)

 {

@@ -29,12 +29,16 @@

 class Distri {

 public:

   Distri(unsigned int no, unsigned int chainCnt, unsigned int pixelCnt);

+  unsigned int getNo() const;

+  void addChain(Chain const &chain);

+  Chain & accessLastChain();

   int pixCoord(const Point &pix0, const Point &pixSz,

                unsigned int width, unsigned int height);

   void writeDistri(std::ostream & strm) const;

   void writeMapping(std::ostream & strm) const;

   void writePixels(std::ostream & strm) const;

   size_t countPixels() const;

+private:

   unsigned int mNo, mChainCnt, mPixelCnt;

   std::vector<Chain> mChains;

 };

@@ -252,7 +252,7 @@ int createChain(Chain &chain, const Object *pObjCable)

     pObjPixel = intersectsPixels[0].pObj;

     // add pixel to chain

-    chain.mPixels.push_back(Pixel(pObjPixel));

+    chain.addPixel(Pixel(pObjPixel));

     // find cables connected to pixel

     std::vector<Layer::Intersection> intersectsCables;

@@ -305,7 +305,7 @@ int createDistri(Distri &distri, const Layer *pLayer, unsigned int pixels)

 {

   // must have exactly one object

   if (pLayer->mObjects.size() != 1) {

-    std::cerr << "layer of distributor " << std::hex << distri.mNo

+    std::cerr << "layer of distributor " << std::hex << distri.getNo()

               << "contains no object or multiple objects" << std::endl;

     return -1;

   }

@@ -315,7 +315,7 @@ int createDistri(Distri &distri, const Layer *pLayer, unsigned int pixels)

   std::vector<Layer::Intersection> intersectsNet;

   gLayerNetwork.getIntersections(pObjDistri, intersectsNet);

   if (intersectsNet.size() != 1) {

-    std::cerr << "distributor " << std::hex << distri.mNo

+    std::cerr << "distributor " << std::hex << distri.getNo()

               << "has no network connection or multiple network connections"

               << std::endl;

     return -1;

@@ -338,8 +338,8 @@ int createDistri(Distri &distri, const Layer *pLayer, unsigned int pixels)

   bool err = false;

   for (itIntersect = intersectsCables.begin();

        itIntersect != intersectsCables.end(); ++itIntersect) {

-    distri.mChains.push_back(Chain(pixels));

-    if (createChain(distri.mChains.back(), itIntersect->pObj) != 0)

+    distri.addChain(Chain(pixels));

+    if (createChain(distri.accessLastChain(), itIntersect->pObj) != 0)

       err = true;

   }

@@ -31,6 +31,7 @@ public:

   int pixCoord(const Point &pix0, const Point &pixSz,

                unsigned int width, unsigned int height);

   void writePixel(std::ostream & strm) const;

+private:

   const Object *mpObjPixel;

   unsigned int mX, mY;

 };