Changeset 442 for trunk/yao

Timestamp:

10/07/10 19:17:48 (14 years ago)

Author:

yerima

Message:

The new interface of the orderWindow is added. We are going to stop here wating for the approbation.

Location:

trunk/yao/src/interface

Files:

• src/InstructionWindow.cpp (modified) (1 diff)
• src/MainWindow.cpp (modified) (1 diff)
• src/ModinspaceWindow.cpp (added)
• src/OrderWindow.cpp (modified) (3 diffs)
• src/SpaceintrajWindow.cpp (added)
• src/include/InstructionWindow.hpp (modified) (2 diffs)
• src/include/ModinspaceWindow.hpp (added)
• src/include/OrderWindow.hpp (modified) (2 diffs)
• src/include/SpaceintrajWindow.hpp (added)
• ui_newprojectwindow.h (modified) (1 diff)

trunk/yao/src/interface/src/InstructionWindow.cpp

@@ -22 +22 @@
 
 /*********************************************************************************************************************************/
-InstructionWindow::InstructionWindow(QWidget *parent) : QWidget(parent) {
+InstructionWindow::InstructionWindow(/*yao::Table <yao::Function> *aFunctionTable,*/ QWidget *parent) : QWidget(parent) {
 
         setupUi(this);

trunk/yao/src/interface/src/MainWindow.cpp

@@ -928 +928 @@
 
         
-        InstructionWindow *iw = new InstructionWindow ;
+        InstructionWindow *iw = new InstructionWindow(/*&theFunctionTable*/) ;
         espace.addWindow(iw)->move(0, 0); 
         iw->show();     

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

@@ -23 +23 @@
 
         setupUi(this);
-
+        
         m_trajectoryTable       = aTrajectoryTable;
         m_spaceTable            = aSpaceTable;
         m_operatorTable         = anOperatorTable;
         m_modulTable            = aModulTable;
-
+        /*
         setFixedWidth(baseSize().width() + 765);
         m_comboTrajName->insertItem(0, "");
@@ -41 +41 @@
                 m_comboSpaceName->insertItem(1, QString(it->getName().c_str()));        
         }
-        m_orderModel    = new QStandardItemModel(0, 5);
+        */
+
+        //m_orderModel                  = new QStandardItemModel(0, 5);
+        //m_choiceComboBox              = new QComboBox;
+                m_choiceComboBox->addItem(tr("modinspace"));            
+                m_choiceComboBox->addItem(tr("spaceintraj"));           
+
+        //m_modinspaceRadioButton               = new QRadioButton("modinspace");
+        //m_spaceintrajRadioButton      = new QRadioButton("spaceintraj");      
+
+        ModinspaceWindow *misw          = new ModinspaceWindow; 
+        SpaceintrajWindow *sitw         = new SpaceintrajWindow(m_trajectoryTable, m_spaceTable, m_operatorTable);
+                //sitw->show(); 
+        
+        //horizontalLayout              = new QHBoxLayout;
+        //      horizontalLayout->addWidget(m_modinspaceRadioButton);
+        //      horizontalLayout->addWidget(m_spaceintrajRadioButton);
+
+        stackedLayout                   = new QStackedLayout(m_mainFrame);
+                 stackedLayout->addWidget(misw);
+                 stackedLayout->addWidget(sitw);
         
         
+        //mainLayout = new QVBoxLayout;
+                //mainLayout->addWidget(m_choiceComboBox);
+        //      mainLayout->addLayout(stackedLayout); 
+        //setLayout(mainLayout);
+        
+        
+        //setFixedWidth(baseSize().width() + 765);
+        //resize(645, 540);
+        connect(m_choiceComboBox, SIGNAL(activated(int )), stackedLayout, SLOT(setCurrentIndex(int )));
+        connect(m_quitButton, SIGNAL(clicked()), this, SLOT(close()));
 }
 
@@ -53 +83 @@
 
 /***********************************************************************/
+
+/***********************************************************************/
+/***********************************************************************/

trunk/yao/src/interface/src/include/InstructionWindow.hpp

@@ -13 +13 @@
 #include <QMessageBox> 
 #include "../../ui_instructionwindow.h"
+#include "../../../YAOObjects/Function.hpp"
+
+//#include "InsertFCTWindow.hpp"
 
 class InstructionWindow: public QWidget, public Ui::InstructionWindow {
@@ -19 +22 @@
 
         public :
-                InstructionWindow(QWidget *parent=0);
+                InstructionWindow(/*yao::Table <yao::Function> *aFunctionTable,*/ QWidget *parent=0);
 
         private slots:

trunk/yao/src/interface/src/include/OrderWindow.hpp

@@ -16 +16 @@
 #include "../../../YAOObjects/Trajectory.hpp"
 #include "../../../YAOObjects/Order.hpp"
+#include "ModinspaceWindow.hpp"
+#include "SpaceintrajWindow.hpp"
+
 #include <QStandardItemModel>
+#include <QStackedLayout>
+#include <QRadioButton>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
 
 class OrderWindow : public QWidget, public Ui::OrderWindow {
@@ -35 +42 @@
         private :
                 QStandardItemModel *m_orderModel;
+                QStackedLayout *stackedLayout;
+
+                //QRadioButton *m_modinspaceRadioButton;
+                //QRadioButton *m_spaceintrajRadioButton;
+                
+                QVBoxLayout *mainLayout;
+                //QHBoxLayout *horizontalLayout;
+
+                //QComboBox     *m_choiceComboBox;              
+        
                 yao::Table <yao::Trajectory> *m_trajectoryTable;
                 yao::Table <yao::Space> *m_spaceTable;

trunk/yao/src/interface/ui_newprojectwindow.h

@@ -2 +2 @@
 ** Form generated from reading UI file 'newprojectwindow.ui'
 **
-** Created: Sun Oct 3 16:42:34 2010
-**      by: Qt User Interface Compiler version 4.6.2
+** Created: Thu Oct 7 14:11:53 2010
+**      by: Qt User Interface Compiler version 4.6.3
 **
 ** WARNING! All changes made in this file will be lost when recompiling UI file!