Se recupera el and.h y se suben algo que estaba modificado en otros archivos

diff --git a/Constructor/include/and.h b/Constructor/include/and.h
index c64a1400abad0fa3051edcc18304b6e0ed0873fb..b872eca13ebe05036cda85637b7115d374e8ccf5 100644 (file)
--- a/Constructor/include/and.h
+++ b/Constructor/include/and.h
@@ -1,205 +1,27 @@
-# Doxyfile 1.3.4
+#ifndef _AND_H_
+#define _AND_H_
 
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = 
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = 
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = YES
-ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
-FULL_PATH_NAMES        = NO
-STRIP_FROM_PATH        = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = NO
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-DISTRIBUTE_GROUP_DOC   = NO
-TAB_SIZE               = 8
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = NO
-OPTIMIZE_OUTPUT_JAVA   = NO
-SUBGROUPING            = YES
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = NO
-EXTRACT_PRIVATE        = NO
-EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = YES
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = NO
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 30
-SHOW_USED_FILES        = YES
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = 
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = 
-FILE_PATTERNS          = 
-RECURSIVE              = NO
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = 
-INPUT_FILTER           = 
-FILTER_SOURCE_FILES    = NO
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION    = YES
-VERBATIM_HEADERS       = YES
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = NO
-COLS_IN_ALPHA_INDEX    = 5
-IGNORE_PREFIX          = 
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = html
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = 
-HTML_FOOTER            = 
-HTML_STYLESHEET        = 
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-TREEVIEW_WIDTH         = 250
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = YES
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = NO
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = YES
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = NO
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = YES
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DOT_IMAGE_FORMAT       = png
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1024
-MAX_DOT_GRAPH_DEPTH    = 0
-GENERATE_LEGEND        = YES
-DOT_CLEANUP            = YES
-#---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO
+#include "item.h"
+
+class And : public CItem {
+       public:
+               And();
+               virtual ~And();
+               virtual bool on_button_press_event(GdkEventButton *event);
+               virtual void on_menu_popup_rotar();
+               virtual void save(FILE *archivo);
+               virtual bool check_connection();
+               virtual ConnectorType detect_click_position(int _a, int _b);
+               virtual void update_logic_position();
+               virtual void get_in_logic_connect_position(int& _a, int& _b);
+               virtual void get_out_logic_connect_position(int& _a, int& _b);  
+       private:
+               int in_x, in_y, out_x, out_y;
+               std::vector<t_logic_connector> vec_connector;   
+               Glib::RefPtr<Gdk::Pixbuf> imageN; // 0 
+               Glib::RefPtr<Gdk::Pixbuf> imageS; // 1
+               Glib::RefPtr<Gdk::Pixbuf> imageE; // 2
+               Glib::RefPtr<Gdk::Pixbuf> imageO; // 3
+               Glib::RefPtr<Gdk::Pixbuf> null; 
+};
+#endif

diff --git a/Constructor/include/item.h b/Constructor/include/item.h
index 00451291928828c4b430c6feda1a8e6809cbd7ce..8ffd14e0e2f02b6a82ab50223b50844039c90c0d 100644 (file)
--- a/Constructor/include/item.h
+++ b/Constructor/include/item.h
@@ -12,10 +12,16 @@
 #include "itemptywnd.h"
 #include "workplace.h"
 
+/**Esta es la clase padre de todos los items que puedan aparecer
+  *Aca estan definidos todos los comportamientos en comun y en 
+  *algunos casos hay funciones abstractas para que cada item defina
+  * su propio comportamiento.
+*/
+
 ///Tipo de estado en el que pueden estar los conectores de un item
 typedef enum { UNDEF, IN, OUT } ConnectorType;
 
