Bugfix del test.sh para que no 'oculte' errores por SIGSEGV.

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

diff --git a/viewer/view_node.cpp b/viewer/view_node.cpp
index 6dc664941968a35693b53cb78db1688f6b7b8be1..c29d43faa8c4ee6b6384d8a80481c638290d4310 100644 (file)
--- a/viewer/view_node.cpp
+++ b/viewer/view_node.cpp
@@ -10,9 +10,10 @@ ViewNode::ViewNode (Canvas::Group *parent, uint num, uint padre, BTreeNodeHeader
        this->padre = padre;
 
        /* Fondo */
-       fondo = new Canvas::Rect (*this, 0, 0, ViewBTree::node_width, ViewBTree::node_height);
-       fondo->property_fill_color() = "gray";
-       fondo->property_outline_color() = "black";
+       int w1 = (int)(ViewBTree::node_width / 512.0f);
+       int used_width = 0;
+
+       double y = 0;
 
        /* Header */
        Canvas::Rect *h = new Canvas::Rect (*this, 0, 0, header_w, ViewBTree::node_height);
@@ -27,23 +28,37 @@ ViewNode::ViewNode (Canvas::Group *parent, uint num, uint padre, BTreeNodeHeader
        new Canvas::Text (*this, header_w/2, ViewBTree::node_height/2, node_num);
 
        double x = header_w;
+       y = 0;
 
        std::list<BTreeData *>::iterator it = keys.begin ();
        while (it != keys.end ()) {
                BTreeData *data = (*it);
                double w = ViewBTree::byte_to_pixels * data->Size ();
 
-               ViewBTreeData *v = ViewBTreeData::Create (data, this, x, 0, w+x, ViewBTree::node_height);
+               ViewBTreeData *v = ViewBTreeData::Create (data, this, x, y, w+x, y+ViewBTree::node_height);
                v->signal_clicked ().connect ( sigc::mem_fun (this , &ViewNode::on_item_clicked ));
                v->signal_double_clicked ().connect ( sigc::mem_fun (this , &ViewNode::on_item_activated ));
                x += w;
+               used_width += w;
+               if (x >= 512) {
+                       x = 0;
+                       y += ViewBTree::node_height + 5;
+               }
                it++;
 
+               datas.push_back (v);
+
                if (!dynamic_cast<BTreeLeafData *>(data)) {
                        /* Si no es un dato de una hoja, tiene hijos */
                        hijos.push_back (data->GetChild ());
                }
        }
+       w1 = ViewBTree::node_width - used_width;
+       if (w1 > 0) {
+               fondo = new Canvas::Rect (*this, x, y, x+w1, ViewBTree::node_height+y);
+               fondo->property_fill_color() = "gray";
+               fondo->property_outline_color() = "black";
+       }
 }
 
 void ViewNode::on_item_clicked (BTreeData *data, ViewBTreeData *s)
@@ -79,3 +94,19 @@ void ViewNode::SetSelected (bool b)
        }
 }
 
+void ViewNode::HighliteKey (Clave &k)
+{
+       std::list<ViewBTreeData *>::iterator it;
+
+       it = datas.begin ();
+       while (it != datas.end ()) {
+               if ((*(*it)) == k) {
+                       if (last_selected)
+                               last_selected->SetSelected (false);
+                       last_selected = *it;
+                       last_selected->SetSelected (true);
+               }
+               it++;
+       }
+}
+