Changeset 472 for trunk/yao/src/interface/src/OrderWindow.cpp

Timestamp:

10/29/10 12:22:13 (14 years ago)

Author:

yerima

Message:

The common object witch is the "Order" is present present both in the modinspace window than in the spaceintraj one according to the grammar. So some updates are made in those three class (OrderWindow?, ModinspaceWindow? and SpaceintrajWindow?).Visual Yao

File:

• trunk/yao/src/interface/src/OrderWindow.cpp (modified) (3 diffs)

trunk/yao/src/interface/src/OrderWindow.cpp

@@ -20 +20 @@
 
 /***************************************** Implementation of the Construtor OrderWindow() *************************************************/
-OrderWindow::OrderWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Modul> *aModulTable,  Table <Order> *anOrderTable, QWidget *parent) : stateOfSpaceintrajEndCheckBox(false), QWidget(parent) {
+OrderWindow::OrderWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Modul> *aModulTable,  Table <Order> *anOrderTable, QWidget *parent) : stateOfSpaceintrajEndCheckBox(false), QWidget(parent), m_localOrder(m_localModulTable) {
 
         setupUi(this);
@@ -29 +29 @@
         m_localModulTable               = aModulTable;
         m_localOrderTable               = anOrderTable;
+        
         /*
         setFixedWidth(baseSize().width() + 765);
@@ -51 +52 @@
         //m_modinspaceRadioButton               = new QRadioButton("modinspace");
         //m_spaceintrajRadioButton      = new QRadioButton("spaceintraj");      
-        ModinspaceWindow *misw          = new ModinspaceWindow(m_localModulTable, m_localSpaceTable, m_localOperaTable, m_localOrderTable); 
-        SpaceintrajWindow *sitw         = new SpaceintrajWindow(m_localTrajectoryTable, m_localSpaceTable, m_localOperaTable);
+        ModinspaceWindow *misw          = new ModinspaceWindow(m_localModulTable, m_localSpaceTable, m_localOperaTable, m_localOrderTable, &m_localOrder); 
+        SpaceintrajWindow *sitw         = new SpaceintrajWindow(m_localTrajectoryTable, m_localSpaceTable, m_localOperaTable, &m_localOrder);
                 //sitw->show();