libetherpix

@@ -1 +1,2 @@

 /*.etp

+/*.etps

@@ -1,6 +1,7 @@

 DRAWINGS := $(wildcard *.dxf)

 CONFIGS := $(DRAWINGS:.dxf=.etp)

+SIMCONFIGS := $(DRAWINGS:.dxf=.etps)

 CFGGEN := ../src/etherpix_config_gen

@@ -8,11 +9,11 @@ CFGGEN := ../src/etherpix_config_gen

 .SUFFIXES:

 .SECONDARY:

-all: $(CONFIGS)

+all: $(CONFIGS) $(SIMCONFIGS)

-%.etp: %.dxf $(CFGGEN)

-	$(CFGGEN) $< $@

+%.etp %.etps: %.dxf $(CFGGEN)

+	$(CFGGEN) -d $< -c $*.etp -s $*.etps

 clean:

-	rm -f $(CONFIGS)

+	rm -f $(CONFIGS) $(SIMCONFIGS)

@@ -103,3 +103,18 @@ bool Box::getIntersection(const Box *pBox, Box *pIntersect) const

   return true;

 }

+void Box::getRelative(const Point &abs, Point &rel) const

+{

+  Point delta = mTR - mBL;

+  if (delta.mX > 0.0) {

+    rel.mX = (abs.mX - mBL.mX) / delta.mX;

+  } else {

+    rel.mX = 0.0; // box width zero - relative position cannot be computed

+  }

+  if (delta.mY > 0.0) {

+    rel.mY = (abs.mY - mBL.mY) / delta.mY;

+  } else {

+    rel.mY = 0.0; // box height zero - relative position cannot be computed

+  }

+}

+

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

   void include(const Box &b);

   bool isIntersecting(const Box *pBox) const;

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

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

   Point mBL, mTR;

 };

@@ -60,6 +60,13 @@ void Chain::writePixels(std::ostream & strm) const

     itP->writePixel(strm);

 }

+void Chain::writeSimPixels(std::ostream & strm, const Box & boundsVideo) const

+{

+  std::vector<Pixel>::const_iterator itP;

+  for (itP = mPixels.begin(); itP != mPixels.end(); ++itP)

+    itP->writeSimPixel(strm, boundsVideo);

+}

+

 size_t Chain::countPixels() const

 {

   return mPixels.size();

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

                unsigned int width, unsigned int height,

                unsigned int distriNo, unsigned int chainNo);

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

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

   size_t countPixels() const;

 private:

   unsigned int mPixelCnt;

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

   }

 }

+void Distri::writeSimPixels(std::ostream & strm, const Box & boundsVideo) 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);

+    strm << std::endl;

+  }

+}

+

 size_t Distri::countPixels() const

 {

   size_t pixels = 0;

@@ -45,6 +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;

   size_t countPixels() const;

 private:

   unsigned int mNo, mChainCnt, mPixelCnt;

@@ -421,15 +421,15 @@ static int createDistri(Distri &distri, const Layer *pLayer,

  * @param[in] chains number of chains (outputs) per distributor

  * @param[in] pixels number of pixels in one chain

  *                                    (i.e. connected to one output)

+ * @param[out] boundsVideo bounds of video screen object

  * @param[out] distris distributor objects

  * @return true on success, false on error

  */

 static bool makeObjects(unsigned int width, unsigned int height,

                         unsigned int chains, unsigned int pixels,

-                        std::vector<Distri> &distris)

