libetherpix

@@ -0,0 +1,76 @@

+/*

+ * EtherPix simulator

+ *

+ * Copyright 2017 Stefan Schuermans <stefan schuermans info>

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, version 3 of the License.

+ *

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include "bbox.h"

+

+/// constructor

+BBox::BBox():

+  m_init(false),

+  m_x_min(0.0),

+  m_x_max(0.0),

+  m_y_min(0.0),

+  m_y_max(0.0)

+{

+}

+

+/// reset bounding box (de-initialize)

+void BBox::reset()

+{

+  m_init = false;

+  m_x_min = 0.0;

+  m_x_max = 0.0;

+  m_y_min = 0.0;

+  m_y_max = 0.0;

+}

+

+// add a point to the bounding box

+void BBox::add(double x, double y)

+{

+  if (m_init) {

+    if (x < m_x_min) m_x_min = x;

+    if (x > m_x_max) m_x_max = x;

+    if (y < m_y_min) m_y_min = y;

+    if (y > m_y_max) m_y_max = y;

+  } else {

+    m_init = true;

+    m_x_min = x;

+    m_x_max = x;

+    m_y_min = y;

+    m_y_max = y;

+  }

+}

+

+/**

+ * @brief get coordinates

+ * @return whether coordinates were there

+ */

+bool BBox::get(double &x_min, double &x_max,

+               double &y_min, double &y_max) const

+{

+  if (m_init) {

+    x_min = m_x_min;

+    x_max = m_x_max;

+    y_min = m_y_min;

+    y_max = m_y_max;

+    return true;

+  } else {

+    return false;

+  }

+}

+

@@ -0,0 +1,52 @@

+/*

+ * EtherPix simulator

+ *

+ * Copyright 2017 Stefan Schuermans <stefan schuermans info>

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, version 3 of the License.

+ *

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#ifndef BBOX_H

+#define BBOX_H

+

+/// bounding box

+class BBox

+{

+public:

+  /// constructor

+  BBox();

+

+  /// reset bounding box (de-initialize)

+  void reset();

+

+  /// add a point to the bounding box

+  void add(double x, double y);

+

+  /**

+   * @brief get coordinates

+   * @return whether coordinates were there

+   */

+  bool get(double &x_min, double &x_max,

+           double &y_min, double &y_max) const;

+

+protected:

+   bool m_init; ///< initialization flag, false means no coordinates yet

+   double m_x_min; ///< minimum x coordinate

+   double m_x_max; ///< maximum y coordinate

+   double m_y_min; ///< minimum x coordinate

+   double m_y_max; ///< maximum y coordinate

+};

+

+#endif // #ifndef BBOX_H

+

@@ -31,6 +31,7 @@

 #include <string>

 #include <sys/socket.h>

+#include "bbox.h"

 #include "config.h"

 #include "distri.h"

 #include "mapping.h"

@@ -40,11 +41,28 @@

  * @brief constructor

  * @param[in] configFile name of config file

  */

-Config::Config(std::string const &configFile)

+Config::Config(std::string const &configFile):

+  m_distriMap(),

+  m_bb()

 {

   readFile(configFile);

 }

+/**

+ * @brief draw pixels of all distributors

+ * @param[in] cairo cairo context for drawing

+ * @param[in] tf coordinate transformation

+ */

+void Config::draw(Cairo::RefPtr<Cairo::Context> &cairo,

+                  Transform const &tf) const

+{

+  DistriMap::const_iterator dist;

+  for (dist = m_distriMap.begin(); dist != m_distriMap.end(); ++dist) {

+    Distri const &distri = dist->second;

+    distri.draw(cairo, tf);

+  }

+}

