libetherpix

@@ -35,6 +35,13 @@

 #include "pixel.h"

 #include "point.h"

+#define SUCCESS (0) // no error

+#define ERR_USAGE (2) // invalid command line arguments

+#define ERR_FILE_OPEN (3) // could not open input/output file

+#define ERR_FILE_READ (4) // could not read input file

+#define ERR_FILE_PROC (5) // could not process input file

+#define ERR_PROC (5) // error in processing of objects found in input file

+

 // layers of drawing

 Layer gLayerVideo, gLayerPixel, gLayerNetwork;

 std::map<unsigned int, Layer> gLayerCables, gLayerDistributors;

@@ -209,11 +216,71 @@ static bool cbEntity(const class dimeState * const state,

   return true;

 }

+/**

+ * @brief read a DXF file and process objects found in it

+ * @param[in] strDxfFileName name of DXF file

+ * @param[out] width width of logical video frame

+ * @param[out] height height of logical video frame

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

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

+ *                                    (i.e. connected to one output)

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

+ */

+static int readDXF(std::string const &strDxfFileName,

+                   unsigned int &width, unsigned int &height,

+                   unsigned int &chains, unsigned int &pixels)

+{

+  // read DXF file

+  dimeInput in;

+  if (!in.setFile(strDxfFileName.c_str())) {

+    std::cerr << "error opening file \"" << strDxfFileName

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

+    return ERR_FILE_OPEN;

+  }

+  dimeModel model;

+  if (!model.read(&in)) {

+    std::cerr << "DXF read error in line " << in.getFilePosition()

+              << " of file \"" << strDxfFileName << "\""

+              << std::endl;

+    return ERR_FILE_READ;

+  }

+

+  // get configuration from layers

+  if (! get_config(model, width, height, chains, pixels)) {

+    return ERR_FILE_PROC;

+  }

+

+  // enumerate all entities

+  model.traverseEntities(cbEntity, NULL);

+

+  // merge all cable layers

+  std::map<unsigned int, Layer>::iterator itCable;

+  for (itCable = gLayerCables.begin();

+       itCable != gLayerCables.end(); ++itCable)

+  gLayerCable.merge(&itCable->second);

+  // gLayerCables[] is now empty and will not be used any more

+

+  // output object count information

+  std::cout << "object counts:" << std::endl;

+  std::cout << "  video: " << gLayerVideo.mObjects.size() << std::endl;

+  std::cout << "  pixel: " << gLayerPixel.mObjects.size() << std::endl;

+  std::cout << "  cable: " << gLayerCable.mObjects.size() << std::endl;

+  std::cout << "  network: " << gLayerNetwork.mObjects.size() << std::endl;

+  std::cout << "  distributor:" << std::endl;

+  std::map<unsigned int, Layer>::const_iterator itDistri;

+  for (itDistri = gLayerDistributors.begin();

+       itDistri != gLayerDistributors.end(); ++itDistri)

+    std::cout << "    " << itDistri->first << ": "

+              << itDistri->second.mObjects.size() << std::endl;

+

+  return SUCCESS;

+}

