Mejora Makefile principal para que compile el viewer también.

[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..d2321c6e8d6ca976795e31f010dc704d07edb717 100644 (file)
--- a/viewer/view_btree_data.cpp
+++ b/viewer/view_btree_data.cpp
@@ -1,5 +1,6 @@
 
 #include "view_btree_data.h"
 
 #include "view_btree_data.h"

+#define NODE_PTR_WIDTH 5

 
 ViewBTreeData::ViewBTreeData (BTreeData *data, Canvas::Group *parent, double x1, double y1, double x2, double y2):
        Canvas::Rect (*parent, x1, y1, x2, y2)
 
 ViewBTreeData::ViewBTreeData (BTreeData *data, Canvas::Group *parent, double x1, double y1, double x2, double y2):
        Canvas::Rect (*parent, x1, y1, x2, y2)


@@ -9,26 +10,69 @@ ViewBTreeData::ViewBTreeData (BTreeData *data, Canvas::Group *parent, double x1,
        property_outline_color () = "black";
 }
 
        property_outline_color () = "black";
 }
 

+void ViewBTreeData::init (Canvas::Group *parent)
+{
+       double w = property_x2() - property_x1();
+       double h = property_y2() - property_y1();
+
+       Canvas::Rect *ptr = new Canvas::Rect (*parent, property_x1()+w-NODE_PTR_WIDTH, h-NODE_PTR_WIDTH, property_x1()+w-1, h-1);
+       ptr->property_fill_color () = "green";
+       ptr->property_outline_color () = "black";
+}
+               
+bool ViewBTreeData::on_event (GdkEvent *p1)
+{
+       switch (p1->type) {
+               case GDK_BUTTON_PRESS:
+                       m_signal_clicked(data, this);
+               break;
+               case GDK_2BUTTON_PRESS:
+                       m_signal_double_clicked (data, this);
+       }
+
+       return Canvas::Rect::on_event (p1);
+}
+
+
+ViewBTreeData::type_signal_clicked ViewBTreeData::signal_clicked ()
+{
+       return m_signal_clicked;
+}
+
+ViewBTreeData::type_signal_double_clicked ViewBTreeData::signal_double_clicked ()
+{
+       return m_signal_double_clicked;
+}
+

 
 ViewBTreeData*
 ViewBTreeData::Create (BTreeData *data, Canvas::Group *parent, double x1, double y1, double x2, double y2)
 {
 
 ViewBTreeData*
 ViewBTreeData::Create (BTreeData *data, Canvas::Group *parent, double x1, double y1, double x2, double y2)
 {

+       ViewBTreeData *ret;

        if (dynamic_cast<BTreeChildData *>(data))
        if (dynamic_cast<BTreeChildData *>(data))

-               return new ViewBTreeChildData (data, parent, x1, y1, x2, y2);
-
-       return new ViewBTreeData (data, parent, x1, y1, x2, y2);
+               ret = new ViewBTreeChildData (data, parent, x1, y1, x2, y2);
+       else
+               ret     = new ViewBTreeData (data, parent, x1, y1, x2, y2);
+       ret->init (parent);
+       return ret;

 }
 
 ViewBTreeChildData::ViewBTreeChildData (BTreeData *data, Canvas::Group *parent, double x1, double y1, double x2, double y2):
        ViewBTreeData (data, parent, x1, y1, x2, y2)
 {
 }
 
 ViewBTreeChildData::ViewBTreeChildData (BTreeData *data, Canvas::Group *parent, double x1, double y1, double x2, double y2):
        ViewBTreeData (data, parent, x1, y1, x2, y2)
 {

-       property_fill_color () = "yellow";
-       property_outline_color () = "black";
+}

 
 

-       double w = x2 - x1;
-       double h = y2 - y1;
+void ViewBTreeChildData::init (Canvas::Group *parent)
+{
+       property_outline_color () = "black";
+}

 
 

-       std::string s = *data;
-       Canvas::Text *text = new Canvas::Text (*parent, x1 + w/2, y1 + h/2, s);
+void ViewBTreeData::SetSelected (bool b)
+{
+       if (b) {
+               property_fill_color () = "yellow";
+       } else {
+               property_fill_color () = "red";
+       }

 }
 
 }