libetherpix

@@ -118,3 +118,13 @@ void Box::getRelative(const Point &abs, Point &rel) const

   }

 }

+/// expand box (centered) in order to make it quadratic

+Box Box::expandQuadratic() const

+{

+  Point delta = mTR - mBL;

+  double max = delta.mX > delta.mY ? delta.mX : delta.mY;

+  Point fix(max - delta.mX, max - delta.mY);

+  fix *= 0.5;

+  return Box(mTR + fix, mBL - fix);

+}

+

@@ -33,6 +33,8 @@ public:

   bool isIntersecting(const Box *pBox) const;

   bool getIntersection(const Box *pBox, Box *pIntersect) const;

   void getRelative(const Point &abs, Point &rel) const;

+  /// expand box (centered) in order to make it quadratic

+  Box expandQuadratic() const;

   Point mBL, mTR;

 };

@@ -88,13 +88,14 @@ void Distri::writePixels(std::ostream & strm) const

   }

 }

-void Distri::writeSimPixels(std::ostream & strm, const Box & boundsVideo) const

+void Distri::writeSimPixels(std::ostream & strm,

+                            const Box & boundsVideoQuad) const

 {

   std::vector<Chain>::const_iterator itC;

   unsigned int c;

   for (itC = mChains.begin(), c = 0; itC != mChains.end(); ++itC, ++c) {

     strm << "output " << mNo << "," << c << " =";

-    itC->writeSimPixels(strm, boundsVideo);

+    itC->writeSimPixels(strm, boundsVideoQuad);

     strm << std::endl;

   }

 }

@@ -45,7 +45,7 @@ public:

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

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

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

-  void writeSimPixels(std::ostream & strm, const Box & boundsVideo) const;

+  void writeSimPixels(std::ostream & strm, const Box & boundsVideoQuad) const;

   size_t countPixels() const;

 private:

   unsigned int mNo, mChainCnt, mPixelCnt;

@@ -534,6 +534,10 @@ static int writeSimCfg(const std::vector<Distri> &distris,

                        const Box & boundsVideo,

                        const std::string & strSimCfgFileName)

 {

+  /* make video bounds quadratic

+     in order to keep aspect ratio of simulator image */

+  Box boundsVideoQuad = boundsVideo.expandQuadratic();

+

   // open output file

   std::ofstream strm(strSimCfgFileName.c_str(), std::ios::out);

   if (!strm.is_open()) {

@@ -555,7 +559,7 @@ static int writeSimCfg(const std::vector<Distri> &distris,

   // simulated pixels

   for (itD = distris.begin(); itD != distris.end(); ++itD)

-    itD->writeSimPixels(strm, boundsVideo);

+    itD->writeSimPixels(strm, boundsVideoQuad);

   strm << std::endl;

   strm.close();

@@ -58,12 +58,13 @@ void Pixel::writePixel(std::ostream & strm) const

   strm << " " << mX << "," << mY;

 }

-void Pixel::writeSimPixel(std::ostream & strm, const Box & boundsVideo) const

+void Pixel::writeSimPixel(std::ostream & strm,

+                          const Box & boundsVideoQuad) const

 {

   Point c, bl, tr;

-  boundsVideo.getRelative(mCenter, c);

-  boundsVideo.getRelative(mBounds.mBL, bl);

-  boundsVideo.getRelative(mBounds.mTR, tr);

+  boundsVideoQuad.getRelative(mCenter, c);

+  boundsVideoQuad.getRelative(mBounds.mBL, bl);

+  boundsVideoQuad.getRelative(mBounds.mTR, tr);

   double r1 = (c - bl).abs();

   double r2 = (c - tr).abs();

   double r = r1 > r2 ? r1 : r2;

@@ -40,7 +40,7 @@ public:

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

                unsigned int width, unsigned int height);

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

-  void writeSimPixel(std::ostream & strm, const Box & boundsVideo) const;

+  void writeSimPixel(std::ostream & strm, const Box & boundsVideoQuad) const;

 private:

   const Object *mpObjPixel;

   Box mBounds;