X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/65e0e3da6246674b0014c3a7c10aeecb61499725..a5853e30ca27518a7a3a33e4f97588f7b1e9ffe3:/Constructor/src/and.cpp
diff --git a/Constructor/src/and.cpp b/Constructor/src/and.cpp
index 4e0534e..bdc1f0e 100644
--- a/Constructor/src/and.cpp
+++ b/Constructor/src/and.cpp
@@ -1,21 +1,47 @@
#include "and.h"
-
-And::And()
+#include "cistern.h"
+And::And(int orientacion)
{
- in_x = x;
- in_y = y+16;
- out_x = x+32;
- out_y = y+16;
+ is_logic = true;
+ out_connected = false;
imageN = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_n.png");
imageS = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_s.png");
imageE = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_e.png");
imageO = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/and_o.png");
null = Gdk::Pixbuf::create_from_file(PACKAGE_DATA_DIR"/plaqui-constructor/pixmaps/null.png");
- imgActual = 0;
- image = imageE;
+ imgActual = orientacion;
+ switch (imgActual) {
+ case 1:
+ image = imageS;
+ in_x = x +16;
+ in_y = y;
+ out_x = x+16;
+ out_y = y+32;
+ break;
+ case 2:
+ image = imageO;
+ in_x = x+32;
+ in_y = y+16;
+ out_x = x;
+ out_y = y+16;
+ break;
+ case 3:
+ image = imageN;
+ in_x = x+16;
+ in_y = y+32;
+ out_x = x+16;
+ out_y = y;
+ break;
+ default:
+ imgActual = 0;
+ image = imageE;
+ in_x = x;
+ in_y = y+16;
+ out_x = x+32;
+ out_y = y+16;
+ }
set_size_request(image->get_width(), image->get_height());
name = "and";
- menulist.push_back( Gtk::Menu_Helpers::ImageMenuElem("Conectar", menu_image_linea,SigC::slot(*this, &CItem::on_menu_popup_conectar) ) ) ;
}
And::~And()
@@ -25,12 +51,35 @@ And::~And()
bool And::on_button_press_event(GdkEventButton *event)
{
if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 1)) {
- if ( CItem::logic_connect ) {
+ WorkPlace::pointed = ID;
+ t_line tmp_line;
+ std::cout << CItem::gate_id << std::endl;
+ if (CItem::logic_connect) {
+ if (CItem::gate_id != -1 ) {
+ if ( detect_click_position((int)event->x, (int)event->y ) == IN && CItem::gate_id != ID && !workplace->get_logic_item(CItem::gate_id)->get_out_logic_connect()) {
+ tmp_line.logic_id = CItem::gate_id;
+ workplace->get_logic_item(CItem::gate_id)->set_out_connected(true);
+ tmp_line.store_id = ID;
+ workplace->lista_lineas_logic.push_back(tmp_line);
+ workplace->queue_draw();
+ CItem::gate_id = -1;
+ }
+ } else {
+ CItem::gate_id = ID;
+ }
+ }
+ if ( CItem::logic_connect && detect_click_position((int)event->x, (int)event->y ) == OUT && !out_connected) {
CItem::gate_id = ID;
- WorkPlace::pointed = ID;
}
- combo_entry->set_text(name);
-
+ list_pointed->push_back(name);
+ combo_entry->set_popdown_strings(*list_pointed);
+ combo_entry->get_entry()->set_text (name);
+ workplace->queue_draw();
+ char f[20];
+ Glib::ustring text;
+ sprintf(f," Conector OUT = %d",out_connected);
+ text = name+f;
+ status_bar->push ( text, 0);
}
if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 2)){
@@ -72,7 +121,7 @@ bool And::on_button_press_event(GdkEventButton *event)
}
if ((event->type == GDK_BUTTON_PRESS) && ( event->button == 3)){
menu_popup.popup(event->button, event->time);
- return true; //It has been handled.
+ return true; //It has been handled.
}
workplace->queue_draw();
return true;
@@ -103,8 +152,18 @@ void And::save(FILE *archivo)
dato += c_y;
for ( int i=0; i<=vec_connector.size()-1&&!vec_connector.empty(); i++) {
if ( vec_connector[i].type == IN ) {
- dato += "\t\t";
- dato += vec_connector[i].name_dest + "\n";
+ if ( vec_connector[i].cistern_connector == 1 ) {
+ dato += "\t\t";
+ dato += vec_connector[i].name_dest + "\n";
+ }
+ if ( vec_connector[i].cistern_connector == 0 ) {
+ dato += "\t\t";
+ dato += vec_connector[i].name_dest + "\n";
+ }
+ if ( vec_connector[i].cistern_connector == -1 ) {
+ dato += "\t\t";
+ dato += vec_connector[i].name_dest + "\n";
+ }
} else {
dato += "\t\t";
dato += vec_connector[i].name_dest + "\n";
@@ -116,31 +175,55 @@ void And::save(FILE *archivo)
bool And::check_connection()
{
- int cant_in = 0, cant_out =0;
t_logic_connector temp;
std::list::iterator i = workplace->lista_lineas_in.begin();
while ( i != workplace->lista_lineas_in.end() ) {
- if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+ if ( (*i).logic_id== ID ) {
temp.type = OUT;
temp.name_dest = workplace->get_item((*i).store_id)->get_name();
vec_connector.push_back(temp);
- cant_out++;
}
i++;
}
i = workplace->lista_lineas_out.begin();
while ( i != workplace->lista_lineas_out.end() ) {
- if ( workplace->get_logic_item((*i).logic_id)->get_id() == ID ) {
+ if ( (*i).logic_id== ID ) {
temp.type = IN;
temp.name_dest = workplace->get_item((*i).store_id)->get_name();
+ if ( dynamic_cast(workplace->get_item((*i).store_id)) ) {
+ if ( (*i).cistern_out1 )
+ temp.cistern_connector = 1; //arriba
+ else
+ temp.cistern_connector = 0; //abajo
+ } else
+ temp.cistern_connector = -1; //si no es tanque.
vec_connector.push_back(temp);
- cant_in++;
}
i++;
}
- //FIXME la and tiene n entradas y una salida!!!!!!!!!!!!!!!
- return true;// (cant_in == cant_out );
+
+ i = workplace->lista_lineas_logic.begin();
+ while ( i != workplace->lista_lineas_logic.end() ) {
+ if ( (*i).logic_id == ID ) {
+ temp.type = OUT;
+ temp.name_dest = workplace->get_logic_item((*i).store_id)->get_name();
+ vec_connector.push_back(temp);
+ }
+ i++;
+ }
+
+ i = workplace->lista_lineas_logic.begin();
+ while ( i != workplace->lista_lineas_logic.end() ) {
+ if ( (*i).store_id == ID ) {
+ temp.type = IN;
+ temp.name_dest = workplace->get_logic_item((*i).logic_id)->get_name();
+ vec_connector.push_back(temp);
+ }
+ i++;
+ }
+
+ return true; //out_connected;
}
ConnectorType And::detect_click_position(int _a, int _b)
@@ -213,3 +296,51 @@ void And::get_out_logic_connect_position(int& _a, int& _b)
_a =out_x;
_b =out_y;
}
+
+void And::set_out_connected(bool _o)
+{
+ out_connected = _o;
+}
+
+bool And::get_out_logic_connect()
+{
+ return out_connected;
+}
+
+void And::draw_connectors()
+{
+ Glib::RefPtr window = get_window();
+ int a,b,c,d;
+ switch (imgActual) {
+ case 0:
+ a = in_x-x;
+ b = in_y-y-5;
+ c = out_x-x-10;
+ d = out_y-y-5;
+ break;
+ case 1:
+ a = in_x-x-5;
+ b = in_y-y;
+ c = out_x-x-5;
+ d = out_y-y-10;
+ break;
+ case 2:
+ a = in_x-x-10;
+ b = in_y-y-5;
+ c = out_x-x;
+ d = out_y-y-5;
+ break;
+ case 3:
+ a = in_x-x-5;
+ b = in_y-y-10;
+ c = out_x-x-5;
+ d = out_y-y;
+ }
+ gc->set_foreground(red);
+ gc->set_background(red);
+ window->draw_rectangle(gc, 1, a, b, 10, 10);
+ gc->set_foreground(blue);
+ gc->set_background(blue);
+ window->draw_rectangle(gc, 1, c, d, 10, 10);
+ queue_draw();
+}