+

 /**

  * @brief remove whitespace at beging and end of string

  * @param[in,out] str string to process

@@ -343,6 +361,9 @@ void Config::readFile(std::string const &configFile)

   // close file

   cf.close();

+

+  // update internal data

+  update();

 }

 /**

@@ -727,3 +748,15 @@ Distri & Config::getDistri(unsigned long distno)

   return distri->second;

 }

+/// update internal data

+void Config::update()

+{

+  // re-compute bounding box of all pixels

+  m_bb.reset();

+  DistriMap::const_iterator dist;

+  for (dist = m_distriMap.begin(); dist != m_distriMap.end(); ++dist) {

+    Distri const &distri = dist->second;

+    distri.updateBBox(m_bb);

+  }

+}

+

@@ -21,11 +21,14 @@

 #define CONFIG_H

 #include <arpa/inet.h>

+#include <gtkmm.h>

 #include <map>

 #include <string>

 #include <vector>

+#include "bbox.h"

 #include "distri.h"

+#include "transform.h"

 /// config file

 class Config

@@ -37,6 +40,16 @@ public:

    */

   Config(std::string const &configFile);

+  /// get bounding box

+  BBox const &getBBox() const { return m_bb; }

+

+  /**

+   * @brief draw pixels of all distributors

+   * @param[in] cairo cairo context for drawing

+   * @param[in] tf coordinate transformation

+   */

+  void draw(Cairo::RefPtr<Cairo::Context> &cairo, Transform const &tf) const;

+

 protected:

   /// distributor map: distributor number -> distributor object

   typedef std::map<unsigned long, Distri> DistriMap;

@@ -182,9 +195,14 @@ protected:

    */

   Distri & getDistri(unsigned long distno);

+  /// update internal data

+  void update();

+

 protected:

   /// distributors

   DistriMap m_distriMap;

+  /// bounding box of all pixels

+  BBox m_bb;

 };

 #endif // #ifndef CONFIG_H

@@ -18,14 +18,17 @@

  */

 #include <arpa/inet.h>

+#include <gtkmm.h>

 #include <map>

 #include <sstream>

 #include <stdexcept>

 #include <vector>

+#include "bbox.h"

 #include "distri.h"

 #include "mapping.h"

 #include "pixel.h"

+#include "transform.h"

 /// constructor

 Distri::Distri():

@@ -141,3 +144,39 @@ void Distri::addPixel(unsigned long outno, Pixel const &pixel)

   output.m_pixels.push_back(pixel);

 }

+/**

+ * @brief add all pixels of this distributor to the bounding box

+ * @param[in,out] bb bounding box

+ */

+void Distri::updateBBox(BBox &bb) const

+{

+  OutputMap::const_iterator out;

+  for (out = m_outputMap.begin(); out != m_outputMap.end(); ++out) {

+    Output const &output = out->second;

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

+    for (pix = output.m_pixels.begin(); pix != output.m_pixels.end(); ++pix) {

+      Pixel const &pixel = *pix;

+      pixel.updateBBox(bb);

+    }

+  }

+}

+

+/**

+ * @brief draw pixels of this distributor

+ * @param[in] cairo cairo context for drawing

+ * @param[in] tf coordinate transformation

+ */

+void Distri::draw(Cairo::RefPtr<Cairo::Context> &cairo,

+                  Transform const &tf) const

+{

+  OutputMap::const_iterator out;

+  for (out = m_outputMap.begin(); out != m_outputMap.end(); ++out) {

+    Output const &output = out->second;

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

+    for (pix = output.m_pixels.begin(); pix != output.m_pixels.end(); ++pix) {

+      Pixel const &pixel = *pix;

+      pixel.draw(cairo, tf);

+    }

+  }

+}

+

@@ -21,11 +21,14 @@

 #define DISTRI_H

 #include <arpa/inet.h>

+#include <gtkmm.h>

 #include <map>

 #include <vector>

+#include "bbox.h"

 #include "mapping.h"

 #include "pixel.h"

+#include "transform.h"

 /// distributor

 class Distri

@@ -88,6 +91,19 @@ public:

    */

   void addPixel(unsigned long outno, Pixel const &pixel);

