ahora compila, y se pueden guardar los datos de los items.

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index fdb9aa1d0346470e9ca7faafe595f21b0d7904f0..7fb292ddc0ad7cc3292d3791d48b139710303415 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -1,4 +1,5 @@
 #include "cistern.h"
 #include "cistern.h"

+#include "cisternptywnd.h"

 
 Cistern::Cistern()
 {
 
 Cistern::Cistern()
 {


@@ -8,7 +9,7 @@ Cistern::Cistern()
        imgActual = 0;
        image = imageE;
        set_size_request(image->get_width(), image->get_height());
        imgActual = 0;
        image = imageE;
        set_size_request(image->get_width(), image->get_height());

-       
+

        Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create("constructor.glade", "cistern_pty_wnd");
        ref->get_widget_derived("cistern_pty_wnd",cistern_pty_wnd);
        cistern_pty_wnd->cistern = this;
        Glib::RefPtr<Gnome::Glade::Xml> ref = Gnome::Glade::Xml::create("constructor.glade", "cistern_pty_wnd");
        ref->get_widget_derived("cistern_pty_wnd",cistern_pty_wnd);
        cistern_pty_wnd->cistern = this;

diff --git a/Constructor/cistern.h b/Constructor/cistern.h
index 3dca54310b01a8d631249f0f385a9883cba0958e..2bb8c981a87742b950006e1583f358f78d54c274 100644 (file)
--- a/Constructor/cistern.h
+++ b/Constructor/cistern.h
@@ -1,9 +1,8 @@
 #ifndef _CISTERN_H_
 #define _CISTERN_H_
 
 #ifndef _CISTERN_H_
 #define _CISTERN_H_
 

-#include "item.h"
-#include "cisternptywnd.h"

 #include <iostream>
 #include <iostream>

+#include "item.h"

 
 class CisternPtyWnd;
 
 
 class CisternPtyWnd;
 

diff --git a/Constructor/cisternptywnd.cpp b/Constructor/cisternptywnd.cpp
index c19de007014e99bc5e2f06ed45bf600c3d73463c..dcd475886a17ba02019e7fc034c3d4de513f4e64 100644 (file)
--- a/Constructor/cisternptywnd.cpp
+++ b/Constructor/cisternptywnd.cpp
@@ -1,8 +1,8 @@
 #include "cisternptywnd.h"
 #include "cisternptywnd.h"

+#include "cistern.h"

 
 CisternPtyWnd::CisternPtyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):PropertyWnd(cobject, refGlade)
 {
 
 CisternPtyWnd::CisternPtyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):PropertyWnd(cobject, refGlade)
 {

-       refGlade = Gnome::Glade::Xml::create("constructor.glade", "cistern_pty_wnd");

        refGlade->get_widget("spin_capacidad", spin_capacidad);
        refGlade->get_widget("spin_inicial", spin_inicial);
        refGlade->get_widget("txt_cistern_name", txt_cistern_name);
        refGlade->get_widget("spin_capacidad", spin_capacidad);
        refGlade->get_widget("spin_inicial", spin_inicial);
        refGlade->get_widget("txt_cistern_name", txt_cistern_name);

diff --git a/Constructor/cisternptywnd.h b/Constructor/cisternptywnd.h
index 186837b469f22eec268f431b498944c943aea91a..16e51adb967a157d2e99b63d68b498301e998063 100644 (file)
--- a/Constructor/cisternptywnd.h
+++ b/Constructor/cisternptywnd.h
@@ -2,7 +2,6 @@
 #define _CISTERNPTYWND_H_
 
 #include "propertywnd.h"
 #define _CISTERNPTYWND_H_
 
 #include "propertywnd.h"

-#include "cistern.h"

 
 class Cistern;
 
 
 class Cistern;
 

diff --git a/Constructor/conduct.h b/Constructor/conduct.h
index 4735d822dccf1aa2cab0246a64b08fcb31301206..78878a82e2a29b6d6274f30fbcea216c92a13e62 100644 (file)
--- a/Constructor/conduct.h
+++ b/Constructor/conduct.h
@@ -1,4 +1,3 @@
-// Conduct.h

 #ifndef _CONDUCT_H_
 #define _CONDUCT_H_
 
 #ifndef _CONDUCT_H_
 #define _CONDUCT_H_
 

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index c2410d54e31a8b8b3729c47781913b7f9d4ca828..08af2cfecea9d6beca45211cfa282ac234546ff7 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()
 {

diff --git a/Constructor/item.h b/Constructor/item.h
index f9e460cc3750979b3e308ea20e7b4c7168324370..9b8eabd7be1f22dbf1cc00f6577a4a52ac6e174a 100644 (file)
--- a/Constructor/item.h
+++ b/Constructor/item.h
@@ -1,5 +1,5 @@
-#ifndef GTKMM_EXAMPLE_DRAWINGAREALINES_H
-#define GTKMM_EXAMPLE_DRAWINGAREALINES_H
+#ifndef _ITEM_H_
+#define _ITEM_H_

 
 #include <iostream>
 #include <gtkmm/drawingarea.h>
 
 #include <iostream>
 #include <gtkmm/drawingarea.h>


@@ -9,7 +9,6 @@
 #include <gdkmm.h>
 #include <libglademm.h>
 #include "itemptywnd.h"
 #include <gdkmm.h>
 #include <libglademm.h>
 #include "itemptywnd.h"

-#include "workplace.h"

 
 class WorkPlace;
        
 
 class WorkPlace;
        

diff --git a/Constructor/itemptywnd.cpp b/Constructor/itemptywnd.cpp
index d1d00c8b111aa0092c71046232ea5b9c784d4dec..be27282c8bccf5d18486918b599f67d09963bc38 100644 (file)
--- a/Constructor/itemptywnd.cpp
+++ b/Constructor/itemptywnd.cpp
@@ -1,4 +1,5 @@
 #include "itemptywnd.h"
 #include "itemptywnd.h"

+#include "item.h"

 
 ItemPtyWnd::ItemPtyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):PropertyWnd(cobject,refGlade)
 {
 
 ItemPtyWnd::ItemPtyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade):PropertyWnd(cobject,refGlade)
 {

diff --git a/Constructor/itemptywnd.h b/Constructor/itemptywnd.h
index daaa32e5b001aa309ffe3567cd9cb36b959c970e..d6fd3262182efbc2de0a63736354c58bdbffe260 100644 (file)
--- a/Constructor/itemptywnd.h
+++ b/Constructor/itemptywnd.h
@@ -1,6 +1,5 @@
-//cisternptywnd.h
-#ifndef _CISTERNPTYWND_H_
-#define _CISTERNPTYWND_H_
+#ifndef _ITEMPTYWND_H_
+#define _ITEMPTYWND_H_

 
 #include "propertywnd.h"
 
 
 #include "propertywnd.h"
 


@@ -10,6 +9,7 @@ class ItemPtyWnd : public PropertyWnd {
                virtual ~ItemPtyWnd();
                Gtk::SpinButton *spin_caudal;
                Gtk::Entry *txt_item_name;
                virtual ~ItemPtyWnd();
                Gtk::SpinButton *spin_caudal;
                Gtk::Entry *txt_item_name;

+       protected:

                virtual void on_btn_cancel_clicked();
                virtual void on_btn_accept_clicked();
                virtual void on_btn_apply_clicked();
                virtual void on_btn_cancel_clicked();
                virtual void on_btn_accept_clicked();
                virtual void on_btn_apply_clicked();

diff --git a/Constructor/propertywnd.cpp b/Constructor/propertywnd.cpp
index 1bd3643df2c7b568ddde790ea6f9f9192f1fafc9..b233ca94228a1d36ce03aa3adc28c57f175c3450 100644 (file)
--- a/Constructor/propertywnd.cpp
+++ b/Constructor/propertywnd.cpp
@@ -1,8 +1,5 @@
 #include "propertywnd.h"
 #include "propertywnd.h"

-
-PropertyWnd::PropertyWnd()
-{      
-}
+#include "item.h"

 
 PropertyWnd::PropertyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade): Gtk::Window(cobject)
 {
 
 PropertyWnd::PropertyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade): Gtk::Window(cobject)
 {

diff --git a/Constructor/propertywnd.h b/Constructor/propertywnd.h
index ef8fbdfb904f41fbd215f72f3fb199fea885db2a..fa488af8510448c06060da99b3e9a4ee7b8d3621 100644 (file)
--- a/Constructor/propertywnd.h
+++ b/Constructor/propertywnd.h
@@ -6,13 +6,11 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/entry.h>
 #include <libglademm.h>
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/entry.h>
 #include <libglademm.h>

-#include "item.h"

 
 class CItem;
        
 class PropertyWnd : public Gtk::Window{
        public:
 
 class CItem;
        
 class PropertyWnd : public Gtk::Window{
        public:

-               PropertyWnd();

                PropertyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
                virtual ~PropertyWnd();
                CItem *item;            
                PropertyWnd(BaseObjectType* cobject, const Glib::RefPtr<Gnome::Glade::Xml>& refGlade);
                virtual ~PropertyWnd();
                CItem *item;