El tanque ahora es mas "simpatico" :-D

diff --git a/Client/src/item_tank.cpp b/Client/src/item_tank.cpp
index daeb4e7ce9eb585c165b0a24fcb922ee3515c22b..7f40997da1c41b7d1f918df579abd0f132dceab4 100644 (file)
--- a/Client/src/item_tank.cpp
+++ b/Client/src/item_tank.cpp
@@ -28,6 +28,7 @@ ViewTank::ViewTank(Glib::ustring _name, int orientacion):ViewItem(_name)
                        item_offset_y = 0;
        }
        image.show();
                        item_offset_y = 0;
        }
        image.show();

+       m_or = orientacion;

        set_size_request();
 }
 
        set_size_request();
 }
 


@@ -47,15 +48,40 @@ std::string ViewTank::get_extra()
 bool ViewTank::on_image_expose_event(GdkEventExpose *e)
 {
        Glib::RefPtr<Gdk::Colormap> colormap = Gtk::Widget::get_default_colormap();
 bool ViewTank::on_image_expose_event(GdkEventExpose *e)
 {
        Glib::RefPtr<Gdk::Colormap> colormap = Gtk::Widget::get_default_colormap();

+       Gdk::Color negro = Gdk::Color("black");
+       Gdk::Color blanco = Gdk::Color("white");
+       colormap->alloc_color(negro);
+       colormap->alloc_color(blanco);

        colormap->alloc_color(color);
        colormap->alloc_color(color);

-       gc->set_foreground(color);
-       gc->set_background(color);
-       gc->set_line_attributes(6, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
-       int w,h;
+       gc->set_line_attributes(1, Gdk::LINE_SOLID, Gdk::CAP_NOT_LAST, Gdk::JOIN_MITER);
+       int w,h,x,y,h_offset,y_offset;

        w = image.get_width();
        h = image.get_height();
        w = image.get_width();
        h = image.get_height();

-       // TODO : hacer que dibuje arcos en el sentido del codo!
+       

        if (actual_flow == 0) return true;
        if (actual_flow == 0) return true;

-       image.get_window()->draw_arc(gc, 1, w/2-7, h/2-7, 14, 14, 0, 360*64);
+
+       switch (m_or) {
+               case 0:
+                       x = 5;
+               break;
+               case 1:
+                       x = w-w/2-5;
+       }
+       y = 15;
+       w = w/2;
+       h = h/2;
+       y_offset = static_cast<int>(h*(1.0f-extra/actual_flow));
+       h_offset = static_cast<int>(h*(1.0f-extra/actual_flow));
+       gc->set_foreground(negro);
+       gc->set_background(negro);
+       image.get_window()->draw_rectangle(gc, 1, x, y, w, h);
+       gc->set_foreground(color);
+       gc->set_background(color);
+       image.get_window()->draw_rectangle(gc, 1, x, y+y_offset, w, h-h_offset);
+
+       /* Un borde para que se vea bien */
+       gc->set_foreground(blanco);
+       gc->set_background(blanco);
+       image.get_window()->draw_rectangle(gc, 0, x-1, y-1, w+1, h+1);

        return true;
 }
        return true;
 }