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 b4a42fe9bba9371bc4f9a76c39fbca0f1fcde74e..72f63930554a284452052d2515d066aede363fb6 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,13 @@ 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;
+       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);
        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,20 +61,56 @@ void CItem::on_menu_popup_conectar()
 {
 }
 
 {
 }
 

+int CItem::get_position_x()
+{
+       return x;
+}
+
+int CItem::get_position_y()
+{
+       return y;
+}
+
+int CItem::get_id()
+{
+       return ID;
+}
+
+double CItem::get_caudal()
+{
+       return caudal_max;
+}
+
+
+Glib::ustring CItem::get_name()
+{
+       return name;
+}
+
+int CItem::get_img_actual()
+{
+       return imgActual;
+}
+

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

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

 {
 {

-       return x;
+       ID = _id;

 }
 
 }
 

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

 {
 {

-       return y;
+        caudal_max = _caudal;
+}
+
+void CItem::set_name(Glib::ustring _name)
+{
+       name = _name;

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


@@ -77,12 +120,21 @@ bool CItem::is_occupied_area(int _a, int _b)
                else return false;
 }
 
                else return false;
 }
 

-void CItem::set_id(int _id)
+ConnectorType CItem::is_other_connection_area(int _a, int _b)

 {
 {

-       ID = _id;
+       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 )
+                               return temp2;
+                       i++;
+               }
+       }
+       return UNDEF;

 }
 }

-
-int CItem::get_id()
+ConnectorType CItem::get_connector_type( int _a, int _b )

 {
 {

-       return ID;
+       return UNDEF;

 }
 }