- Se actualiza la funcion save() de todos los item

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

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index 79515ff4990ab1d3bded0be364dac10eecfef20b..4bec05d93d57dcc623d4e12b1152914f63075e93 100644 (file)
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -13,6 +13,8 @@ CItem::CItem()
        ref = Gnome::Glade::Xml::create("constructor.glade", "item_pty_wnd");
        ref->get_widget_derived("item_pty_wnd",property_wnd);
        caudal_max = 0.0;
        ref = Gnome::Glade::Xml::create("constructor.glade", "item_pty_wnd");
        ref->get_widget_derived("item_pty_wnd",property_wnd);
        caudal_max = 0.0;

+       is_union = true;
+       is_connected = false;

        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);
        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);


@@ -59,71 +61,67 @@ void CItem::on_menu_popup_conectar()
 {
 }
 
 {
 }
 

-void CItem::set_position(int _x, int _y)
-{
-       this->x = _x;
-       this->y = _y;
-}
-
-void CItem::set_id(int _id)
+int CItem::get_position_x()

 {
 {

-       ID = _id;
+       return x;

 }
 
 }
 

-void CItem::set_caudal(double _caudal)
+int CItem::get_position_y()

 {
 {

-        caudal_max = _caudal;
+       return y;

 }
 
 }
 

-void CItem::set_name(Glib::ustring _name)
+int CItem::get_id()

 {
 {

-       name = _name;
+       return ID;

 }
 
 }
 

-void CItem::set_conector_in(int _in)
+double CItem::get_caudal()

 {
 {

-       conector_in = _in;
+       return caudal_max;

 }
 
 }
 

-void CItem::set_conector_out(int _out)
-{
-       conector_out = _out;
-}

 
 

-int CItem::get_position_x()
+Glib::ustring CItem::get_name()

 {
 {

-       return x;
+       return name;

 }
 
 }
 

-int CItem::get_position_y()
+Glib::ustring CItem::get_other_name(int _id)

 {
 {

-       return y;
+       std::list<CItem *>::iterator i = listaItems->begin();
+       while ( i != listaItems->end() ) {
+               if ( (*i)->get_id() == _id ) 
+                       return (*i)->get_name();
+               i++;
+       }
+       return name;

 }
 
 }
 

-int CItem::get_id()
+int CItem::get_img_actual()

 {
 {

-       return ID;
+       return imgActual;

 }
 
 }
 

-double CItem::get_caudal()
+void CItem::set_position(int _x, int _y)

 {
 {

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

 }
 
 }
 

-
-Glib::ustring CItem::get_name()
+void CItem::set_id(int _id)

 {
 {

-       return name;
+       ID = _id;

 }
 
 }
 

-int CItem::get_conector_in()
+void CItem::set_caudal(double _caudal)

 {
 {

-       return conector_in;
+        caudal_max = _caudal;

 }
 
 }
 

-int CItem::get_conector_out()
+void CItem::set_name(Glib::ustring _name)

 {
 {

-       return conector_out;
+       name = _name;

 }
 
 bool CItem::is_occupied_area(int _a, int _b)
 }
 
 bool CItem::is_occupied_area(int _a, int _b)


@@ -132,3 +130,26 @@ bool CItem::is_occupied_area(int _a, int _b)
                        return true;
                else return false;
 }
                        return true;
                else return false;
 }

+
+ConnectorType CItem::is_other_connection_area(int _a, int _b, CItem **_item)
+{
+       ConnectorType temp2;
+       std::list<CItem *>::iterator i = listaItems->begin();
+       while ( i != listaItems->end() ) {
+               CItem *temp = *i;
+               if (temp != this) 
+                       if ( (temp2 = temp->get_connector_type(_a,_b)) != UNDEF ) {
+                               *_item = temp;
+                               return temp2;
+                       }
+               i++;
+       }
+       return UNDEF;
+}
+ConnectorType CItem::get_connector_type( int _a, int _b )
+{
+       return UNDEF;
+}
+void CItem::set_default_connector()
+{
+}