-
+///Tipo que indica que conector de alguna compuerta esta conectado con algun item. Usado para cargar el XML.
 typedef struct {
        ConnectorType type;
        Glib::ustring name_dest;
@@ -101,8 +107,13 @@ public:
        virtual void set_default_connector();   
        virtual ConnectorType get_connector_type( int _a, int _b );
        
+       /**Devuelve en _a y _b la posicion de los conectores logicos del item segun su posicion.
+       */
        virtual void get_in_logic_connect_position(int& _a, int& _b);
        virtual void get_out_logic_connect_position(int& _a, int& _b);
+       
+       /**Actualiza las posiciones de los conectores ante un movimiento o rotacion del item.
+       */
        virtual void update_logic_position();
        
        ///Puntero al area de trabajo de la ventana principal

diff --git a/Constructor/include/splitter.h b/Constructor/include/splitter.h
index ac05a36cb3820b91de3749086a07b50868a235ab..362d5de751a970905758bc464ee3b469d1c8129f 100644 (file)
--- a/Constructor/include/splitter.h
+++ b/Constructor/include/splitter.h
@@ -31,10 +31,10 @@ class Splitter : public CItem {
        private:
                /**Imagenes en sus 4 posiciones
                */
-               Glib::RefPtr<Gdk::Pixbuf> imageN; // 0 
-               Glib::RefPtr<Gdk::Pixbuf> imageS; // 1
-               Glib::RefPtr<Gdk::Pixbuf> imageE; // 2
-               Glib::RefPtr<Gdk::Pixbuf> imageO; // 3
+               Glib::RefPtr<Gdk::Pixbuf> imageN;
+               Glib::RefPtr<Gdk::Pixbuf> imageS;
+               Glib::RefPtr<Gdk::Pixbuf> imageE;
+               Glib::RefPtr<Gdk::Pixbuf> imageO;
                Glib::RefPtr<Gdk::Pixbuf> null; 
 };
 #endif

diff --git a/Constructor/include/workplace.h b/Constructor/include/workplace.h
index c4dfc94f63adebc76d788bb8861b64893f407caa..d01789e8d3e7171978c1c254310004e02c161949 100644 (file)
--- a/Constructor/include/workplace.h
+++ b/Constructor/include/workplace.h
@@ -5,29 +5,56 @@
 #include <gdkmm/gc.h>
 #include <gtkmm.h>
 #include <libglademm.h>
+/**Esta clase define el area de trabajo.
+  *Ella se encarga de eliminarlos y dibujar las lineas logicas que los conectan
+*/
 
+///Indico que la clase CItem existe para poder compilar.
 class CItem;
 
+///Esta estructura define una linea entre un item logico y uno de transporte.
 typedef struct {
        int logic_id, store_id;
 }t_line;
 
 class WorkPlace:public Gtk::Fixed {
        public:
+               ///Constructor.
                WorkPlace(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml> &refGlade);
+       
+               /// Destructor.
                virtual ~WorkPlace();
+       
+               ///Esta funcion es llamada cada vez que el area de trabajo se tenga que redibujar.
                virtual bool on_expose_event(GdkEventExpose *event);
+       
+               ///Borra el item con ID == _id.
                void delete_item(int _id);
+       
+               ///Borra las lineas que esten conectadas con el item de ID == _id.
                void delete_line(int _id);      
+       
+               ///Devuelve un puntero al item  de transporte _id.
                CItem *get_logic_item(int _id);
+       
+               ///Devuelve un puntero al item logico cuyo ID es _id.
                CItem *get_item(int _id);
+       
+               ///Actualiza las posiciones de los conectores logicos.
                void update_logic_position();
+               
+               ///Punteros a las listas de items.
                std::list<CItem *> *listaItems, *lista_logic_Items;
+               
                /** Listas de lineas que van de una compuerta a la entrada de un item y de la salida de un item a una compuerta
                          lista_lineas_in =  compuerta --> (entrada) item
                          lista_lineas_out= compuerta --> (salida) item
                */
                std::list<t_line> lista_lineas_in, lista_lineas_out;
+               
+               /**Variable global que identifica cual item logico fue apuntado para
+                 *conectarlo mediante una linea a un item de transporte
+                 */
                static int pointed;
 };
 

diff --git a/Doxyfile b/Doxyfile
index e51da7485fe9d36ac90d21b2a5616167ca445ab0..416b5eb50bde3206d7549a8ade6ded1007c66285 100644 (file)
--- a/Doxyfile
+++ b/Doxyfile
@@ -181,7 +181,7 @@ MACRO_EXPANSION        = NO
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = /usr/include \
-                         /usr/include/c++/3.3 \
+                         /usr/include/c++/3.2 \
                          /usr/include/gtkmm-2.0
 INCLUDE_FILE_PATTERNS  = 
 PREDEFINED             =