+  /**

+   * @brief add all pixels of this distributor to the bounding box

+   * @param[in,out] bb bounding box

+   */

+  void updateBBox(BBox &bb) const;

+

+  /**

+   * @brief draw pixels of this distributor

+   * @param[in] cairo cairo context for drawing

+   * @param[in] tf coordinate transformation

+   */

+  void draw(Cairo::RefPtr<Cairo::Context> &cairo, Transform const &tf) const;

+

 protected:

   /// output data

   struct Output {

@@ -19,7 +19,9 @@

 #include <gtkmm.h>

+#include "config.h"

 #include "draw.h"

+#include "transform.h"

 /**

  * @brief constructor

@@ -29,17 +31,9 @@

 Draw::Draw(BaseObjectType *cobject,

            const Glib::RefPtr<Gtk::Builder> &builder):

   Gtk::DrawingArea(cobject),

-  m_builder(builder)

+  m_builder(builder),

+  m_config(NULL)

 {

-  /*

-  TODO

-  // connect callbacks (seems to be needed for gtkmm-2.4 < V2.16)

-  signal_configure_event().connect(

-    sigc::mem_fun(*this, &Draw::on_configure_event));

-  signal_expose_event().connect(

-    sigc::mem_fun(*this, &Draw::on_expose_event));

-  */

-

   // initialize image

   updateImage();

   queue_draw();

@@ -50,6 +44,15 @@ Draw::~Draw()

 {

 }

+/// set configuration object

+void Draw::setConfig(Config const&config)

+{

+  m_config = &config;

+

+  // re-initialize image

+  updateImage();

+  queue_draw();

+}

 /**

  * @brief widget is (re)configured

@@ -101,19 +104,13 @@ void Draw::updateImage()

   cairo->rectangle(0, 0, width, height);

   cairo->fill();

-  // TODO

-  // draw circles

-  cairo->set_source_rgb(1.0, 0.0, 0.0);

-  cairo->arc(0.5 * width, 0.5 * height, 0.03 * (width + height),

-             0.0, 2.0 * M_PI);

-  cairo->fill();

-  cairo->set_source_rgb(0.0, 1.0, 0.0);

-  cairo->arc(0.7 * width, 0.3 * height, 0.03 * (width + height),

-             0.0, 2.0 * M_PI);

-  cairo->fill();

-  cairo->set_source_rgb(0.0, 0.0, 1.0);

-  cairo->arc(0.7 * width, 0.7 * height, 0.03 * (width + height),

-             0.0, 2.0 * M_PI);

-  cairo->fill();

+  // compute coordinate transformation

+  if (! m_config)

+    return;

+  Transform tf(m_config->getBBox(), width, height);

+

+  // draw pixels of all distributors

+  cairo->set_source_rgb(1.0, 0.0, 0.0); // FIXME

+  m_config->draw(cairo, tf);

 }

@@ -22,6 +22,8 @@

 #include <gtkmm.h>

+#include "config.h"

+

 /// drawing area

 class Draw: public Gtk::DrawingArea

 {

@@ -37,6 +39,8 @@ public:

   /// virtual destructor

   virtual ~Draw();

+  /// set configuration object

+  void setConfig(Config const&config);

 protected:

   /**

@@ -62,6 +66,9 @@ protected:

   /// cairo surface with current simulator image

   Cairo::RefPtr<Cairo::ImageSurface> m_image;

+

+  /// configuration object

+  Config const *m_config;

 };

 #endif // #ifndef DRAW_H

@@ -49,6 +49,7 @@ int main(int argc, char *argv[])

     // connect main window to its class

     MainWindow *mainWindow;

     builder->get_widget_derived("MainWindow", mainWindow);

+    mainWindow->setConfig(config);

     // append config file name to window title

     mainWindow->set_title(mainWindow->get_title() + " - " + configFile);

@@ -18,8 +18,9 @@

  */

 #include <gtkmm.h>

-//#include <libglademm/xml.h>

+#include "config.h"

+#include "draw.h"

 #include "main_window.h"

 /**

@@ -30,7 +31,8 @@

 MainWindow::MainWindow(BaseObjectType *cobject,

                        const Glib::RefPtr<Gtk::Builder> &builder):

   Gtk::Window(cobject),

-  m_builder(builder)

+  m_builder(builder),

+  m_config(NULL)

 {

   // get widgets

   builder->get_widget_derived("Draw", m_draw);

@@ -45,6 +47,13 @@ MainWindow::~MainWindow()

 {

 }

+/// set configuration object

+void MainWindow::setConfig(Config const &config)

+{

+  m_config = &config;

+  m_draw->setConfig(config);

+}

+

 /// window is being hidden

 void MainWindow::on_hide()

 {

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

 #include <gtkmm.h>

+#include "config.h"

 #include "draw.h"

 /// main window of StateTracker GUI

@@ -39,6 +40,9 @@ public:

   /// virtual destructor

   virtual ~MainWindow();

+  /// set configuration object

+  void setConfig(Config const& config);

+

 protected:

   /// window is being hidden

   void on_hide();

@@ -54,6 +58,9 @@ protected:

   Draw *m_draw;

   /// status bar

   Gtk::Statusbar *m_status;

+

+  /// configuration object

+  Config const *m_config;

 };

 #endif // #ifndef MAIN_WINDOW_H

@@ -17,7 +17,11 @@

  * along with this program. If not, see <http://www.gnu.org/licenses/>.

  */

+#include <gtkmm.h>

+

+#include "bbox.h"

 #include "pixel.h"

+#include "transform.h"

 /// default constructor

 Pixel::Pixel():

@@ -35,3 +39,29 @@ Pixel::Pixel(double x, double y, double r):

 {

 }

+/**

+ * @brief add pixel to the bounding box

+ * @param[in,out] bb bounding box

+ */

+void Pixel::updateBBox(BBox &bb) const

+{

+  // add pixel plus some border to bounding box

+  bb.add(m_x - 2 * m_r, m_y - 2 * m_r);

+  bb.add(m_x + 2 * m_r, m_y + 2 * m_r);

+}

+

+/**

+ * @brief draw pixel

+ * @param[in] cairo cairo context for drawing

+ * @param[in] tf coordinate transformation

+ */

+void Pixel::draw(Cairo::RefPtr<Cairo::Context> &cairo,

+                 Transform const &tf) const

+{

+  double x, y, r;

+  tf.apply(m_x, m_y, x, y);

+  tf.applyZoom(m_r, r);

+  cairo->arc(x, y, r, 0.0, 2.0 * M_PI);

+  cairo->fill();

+}

+

@@ -20,6 +20,11 @@

 #ifndef PIXEL_H

 #define PIXEL_H

+#include <gtkmm.h>

+

+#include "bbox.h"

+#include "transform.h"

+

 /// a simulated pixel

 class Pixel

 {

@@ -30,6 +35,19 @@ public:

   /// constructor based on coordinates and radius

   Pixel(double x, double y, double r);

+  /**

+   * @brief add pixel to the bounding box

+   * @param[in,out] bb bounding box

+   */

+  void updateBBox(BBox &bb) const;

+

+  /**

+   * @brief draw pixel

+   * @param[in] cairo cairo context for drawing

+   * @param[in] tf coordinate transformation

+   */

+  void draw(Cairo::RefPtr<Cairo::Context> &cairo, Transform const &tf) const;

+

 protected:

    /// parameters of pixel

    //@{

@@ -0,0 +1,80 @@

+/*

+ * EtherPix simulator

+ *

+ * Copyright 2017 Stefan Schuermans <stefan schuermans info>

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, version 3 of the License.

+ *

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include "bbox.h"

+#include "transform.h"

+

+/**

+ * @brief constructor

+ * @param[in] bb boundig box of input coordinates

+ * @param[in] width width of output coordinate speace (left to right)

+ * @param[in] height height of output coordinate space (top to bottom)

+ */

+Transform::Transform(BBox const &bb, double width, double height):

+  m_init(false),

+  m_zoom(1.0),

+  m_shift_x(0.0),

+  m_shift_y(0.0)

+{

+  double bb_x_min, bb_x_max, bb_y_min, bb_y_max;

+  if (! bb.get(bb_x_min, bb_x_max, bb_y_min, bb_y_max))

+    return;

+

+  double delta_x = bb_x_max - bb_x_min;

+  double delta_y = bb_y_max - bb_y_min;

+  if (delta_x <= 0.0 || delta_y <= 0.0)

+    return;

+

+  // compute zoom factor (keep aspect ration, fit into window)

+  double zoom_x = (double)width / delta_x;

+  double zoom_y = (double)height / delta_y;

+  m_zoom = zoom_x < zoom_y ? zoom_x : zoom_y;

+

+  // compute shift (center of pixels should be center of window)

+  m_shift_x = 0.5 * (double)width - 0.5 * (bb_x_min + bb_x_max) * m_zoom;

+  m_shift_y = 0.5 * (double)height - 0.5 * (bb_y_min + bb_y_max) * -m_zoom;

+

+  // initialized

+  m_init = true;

+};

+

+/**

+ * @brief apply transformation

+ * @param[in] in_x input x coordinate

+ * @param[in] in_y input y coordinate

+ * @param[out] out_x output x coordinate

+ * @param[out] out_y output y coordinate

+ */

+void Transform::apply(double in_x, double in_y,

+                      double &out_x, double &out_y) const

+{

+  out_x = in_x * m_zoom + m_shift_x;

+  out_y = in_y * -m_zoom + m_shift_y;

+}

+

+/**

+ * @brief apply zoom

+ * @param[in] in_r input radius

+ * @param[out] out_r output radius

+ */

+void Transform::applyZoom(double in_r, double &out_r) const

+{

+  out_r = in_r * m_zoom;

+}

+

@@ -0,0 +1,64 @@

+/*

+ * EtherPix simulator

+ *

+ * Copyright 2017 Stefan Schuermans <stefan schuermans info>

+ *

+ * This program is free software: you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation, version 3 of the License.

+ *

+ *

+ * This program is distributed in the hope that it will be useful,

+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+ * GNU General Public License for more details.

+ *

+ * You should have received a copy of the GNU Lesser General Public License

+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#ifndef TRANSFORM_H

+#define TRANSFORM_H

+

+#include "bbox.h"

+

+/// coordinate transformation

+class Transform

+{

+public:

+  /**

+   * @brief constructor

+   * @param[in] bb boundig box of input coordinates

+   * @param[in] width width of output coordinate speace (left to right)

+   * @param[in] height height of output coordinate space (top to bottom)

+   */

+  Transform(BBox const &bb, double width, double height);

+

+  /// check if initialized

+  bool checkInit() const { return m_init; }

+

+  /**

+   * @brief apply transformation

+   * @param[in] in_x input x coordinate

+   * @param[in] in_y input y coordinate

+   * @param[out] out_x output x coordinate

+   * @param[out] out_y output y coordinate

+   */

+  void apply(double in_x, double in_y, double &out_x, double &out_y) const;

+

+  /**

+   * @brief apply zoom

+   * @param[in] in_r input radius

+   * @param[out] out_r output radius

+   */

+  void applyZoom(double in_r, double &out_r) const;

+

+protected:

+   bool m_init; ///< initialization flag, false means no transformation data

+   double m_zoom; ///< zoom factor (use negative for y direction)

+   double m_shift_x; ///< shift in x direction

+   double m_shift_y; ///< shift in y direction

+};

+

+#endif // #ifndef TRANSFORM_H

+