ahora compila, y se pueden guardar los datos de los items.

[z.facultad/75.42/plaqui.git] / Constructor / item.cpp

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index b526867890891e50c9de4a3cfe2eab53b3f188d5..08af2cfecea9d6beca45211cfa282ac234546ff7 100644 (file)
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -1,5 +1,5 @@
 #include "item.h"
 #include "item.h"

-#include <iostream>
+#include "workplace.h"

 
 CItem::CItem(const char *filename):Gtk::DrawingArea()
 {
 
 CItem::CItem(const char *filename):Gtk::DrawingArea()
 {


@@ -9,6 +9,11 @@ CItem::CItem(const char *filename):Gtk::DrawingArea()
 
 CItem::CItem()
 {
 
 CItem::CItem()
 {

+       Glib::RefPtr<Gnome::Glade::Xml> ref;
+       ref = Gnome::Glade::Xml::create("constructor.glade", "item_pty_wnd");
+       ref->get_widget_derived("item_pty_wnd",property_wnd);
+       caudal_max = 0.0;
+       property_wnd->item = this;

        menu_image_propiedades.set(Gtk::Stock::PREFERENCES, Gtk::ICON_SIZE_MENU);
        menu_image_delete.set(Gtk::Stock::CANCEL, Gtk::ICON_SIZE_MENU);
        menu_image_rotar.set(Gtk::Stock::REFRESH, Gtk::ICON_SIZE_MENU);
        menu_image_propiedades.set(Gtk::Stock::PREFERENCES, Gtk::ICON_SIZE_MENU);
        menu_image_delete.set(Gtk::Stock::CANCEL, Gtk::ICON_SIZE_MENU);
        menu_image_rotar.set(Gtk::Stock::REFRESH, Gtk::ICON_SIZE_MENU);


@@ -54,10 +59,10 @@ void CItem::on_menu_popup_conectar()
 {
 }
 
 {
 }
 

-void CItem::set_position(int x, int y)
+void CItem::set_position(int _x, int _y)

 {
 {

-       this->x = x;
-       this->y = y;
+       this->x = _x;
+       this->y = _y;

 }
 
 int CItem::get_position_x()
 }
 
 int CItem::get_position_x()


@@ -70,19 +75,39 @@ int CItem::get_position_y()
        return y;
 }
 
        return y;
 }
 

-bool CItem::is_occupied_area(int a, int b)
+bool CItem::is_occupied_area(int _a, int _b)

 {      
 {      

-       if ( (a >= x ) && ( a < x+image->get_width()) && (b >= y) && (b < y+image->get_height()) )  
+       if ( ( _a >= x ) && ( _a < x+image->get_width()) && (_b >= y) && (_b < y+image->get_height()) )  

                        return true;
                else return false;
 }
 
                        return true;
                else return false;
 }
 

-void CItem::set_id(int id)
+void CItem::set_id(int _id)

 {
 {

-       ID = id;
+       ID = _id;

 }
 
 int CItem::get_id()
 {
        return ID;
 }
 }
 
 int CItem::get_id()
 {
        return ID;
 }

+
+void CItem::set_caudal(double _caudal)
+{
+        caudal_max = _caudal;
+}
+
+double CItem::get_caudal()
+{
+       return caudal_max;
+}
+
+void CItem::set_name(Glib::ustring _name)
+{
+       name = _name;
+}
+
+Glib::ustring CItem::get_name()
+{
+       return name;
+}