X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/e0a805d3947c6bce53f1b2a0ffef837822ee3012..f5a1e732bf3907cabd004932aba3256b31d9d282:/Constructor/pump.cpp

diff --git a/Constructor/pump.cpp b/Constructor/pump.cpp
index 9ff057d..515dc90 100644
--- a/Constructor/pump.cpp
+++ b/Constructor/pump.cpp
@@ -10,11 +10,15 @@ Pump::Pump()
 	image = imageE;
 	set_size_request(image->get_width(), image->get_height());
 
-	Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create("constructor.glade", "item_pty_wnd");
-	ref->get_widget_derived("item_pty_wnd",pump_pty_wnd);
+	Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create("constructor.glade", "pump_pty_wnd");
+	ref->get_widget_derived("pump_pty_wnd",pump_pty_wnd);
 	pump_pty_wnd->pump = this;
-	pump_pty_wnd->set_title("Propiedades de la Bomba");	
 	name = "bomba";
+	
+	Connector temp;
+	temp.id_dest = -1;
+	temp.type = OUT;
+	connect_vec.push_back(temp);
 }
 
 Pump::~Pump()
@@ -48,8 +52,8 @@ bool Pump::on_button_press_event(GdkEventButton *event)
   	}
 	
 	if ((event->type == GDK_2BUTTON_PRESS) && (event->button ==1)){
-		pump_pty_wnd->spin_caudal->set_value( entrega );
-		pump_pty_wnd->txt_item_name->set_text( name );
+		pump_pty_wnd->spin_fluid->set_value( entrega );
+		pump_pty_wnd->txt_pump_name->set_text( name );
 		pump_pty_wnd->show();
 	}		
 	return true;
@@ -76,14 +80,27 @@ void Pump::set_entrega(double _ent)
 	entrega = _ent;
 }
 
+void Pump::set_liquid_color(Gdk::Color _color)
+{
+	liquid_color = _color;
+}
+
 double Pump::get_entrega()
 {
 	return entrega;
 }
 
+Gdk::Color Pump::get_liquid_color()
+{
+	return liquid_color;
+}
+
 void Pump::save(FILE *archivo)
 {
-	char c_id[50], c_entrega[50], c_x[50], c_y[50], c_img[50];
+	char c_id[50], c_entrega[50], c_x[50], c_y[50], c_img[50], c_red[50], c_green[50], c_blue[50];
+	sprintf(c_red,"\t\t\t<rojo>%d</rojo>\n",liquid_color.get_red());
+	sprintf(c_green,"\t\t\t<verde>%d</verde>\n",liquid_color.get_green());
+	sprintf(c_blue,"\t\t\t<azul>%d</azul>\n",liquid_color.get_blue());
 	sprintf(c_x,"\t\t<x>%d</x>\n",x);
 	sprintf(c_y,"\t\t<y>%d</y>\n",y);
 	sprintf(c_id,"%d",ID);
@@ -94,6 +111,11 @@ void Pump::save(FILE *archivo)
 	dato += c_id;
 	dato += "\">\n";
 	dato += c_entrega;
+	dato += "\t<color>\n";
+	dato += c_red;
+	dato += c_green;
+	dato += c_blue;
+	dato += "\t</color>\n";
 	dato += c_img;
 	dato += c_x; 
 	dato += c_y;
@@ -103,14 +125,32 @@ void Pump::save(FILE *archivo)
 
 bool Pump::check_connection()
 {
+	ConnectorType temp;
 	switch (get_img_actual()) {
 		case 0:
-			if ( is_other_occupied_area( get_position_x()+get_image()->get_width()+10 , get_position_y() +10) )
-				return true;				
+			temp = is_other_connection_area( get_position_x()+get_image()->get_width()+5 , get_position_y() +16);
 			break;
 		case 1:
-			if ( is_other_occupied_area( get_position_x() -10, get_position_y() -10) )
-				return true;
+			temp =  is_other_connection_area( get_position_x() -5, get_position_y() +16);
 	}
-	return false;
+	return (is_connected = ( temp == IN) );
+}
+
+ConnectorType Pump::get_connector_type(int _a, int _b)
+{
+	switch (imgActual) {
+		case 0: 
+			if ( (_a <= x+image->get_width()-1)&&(_a>=x+image->get_width()-10)&&(_b<=y+22)&&(_b > y) )  //derecha.
+				return connect_vec[0].type;
+			break;
+		case 1: 
+			if ( (_a <= x+10)&&(_a > x)&&(_b<=y+22)&&(_b > y) ) //izquierda
+				return connect_vec[0].type;
+	}
+	return UNDEF;
+}
+
+void Pump::set_default_connector()
+{
+	connect_vec[0].type = OUT;
 }