Mejoro inicialización de BTree*Data.

[z.facultad/75.52/treemulator.git] / viewer / view_btree_data.cpp

diff --git a/viewer/view_btree_data.cpp b/viewer/view_btree_data.cpp
index 403da558444fd92e17743cccb3830799ff9365db..04889ccbdca9ba092fe104c7002ce526731c0dcb 100644 (file)
--- a/viewer/view_btree_data.cpp
+++ b/viewer/view_btree_data.cpp
@@ -7,8 +7,34 @@ ViewBTreeData::ViewBTreeData (BTreeData *data, Canvas::Group *parent, double x1,
        this->data = data;
        property_fill_color () = "red";
        property_outline_color () = "black";
+
+       init (parent);
+}
+
+void ViewBTreeData::init (Canvas::Group *parent)
+{
+       double w = property_x2() - property_x1();
+       double h = property_y2() - property_y1();
+
+       std::string s = *data;
+       new Canvas::Text (*parent, property_x1()+w/2, h/2, s);
 }
+               
+bool ViewBTreeData::on_event (GdkEvent *p1)
+{
+       switch (p1->type) {
+               case GDK_BUTTON_PRESS:
+                       m_signal_clicked(data);
+       }
 
+       return Canvas::Rect::on_event (p1);
+}
+
+
+ViewBTreeData::type_signal_clicked ViewBTreeData::signal_clicked ()
+{
+       return m_signal_clicked;
+}
 
 ViewBTreeData*
 ViewBTreeData::Create (BTreeData *data, Canvas::Group *parent, double x1, double y1, double x2, double y2)
@@ -21,14 +47,18 @@ ViewBTreeData::Create (BTreeData *data, Canvas::Group *parent, double x1, double
 
 ViewBTreeChildData::ViewBTreeChildData (BTreeData *data, Canvas::Group *parent, double x1, double y1, double x2, double y2):
        ViewBTreeData (data, parent, x1, y1, x2, y2)
+{
+}
+
+void ViewBTreeChildData::init (Canvas::Group *parent)
 {
        property_fill_color () = "yellow";
        property_outline_color () = "black";
 
-       double w = x2 - x1;
-       double h = y2 - y1;
+       double w = property_x2() - property_x1();
+       double h = property_y2() - property_y1();
 
        std::string s = *data;
-       Canvas::Text *text = new Canvas::Text (*parent, x1 + w/2, y1 + h/2, s);
+       Canvas::Text *text = new Canvas::Text (*parent, property_x1()+w/2, h/2, s);
 }