+

 /**

  * @brief create a chain

  * @param[in] chain chain to create

  * @param[in] pObjCable cable to first pixel

- * @return 0 on success, -1 on error

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

  */

 static int createChain(Chain &chain, const Object *pObjCable)

 {

@@ -238,14 +305,14 @@ static int createChain(Chain &chain, const Object *pObjCable)

     // end of chain

     if (intersectsPixels.size() < 1)

-      return 0;

+      return SUCCESS;

     // more than one next pixel

     if (intersectsPixels.size() > 1) {

       std::cerr << "pixel cable connects multiple pixels ("

                 << intersectsPixels[0].pt.mX << ","

                 << intersectsPixels[0].pt.mY << ")" << std::endl;

-      return -1;

+      return ERR_PROC;

     }

     // pixel found

@@ -271,14 +338,14 @@ static int createChain(Chain &chain, const Object *pObjCable)

     // end of chain

     if (intersectsCables.size() < 1)

-      return 0;

+      return SUCCESS;

     // more than one next pixel

     if (intersectsCables.size() > 1) {

       std::cerr << "pixel connected to multiple pixel cables ("

                 << intersectsCables[0].pt.mX << ","

                 << intersectsCables[0].pt.mY << ")" << std::endl;

-      return -1;

+      return ERR_PROC;

     }

     // next cable found

@@ -299,7 +366,7 @@ static bool intersectsCablesSort(const Layer::Intersection& i1,

  * @param[in] distri distributor to create

  * @param[in] pLayer layer containing distributor

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

- * @return 0 on success, -1 on error

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

  */

 static int createDistri(Distri &distri, const Layer *pLayer,

                         unsigned int pixels)

@@ -308,7 +375,7 @@ static int createDistri(Distri &distri, const Layer *pLayer,

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

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

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

-    return -1;

+    return ERR_PROC;

   }

   const Object *pObjDistri = pLayer->mObjects[0];

@@ -319,7 +386,7 @@ static int createDistri(Distri &distri, const Layer *pLayer,

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

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

               << std::endl;

-    return -1;

+    return ERR_PROC;

   }

   Point ptNetwork = intersectsNet[0].pt;

@@ -344,7 +411,72 @@ static int createDistri(Distri &distri, const Layer *pLayer,

       err = true;

   }

-  return err ? -1 : 0;

+  return err ? ERR_PROC : SUCCESS;

+}

+

+/**

+ * @brief make config file object from DXF layers

+ * @param[in] width width of logical video frame

+ * @param[in] height height of logical video frame

+ * @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] 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)

+{

+  // 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;

+  ptPixelSz.mX /= (double)width;

+  ptPixelSz.mY /= (double)height;

+  ptPixelSz.mY *= -1;

+  std::cout << "video bounds: "

+            << boundsVideo.mBL.mX << "," << boundsVideo.mBL.mY

+            << " " << boundsVideo.mTR.mX << "," << boundsVideo.mTR.mY

+            << std::endl;

+

+  // create distributors

+  bool ok = true;

+  std::map<unsigned int, Layer>::const_iterator itDistri;

+  for (itDistri = gLayerDistributors.begin();

+       itDistri != gLayerDistributors.end(); ++itDistri) {

+    distris.push_back(Distri(itDistri->first, chains, pixels));

+    if (createDistri(distris.back(), &itDistri->second, pixels) != SUCCESS) {

+      ok = false;

+    }

+  }

+

+  // obtain pixel coordinates

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

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

+    if (itD->pixCoord(ptPixel0, ptPixelSz, width, height) != 0)

+      ok = false;

+

+  // count pixels connected to distributors and compare to total pixels

+  size_t distri_pixels = 0;

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

+    distri_pixels += itD->countPixels();

+  std::cout << "pixels connected to distributors: "

+            << distri_pixels << std::endl;

+  if (distri_pixels != gLayerPixel.mObjects.size()) {

+    std::cerr << "number of connected pixels (" << distri_pixels

+              << ") does not match total number of pixels ("

+              << gLayerPixel.mObjects.size() << ")" << std::endl;

+    ok = false;

+  }

+

+  // output extra error message if errors were detected

+  if (! ok) {

+    std::cerr << "ERRORs were found" << std::endl;

+  }

+

+  return ok;

 }

 /**

@@ -352,6 +484,7 @@ static int createDistri(Distri &distri, const Layer *pLayer,

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

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

  * @param[in] distris distributor objects

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

  */

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

                     const std::vector<Distri> &distris,

@@ -362,7 +495,7 @@ static int writeCfg(unsigned int width, unsigned int height,

   if (!strm.is_open()) {

     std::cerr << "could not open \"" << strCfgFileName

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

-    return -1;

+    return ERR_FILE_OPEN;

   }

   // video size

@@ -386,14 +519,14 @@ static int writeCfg(unsigned int width, unsigned int height,

   strm << std::endl;

   strm.close();

-  return 0;

+  return SUCCESS;

 }

 /**

  * @brief main program

  * @param[in] argc number of parameters

  * @param[in] argv parameter values

- * @return 0 on success, -1 on error

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

  */

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

 {

@@ -405,107 +538,30 @@ int main(int argc, char *argv[])

               << ETPCG_VER_REV << std::endl

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

               << std::endl;

-    return -1;

+    return ERR_USAGE;

   }

   std::string strDxfFileName = argv[1];

   std::string strCfgFileName = argv[2];

   // read DXF file

-  dimeInput in;

-  if (!in.setFile(strDxfFileName.c_str())) {

-    std::cerr << "error opening file \"" << strDxfFileName

-              << "\" for reading" << std::endl;

-    return -1;

-  }

-  dimeModel model;

-  if (!model.read(&in)) {

-    std::cerr << "DXF read error in line " << in.getFilePosition()

-              << " of file \"" << strDxfFileName << "\""

-              << std::endl;

-    return -1;

-  }

-

-  // get configuration from layers

   unsigned int width, height, chains, pixels;

-  if (! get_config(model, width, height, chains, pixels)) {

-    return -1;

+  int ret = readDXF(strDxfFileName, width, height, chains, pixels);

+  if (ret != SUCCESS) {

+    return ret;

   }

-  // enumerate all entities

-  model.traverseEntities(cbEntity, NULL);

-

-  // merge all cable layers

-  std::map<unsigned int, Layer>::iterator itCable;

-  for (itCable = gLayerCables.begin();

-       itCable != gLayerCables.end(); ++itCable)

-  gLayerCable.merge(&itCable->second);

-  // gLayerCables[] is now empty and will not be used any more

-

-  // output object count information

-  std::cout << "object counts:" << std::endl;

-  std::cout << "  video: " << gLayerVideo.mObjects.size() << std::endl;

-  std::cout << "  pixel: " << gLayerPixel.mObjects.size() << std::endl;

-  std::cout << "  cable: " << gLayerCable.mObjects.size() << std::endl;

-  std::cout << "  network: " << gLayerNetwork.mObjects.size() << std::endl;

-  std::cout << "  distributor:" << std::endl;

-  std::map<unsigned int, Layer>::const_iterator itDistri;

-  for (itDistri = gLayerDistributors.begin();

-       itDistri != gLayerDistributors.end(); ++itDistri)

-    std::cout << "    " << itDistri->first << ": "

-              << itDistri->second.mObjects.size() << std::endl;

-

-  // 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;

-  ptPixelSz.mX /= (double)width;

-  ptPixelSz.mY /= (double)height;

-  ptPixelSz.mY *= -1;

-  std::cout << "video bounds: "

-            << boundsVideo.mBL.mX << "," << boundsVideo.mBL.mY

-            << " " << boundsVideo.mTR.mX << "," << boundsVideo.mTR.mY

-            << std::endl;

-

-  // create distributors

-  bool err = false;

+  // make config file objects from DXF layers

   std::vector<Distri> distris;

-  for (itDistri = gLayerDistributors.begin();

-       itDistri != gLayerDistributors.end(); ++itDistri) {

-    distris.push_back(Distri(itDistri->first, chains, pixels));

-    if (createDistri(distris.back(), &itDistri->second, pixels) != 0) {

-      err = true;

-    }

-  }

-

-  // obtain pixel coordinates

-  std::vector<Distri>::iterator itD;

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

-    if (itD->pixCoord(ptPixel0, ptPixelSz, width, height) != 0)

-      err = true;

-

-  // count pixels connected to distributors and compare to total pixels

-  size_t distri_pixels = 0;

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

-    distri_pixels += itD->countPixels();

-  std::cout << "pixels connected to distributors: "

-            << distri_pixels << std::endl;

-  if (distri_pixels != gLayerPixel.mObjects.size()) {

-    std::cerr << "number of connected pixels (" << distri_pixels

-              << ") does not match total number of pixels ("

-              << gLayerPixel.mObjects.size() << ")" << std::endl;

-    err = true;

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

+    return ERR_PROC;

   }

   // write config file

-  if (writeCfg(width, height, distris, strCfgFileName) != 0)

-    err = true;

-

-  // output message if errors were detected

-  if (err) {

-    std::cerr << "ERRORs were found" << std::endl;

-    return -1;

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

+  if ( ret != SUCCESS) {

+    return ret;

   }

-  return 0;

+

+  return SUCCESS;

 }