cambios drasticos producen cuelgues obvios, etapa de revision, pueden mirarlo libremente

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

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index 31d955dbebb8ea4faabfccc8aae3f8635fe2d8e4..72f63930554a284452052d2515d066aede363fb6 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;
+       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);
@@ -59,37 +61,6 @@ 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)
-{
-       ID = _id;
-}
-
-void CItem::set_caudal(double _caudal)
-{
-        caudal_max = _caudal;
-}
-
-void CItem::set_name(Glib::ustring _name)
-{
-       name = _name;
-}
-
-void CItem::set_conector_in(int _in)
-{
-       conector_in = _in;
-}
-
-void CItem::set_conector_out(int _out)
-{
-       conector_out = _out;
-}
-
 int CItem::get_position_x()
 {
        return x;
@@ -116,19 +87,30 @@ Glib::ustring CItem::get_name()
        return name;
 }
 
-int CItem::get_conector_in()
+int CItem::get_img_actual()
 {
-       return conector_in;
+       return imgActual;
 }
 
-int CItem::get_conector_out()
+void CItem::set_position(int _x, int _y)
 {
-       return conector_out;
+       this->x = _x;
+       this->y = _y;
 }
 
-int CItem::get_img_actual()
+void CItem::set_id(int _id)
 {
-       return imgActual;
+       ID = _id;
+}
+
+void CItem::set_caudal(double _caudal)
+{
+        caudal_max = _caudal;
+}
+
+void CItem::set_name(Glib::ustring _name)
+{
+       name = _name;
 }
 
 bool CItem::is_occupied_area(int _a, int _b)
@@ -138,14 +120,21 @@ bool CItem::is_occupied_area(int _a, int _b)
                else return false;
 }
 
-bool CItem::is_other_occupied_area(int _a, int _b)
+ConnectorType CItem::is_other_connection_area(int _a, int _b)
 {
+       ConnectorType temp2;
        std::list<CItem *>::iterator i = listaItems->begin();
-       while ( i != listaItems->end() ){
+       while ( i != listaItems->end() ) {
                CItem *temp = *i;
-               if ( temp->is_occupied_area(_a,_b) )
-                       return true;
-               i++;
+               if (temp != this) {
+                       if ( (temp2 = temp->get_connector_type(_a,_b)) != UNDEF )
+                               return temp2;
+                       i++;
+               }
        }
-       return false;
+       return UNDEF;
+}
+ConnectorType CItem::get_connector_type( int _a, int _b )
+{
+       return UNDEF;
 }