+                        Box &boundsVideo, std::vector<Distri> &distris)

 {

   // get origin and size of pixels in video

-  Box boundsVideo;

   gLayerVideo.getBounds(boundsVideo);

   Point ptPixel0(boundsVideo.mBL.mX, boundsVideo.mTR.mY);

   Point ptPixelSz = boundsVideo.mTR - boundsVideo.mBL;

@@ -484,6 +484,7 @@ static bool makeObjects(unsigned int width, unsigned int height,

  * @param[in] width width of video in pixels

  * @param[in] height height of video in pixels

  * @param[in] distris distributor objects

+ * @param[in] strCfgFileName name of config file

  * @reutrn SUCCESS on success, other value on error

  */

 static int writeCfg(unsigned int width, unsigned int height,

@@ -522,6 +523,45 @@ static int writeCfg(unsigned int width, unsigned int height,

   return SUCCESS;

 }

+/**

+ * @brief write simulator config file

+ * @param[in] distris distributor objects

+ * @param[in] boundsVideo bounds of video screen object

+ * @param[in] strSimCfgFileName name of simulator config file

+ * @reutrn SUCCESS on success, other value on error

+ */

+static int writeSimCfg(const std::vector<Distri> &distris,

+                       const Box & boundsVideo,

+                       const std::string & strSimCfgFileName)

+{

+  // open output file

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

+  if (!strm.is_open()) {

+    std::cerr << "could not open \"" << strSimCfgFileName

+              << "\" for wrinting" << std::endl;

+    return ERR_FILE_OPEN;

+  }

+

+  // distributors

+  std::vector<Distri>::const_iterator itD;

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

+    itD->writeDistri(strm);

+  strm << std::endl;

+

+  // mappings

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

+    itD->writeMapping(strm);

+  strm << std::endl;

+

+  // simulated pixels

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

+    itD->writeSimPixels(strm, boundsVideo);

+  strm << std::endl;

+

+  strm.close();

+  return SUCCESS;

+}

+

 /**

  * @brief main program

  * @param[in] argc number of parameters

@@ -531,17 +571,67 @@ static int writeCfg(unsigned int width, unsigned int height,

 int main(int argc, char *argv[])

 {

   // get parameters

-  if (argc != 3) {

+  bool arg_err = 0, bDxfFileName = false, bCfgFileName = false,

+                    bSimCfgFileName= false;

+  std::string strDxfFileName, strCfgFileName, strSimCfgFileName;

+  // old usage

+  if (argc == 3) {

+    std::cerr << "warning: old usage, consider using \"-d\" and \"-c\" options" << std::endl;

+    strDxfFileName = argv[1];

+    bDxfFileName = true;

+    strCfgFileName = argv[2];

+    bCfgFileName = true;

+  } else {

+    int argi;

+    for (argi = 1; argi < argc; ++argi) {

+      if (strcmp(argv[argi], "-c") == 0) {

+        ++argi;

+        if (argi < argc) {

+          strCfgFileName = argv[argi];

+          bCfgFileName = true;

+        } else {

+          std::cerr << "error: missing argument for \"-c\"" << std::endl;

+        }

+      } else if (strcmp(argv[argi], "-d") == 0) {

+        ++argi;

+        if (argi < argc) {

+          strDxfFileName = argv[argi];

+          bDxfFileName = true;

+        } else {

+          std::cerr << "error: missing argument for \"-d\"" << std::endl;

+        }

+      } else if (strcmp(argv[argi], "-s") == 0) {

+        ++argi;

+        if (argi < argc) {

+          strSimCfgFileName = argv[argi];

+          bSimCfgFileName = true;

+        } else {

+          std::cerr << "error: missing argument for \"-s\"" << std::endl;

+        }

+      } else {

+        std::cerr << "error: unknown option \"" << argv[argi] << "\", call without arguments for usage" << std::endl;

+        arg_err = true;

+      }

+    } // for argi

+    if (! bDxfFileName) {

+      std::cerr << "error: missing input drawing (\"-d\")" << std::endl;

+      arg_err = true;

+    }

+  }

+  // output help on error

+  if (arg_err) {

     std::cerr << "EtherPix config file generator "

               << ETPCG_VER_MAJ << "."

               << ETPCG_VER_MIN << "."

               << ETPCG_VER_REV << std::endl

-              << "usage: " << argv[0] << " <schematic_drawing.dxf> <config.etp>"

+              << "usage: " << argv[0] << " [options]" << std::endl

+              << "options: -c <config.etp>       configuration file (output)" << std::endl

+              << "         -d <drawing.dxf>      schematic drawing (input)" << std::endl

+              << "         -s <sim_config.etps>  simulator configuration (output)" << std::endl

+              << "old usage: " << argv[0] << " <schematic_drawing.dxf> <config.etp>"

               << std::endl;

     return ERR_USAGE;

   }

-  std::string strDxfFileName = argv[1];

-  std::string strCfgFileName = argv[2];

   // read DXF file

   unsigned int width, height, chains, pixels;

@@ -551,16 +641,27 @@ int main(int argc, char *argv[])

   }

   // make config file objects from DXF layers

+  Box boundsVideo;

   std::vector<Distri> distris;

-  if (! makeObjects(width, height, chains, pixels, distris)) {

+  if (! makeObjects(width, height, chains, pixels, boundsVideo, distris)) {

     return ERR_PROC;

   }

   // write config file

+  if (bCfgFileName) {

     ret = writeCfg(width, height, distris, strCfgFileName);

     if ( ret != SUCCESS) {

       return ret;

     }

+  }

+

+  // write simulator config file

+  if (bSimCfgFileName) {

+    ret = writeSimCfg(distris, boundsVideo, strSimCfgFileName);

+    if ( ret != SUCCESS) {

+      return ret;

+    }

+  }

   return SUCCESS;

 }

@@ -35,19 +35,17 @@ int Pixel::pixCoord(const Point &pix0, const Point &pixSz,

                     unsigned int width, unsigned int height)

 {

   // get center of pixel

-  Box bounds;

-  mpObjPixel->getBounds(bounds);

-  Point pt;

-  bounds.getCenter(pt);

+  mpObjPixel->getBounds(mBounds);

+  mBounds.getCenter(mCenter);

   // get coordinates of pixel

-  Point delta = pt - pix0;

+  Point delta = mCenter - pix0;

   mX = (unsigned int)(delta.mX / pixSz.mX);

   mY = (unsigned int)(delta.mY / pixSz.mY);

   // check pixel coordinates

   if (mX >= width || mY >= height) {

-    std::cerr << "pixel at " << pt.mX << "," << pt.mY

+    std::cerr << "pixel at " << mCenter.mX << "," << mCenter.mY

               << " is out of video frame (" << mX << "," << mY << ")"

               << std::endl;

     return -1;

@@ -60,3 +58,15 @@ void Pixel::writePixel(std::ostream & strm) const

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

 }

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

+{

+  Point c, bl, tr;

+  boundsVideo.getRelative(mCenter, c);

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

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

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

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

+  double r = r1 > r2 ? r1 : r2;

+  strm << " " << c.mX << "," << c.mY << "," << r;

+}

+

@@ -22,6 +22,7 @@

 #include <iostream>

+#include "box.h"

 #include "object.h"

 #include "point.h"

@@ -39,8 +40,11 @@ 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;

 private:

   const Object *mpObjPixel;

+  Box mBounds;

+  Point mCenter;

   unsigned int mX, mY;

 };