- Timestamp:
- 06/18/10 13:08:46 (14 years ago)
- Location:
- trunk/yao/src/interface/src
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/ContextWindow.cpp
r344 r348 22 22 23 23 setupUi(this); 24 // this->setWindowTitle("Directive Option."); 25 26 // compteur = 0; 24 27 25 localConstantTable = aConstantTable; 28 26 m_localContext = aContext; 29 27 // localMwc = mwc; 30 28 31 // m_ContextLayoutH1 = new QHBoxLayout;32 // m_ContextLayoutH2 = new QHBoxLayout;33 // m_ContextLayoutV1 = new QVBoxLayout;34 // m_layoutGContext = new QGridLayout;35 //36 // m_labelO_REAL = new QLabel("O_REAL ");37 // m_labelO_MQN = new QLabel("O_MQN ");38 // m_labelO_PARALLEL = new QLabel("O_PARALLEL ");39 // m_labelO_NETWARD = new QLabel("O_NETWARD ");40 // //m_comboNomContext = new QComboBox;41 // m_comboContextO_REAL = new QComboBox;42 29 m_comboContextO_REAL->insertItem(0, ""); 43 30 m_comboContextO_REAL->insertItem(1, "FLOAT"); 44 31 m_comboContextO_REAL->insertItem(2, "DOUBLE"); 45 // m_comboContextO_MQN = new QComboBox;46 32 m_comboContextO_MQN->insertItem(0, ""); 47 33 m_comboContextO_MQN->insertItem(1, "M1QN3"); 48 34 m_comboContextO_MQN->insertItem(2, "M2QN1"); 49 // m_comboContextO_PARALLEL = new QComboBox;50 //m_comboContextO_PARALLEL->setEditable(true);51 35 m_comboContextO_PARALLEL->insertItem(0, ""); 52 36 m_comboContextO_PARALLEL->insertItem(1, "ACTIF"); 53 37 54 // m_comboContextO_NETWARD = new QComboBox;55 38 m_comboContextO_NETWARD->insertItem(0, ""); 56 39 57 // m_comboContextO_EXTOBJ = new QComboBox;58 40 m_comboContextO_EXTOBJ->insertItem(0, ""); 59 41 for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++) { 60 // cout << it->getName().c_str() << endl;61 42 m_comboContextO_PARALLEL->insertItem(2, QString(it->getName().c_str())); 62 43 m_comboContextO_NETWARD->insertItem(1, QString(it->getName().c_str())); … … 64 45 } 65 46 66 // m_ContextDeleteButton->setDisabled(true);67 68 47 filesListModele = new QStringListModel(filesList); 69 48 contextModele = new QStandardItemModel(0, 14);//Nombre de lignes et colonnes du modÚle. 70 contextModele->setHorizontalHeaderLabels(QStringList() << "O_REAL" << "O_MQN" << "O_PARALLEL" << "O_NETWARD" << "O_EXTOBJ" << "O_GRADTEST" << "O_VARINCR" << "DBG_NANF" << "DBG_TING" << "DBG_BETA" << "DBG_TRC_FWARD" << "DBG_TRC_BWARD" << "DBG_TRC_LWARD" << "DBG_TRC_AWARD"); /*!< displays the QTable Widget*/49 contextModele->setHorizontalHeaderLabels(QStringList() << "O_REAL" << "O_MQN" << "O_PARALLEL" << "O_NETWARD" << "O_EXTOBJ" << "O_GRADTEST" << "O_VARINCR" << "DBG_NANF" << "DBG_TING" << "DBG_BETA" << "DBG_TRC_FWARD" << "DBG_TRC_BWARD" << "DBG_TRC_LWARD" << "DBG_TRC_AWARD"); /*!< displays the QTableView */ 71 50 72 51 m_contextTableView->setModel(contextModele); … … 76 55 m_contextTableView->setSelectionBehavior(QAbstractItemView::SelectRows); 77 56 57 /*for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++) { 58 59 contextModele->setItem(row, 0, new QStandardItem(m_comboContextO_REAL->currentText())); 60 } */ 61 78 62 O_EXTOBJModele = new QStandardItemModel(0, 1) ; 79 63 80 // m_O_EXTOBJListView = new QListView ; 81 m_O_EXTOBJListView->setModel(O_EXTOBJModele); 64 m_O_EXTOBJListView->setModel(O_EXTOBJModele); 82 65 83 66 //connect(m_enregContext, SIGNAL(clicked()), this, SLOT(saveContextData())); … … 87 70 connect(m_ContextHelpButton, SIGNAL(clicked()), this, SLOT(callContextHelp())); 88 71 89 90 72 connect(m_addButtonO_EXTOBJ, SIGNAL(clicked()), this, SLOT(addO_EXTOBJRow())); 91 92 73 connect(m_delButtonO_EXTOBJ, SIGNAL(clicked()), this, SLOT(deleteO_EXTOBJRow())); 93 74 -
trunk/yao/src/interface/src/MainWindow.cpp
r346 r348 290 290 m_orderCopy->hide(); 291 291 connect(m_orderButton, SIGNAL(clicked()), m_orderCopy, SLOT(show())); 292 //connect(m_orderButton, SIGNAL(clicked()), this, SLOT(enConstruction()));292 connect(m_orderButton, SIGNAL(clicked()), this, SLOT(changeColorOrderButton())); 293 293 294 294 m_insertFCTButton = new QPushButton(tr("Insert_fct"), this); … … 364 364 } 365 365 366 //connect(m_ContextCopy, SIGNAL(contextWindowIsClosed(int)), this, SLOT(initializeWindow(int)));366 connect(m_spaceCopy, SIGNAL(spaceWindowIsClosed(int)), this, SLOT(initializeWindow(int))); 367 367 } 368 368 /********************************************* Implementation of the method createModulWindow() ************************************************/ … … 968 968 } 969 969 970 /************************************ Implementation of the method enConstruction() whitch is a SLOT **********************************************/971 void MainWindow:: enConstruction() {972 973 QMessageBox::about(this, tr("Attention!"),("<p> Parametre en cours de construction!"));970 /************************************ Implementation of the method changeColorOrderButton() whitch is a SLOT **********************************************/ 971 void MainWindow::changeColorOrderButton() { 972 973 m_orderButton->setStyleSheet("background-color: rgb(180, 180, 180)"); 974 974 975 975 } -
trunk/yao/src/interface/src/OperaWindow.cpp
r340 r348 12 12 13 13 #include "include/OperaWindow.hpp" 14 #include "include/TrajectoryWindow.hpp"15 14 /*! 16 15 * \class OperaWindow … … 23 22 /******************************************* Contructeur ***************************************************/ 24 23 OperaWindow::OperaWindow(Table <Space> *aSpaceTable, Table <Trajectory> *aTrajectory, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent) { /*!< The constructor. */ 25 26 this->setWindowTitle("Directive Opera."); /*!< To set the window's title. */ 24 setupUi(this); 27 25 isCalled = false; 28 26 //QStringList *localTrajData = trajData; … … 33 31 //localOperaIdentifier = aOperaIdentifier; 34 32 compteur = 0; 35 m_OperaNameLabel = new QLabel("Nom eOpera: "); /*!< Label of the QLineEdit. */36 33 //m_OperaTypeLabel = new QLabel("Type eOpera: "); /*!< The QComboBox's type label. */ 37 m_OperaD1Label = new QLabel("Dimension 1: "); /*!< Label of the 1st dimension. */38 m_OperaD2Label = new QLabel("Dimension 2: ");39 m_OperaD3Label = new QLabel("Dimension 3: ");40 m_OperaTrajLabel = new QLabel("Trajectoire: ");41 34 42 m_OperaNameLine = new QLineEdit(this); /*!< Name of the QLineEdit. */ 43 m_OperaType = new QLineEdit("M"); /*!< Type of the QComboBox. */ 44 m_OperaType->setEnabled(false); 45 m_OperaType->setMaximumSize(30, 25); 46 m_OperaD1 = new QComboBox(this); /*!< Name of the 1st dimension. */ 35 //m_OperaType = new QLineEdit("M"); /*!< Type of the QComboBox. */ 36 // m_OperaType->setEnabled(false); 37 // m_OperaType->setMaximumSize(30, 25); 47 38 m_OperaD1->setEditable(true); 48 39 m_OperaD1->insertItem(0,""); 49 m_OperaD2 = new QComboBox(this); /*!< Name of the 2nd dimension. */50 40 m_OperaD2->setEditable(true); 51 41 m_OperaD2->insertItem(0,""); 52 m_OperaD3 = new QComboBox(this); /*!< Name of the 3rd dimension. */53 42 m_OperaD3->setEditable(true); 54 43 m_OperaD3->insertItem(0,""); … … 60 49 } 61 50 62 m_OperaTrajname = new QComboBox(this); /*!< Name of the selected traj. Must be declared */63 51 m_OperaTrajname->insertItem(0, ""); 64 52 for (Table<Trajectory>::reverse_iterator it = localTrajectoryTable->rbegin(); it != localTrajectoryTable->rend(); it++) … … 69 57 70 58 //m_OperaTrajname->addItem(trajData->); 71 m_OperaAddButton = new QPushButton("Ajouter", this); /*!< The button "add". */72 59 //m_OperaEnregButton = new QPushButton("Enregistrer",this); /*!< The button "save". */ 73 60 // m_OperaEnregButton->setDisabled(true); 74 m_OperaDeleteButton = new QPushButton("Supprimer", this); /*!< The button "delete". */75 61 m_OperaDeleteButton->setDisabled(true); 76 m_OperaHelpButton = new QPushButton("Aide", this);77 m_OperaHelpButton->setMaximumSize(35, 25);78 m_OperaQuitButton = new QPushButton("Quitter", this); /*!< The button "Quit". */79 62 80 63 modeleOpera = new QStandardItemModel(0, 6) ; 81 modeleOpera->setHorizontalHeaderLabels(QStringList() << "Nom eOpera" << "Type" << "Dim 1" << "Dim 2" << "Dim 3" << "Nom traj"); 82 83 m_OperaTableView = new QTableView; /*!< Name of the QTableView's object in whitch the objects are listed for the viewer. */ 64 modeleOpera->setHorizontalHeaderLabels(QStringList() << "Nom Opera" << "Type" << "Dim 1" << "Dim 2" << "Dim 3" << "Nom traj"); 65 84 66 m_OperaTableView->setModel(modeleOpera); 85 67 m_OperaTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ … … 87 69 m_OperaTableView->setSelectionBehavior(QAbstractItemView::SelectRows); 88 70 m_OperaTableView->resizeColumnsToContents(); 89 m_OperaLayout1V = new QVBoxLayout; 90 m_OperaLayout1V->addWidget(m_OperaAddButton); 91 m_OperaLayout1V->addWidget(m_OperaDeleteButton); 92 m_OperaLayout1V->addWidget(m_OperaHelpButton); 93 94 m_OperaLayout1H = new QHBoxLayout; /*!< The 1st horizontal Layout's name. */ 95 m_OperaLayout1H->addWidget(m_OperaTableView); 96 m_OperaLayout1H->addLayout(m_OperaLayout1V); 97 98 m_OperaLayout2H = new QHBoxLayout; /*!< The 2nd horizontal Layout's name. */ 99 m_OperaLayout2H->addWidget(m_OperaQuitButton); 71 72 100 73 101 m_OperaLayoutG = new QGridLayout;102 m_OperaLayoutG->addWidget(m_OperaNameLabel, 0, 1); /*!< Adding in the main layout: the Opera's name. */103 m_OperaLayoutG->addWidget(m_OperaNameLine, 0, 2, Qt::AlignLeft);104 74 //m_OperaLayoutG->addWidget(m_OperaTypeLabel, 1, 1); /*!< Adding in the main layout: the Opera's type. */ 105 75 //m_OperaLayoutG->addWidget(m_OperaType, 1, 2, Qt::AlignLeft); 106 m_OperaLayoutG->addWidget(m_OperaD1Label, 2, 1); /*!< Adding in the main layout: the Opera's 1st dim. */107 m_OperaLayoutG->addWidget(m_OperaD1, 2, 2, Qt::AlignLeft);108 m_OperaLayoutG->addWidget(m_OperaD2Label, 3, 1);109 m_OperaLayoutG->addWidget(m_OperaD2, 3, 2, Qt::AlignLeft);110 m_OperaLayoutG->addWidget(m_OperaD3Label, 4, 1);111 m_OperaLayoutG->addWidget(m_OperaD3, 4, 2, Qt::AlignLeft);112 m_OperaLayoutG->addWidget(m_OperaTrajLabel, 5, 1);113 m_OperaLayoutG->addWidget(m_OperaTrajname, 5, 2, Qt::AlignLeft);114 //m_OperaLayoutG->addWidget(m_OperaHelpButton, 7, 0);115 m_OperaLayoutG->addWidget(m_OperaTableView, 6, 1, 6, 4);116 m_OperaLayoutG->addWidget(m_OperaAddButton, 7, 5);117 m_OperaLayoutG->addWidget(m_OperaDeleteButton, 8, 5);118 m_OperaLayoutG->addWidget(m_OperaQuitButton, 9, 5);119 m_OperaLayoutG->addWidget(m_OperaHelpButton, 11, 5);120 //m_OperaLayoutG->addLayout(m_OperaLayout2H, 10, 1, 1, 4);121 76 122 this->setLayout(m_OperaLayoutG); /*!< Sets m_layout1Opera as the main layout */123 77 124 78 connect(m_OperaAddButton, SIGNAL(clicked()), this, SLOT(addOperaRow())); /*!< Adds rows in the tableview after clicking on the button "Add"*/ … … 129 83 130 84 131 setFixedWidth(baseSize().width() + 485);85 setFixedWidth(baseSize().width() + 525); 132 86 } 133 87 //------------------------------------ End of the contructor declaration.--------------------------------------- … … 180 134 181 135 modeleOpera->setItem(row, 0, new QStandardItem(m_OperaNameLine->text())); 182 modeleOpera->setItem(row, 1, new QStandardItem(m_OperaType->text()));136 //modeleOpera->setItem(row, 1, new QStandardItem(m_OperaType->text())); 183 137 modeleOpera->setItem(row, 2, new QStandardItem(m_OperaD1->currentText())); 184 138 modeleOpera->setItem(row, 3, new QStandardItem(m_OperaD2->currentText())); -
trunk/yao/src/interface/src/SpaceWindow.cpp
r341 r348 23 23 /******************************************* Contructeur ***************************************************/ 24 24 SpaceWindow::SpaceWindow(Table <Space> *aSpaceTable, Table <Trajectory> *aTrajectory, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent) { /*!< The constructor. */ 25 26 this->setWindowTitle("Directive Space."); /*!< To set the window's title. */ 25 setupUi(this); 27 26 isCalled = false; 28 27 //QStringList *localTrajData = trajData; … … 33 32 //localSpaceIdentifier = aSpaceIdentifier; 34 33 compteur = 0; 35 m_spaceNameLabel = new QLabel("Nom espace: "); /*!< Label of the QLineEdit. */36 //m_spaceTypeLabel = new QLabel("Type espace: "); /*!< The QComboBox's type label. */37 m_spaceD1Label = new QLabel("Dimension 1: "); /*!< Label of the 1st dimension. */38 m_spaceD2Label = new QLabel("Dimension 2: ");39 m_spaceD3Label = new QLabel("Dimension 3: ");40 m_spaceTrajLabel = new QLabel("Trajectoire: ");41 34 42 m_spaceNameLine = new QLineEdit(this); /*!< Name of the QLineEdit. */43 m_spaceType = new QLineEdit("M"); /*!< Type of the QComboBox. */44 m_spaceType->setEnabled(false);45 m_spaceType->setMaximumSize(30, 25);46 m_spaceD1 = new QComboBox(this); /*!< Name of the 1st dimension. */47 35 m_spaceD1->setEditable(true); 48 36 m_spaceD1->insertItem(0,""); 49 m_spaceD2 = new QComboBox(this); /*!< Name of the 2nd dimension. */50 37 m_spaceD2->setEditable(true); 51 38 m_spaceD2->insertItem(0,""); 52 m_spaceD3 = new QComboBox(this); /*!< Name of the 3rd dimension. */53 39 m_spaceD3->setEditable(true); 54 40 m_spaceD3->insertItem(0,""); … … 60 46 } 61 47 62 m_spaceTrajname = new QComboBox(this); /*!< Name of the selected traj. Must be declared */63 48 m_spaceTrajname->insertItem(0, ""); 64 49 for (Table<Trajectory>::reverse_iterator it = localTrajectoryTable->rbegin(); it != localTrajectoryTable->rend(); it++) … … 69 54 70 55 //m_spaceTrajname->addItem(trajData->); 71 m_spaceAddButton = new QPushButton("Ajouter", this); /*!< The button "add". */72 56 //m_spaceEnregButton = new QPushButton("Enregistrer",this); /*!< The button "save". */ 73 57 // m_spaceEnregButton->setDisabled(true); 74 m_spaceDeleteButton = new QPushButton("Supprimer", this); /*!< The button "delete". */75 58 m_spaceDeleteButton->setDisabled(true); 76 m_spaceHelpButton = new QPushButton("Aide", this);77 m_spaceHelpButton->setMaximumSize(35, 25);78 m_spaceQuitButton = new QPushButton("Quitter", this); /*!< The button "Quit". */79 59 80 60 modeleSpace = new QStandardItemModel(0, 6) ; 81 61 modeleSpace->setHorizontalHeaderLabels(QStringList() << "Nom espace" << "Type" << "Dim 1" << "Dim 2" << "Dim 3" << "Nom traj"); 82 62 83 m_spaceTableView = new QTableView; /*!< Name of the QTableView's object in whitch the objects are listed for the viewer. */84 63 m_spaceTableView->setModel(modeleSpace); 85 64 m_spaceTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ … … 87 66 m_spaceTableView->setSelectionBehavior(QAbstractItemView::SelectRows); 88 67 m_spaceTableView->resizeColumnsToContents(); 89 m_spaceLayout1V = new QVBoxLayout;90 m_spaceLayout1V->addWidget(m_spaceAddButton);91 m_spaceLayout1V->addWidget(m_spaceDeleteButton);92 m_spaceLayout1V->addWidget(m_spaceHelpButton);93 94 m_spaceLayout1H = new QHBoxLayout; /*!< The 1st horizontal Layout's name. */95 m_spaceLayout1H->addWidget(m_spaceTableView);96 m_spaceLayout1H->addLayout(m_spaceLayout1V);97 98 m_spaceLayout2H = new QHBoxLayout; /*!< The 2nd horizontal Layout's name. */99 m_spaceLayout2H->addWidget(m_spaceQuitButton);100 101 m_spaceLayoutG = new QGridLayout;102 m_spaceLayoutG->addWidget(m_spaceNameLabel, 0, 1); /*!< Adding in the main layout: the space's name. */103 m_spaceLayoutG->addWidget(m_spaceNameLine, 0, 2, Qt::AlignLeft);104 //m_spaceLayoutG->addWidget(m_spaceTypeLabel, 1, 1); /*!< Adding in the main layout: the space's type. */105 //m_spaceLayoutG->addWidget(m_spaceType, 1, 2, Qt::AlignLeft);106 m_spaceLayoutG->addWidget(m_spaceD1Label, 2, 1); /*!< Adding in the main layout: the space's 1st dim. */107 m_spaceLayoutG->addWidget(m_spaceD1, 2, 2, Qt::AlignLeft);108 m_spaceLayoutG->addWidget(m_spaceD2Label, 3, 1);109 m_spaceLayoutG->addWidget(m_spaceD2, 3, 2, Qt::AlignLeft);110 m_spaceLayoutG->addWidget(m_spaceD3Label, 4, 1);111 m_spaceLayoutG->addWidget(m_spaceD3, 4, 2, Qt::AlignLeft);112 m_spaceLayoutG->addWidget(m_spaceTrajLabel, 5, 1);113 m_spaceLayoutG->addWidget(m_spaceTrajname, 5, 2, Qt::AlignLeft);114 //m_spaceLayoutG->addWidget(m_spaceHelpButton, 7, 0);115 m_spaceLayoutG->addWidget(m_spaceTableView, 6, 1, 6, 4);116 m_spaceLayoutG->addWidget(m_spaceAddButton, 7, 5);117 m_spaceLayoutG->addWidget(m_spaceDeleteButton, 8, 5);118 m_spaceLayoutG->addWidget(m_spaceQuitButton, 9, 5);119 m_spaceLayoutG->addWidget(m_spaceHelpButton, 11, 5);120 //m_spaceLayoutG->addLayout(m_spaceLayout2H, 10, 1, 1, 4);121 122 this->setLayout(m_spaceLayoutG); /*!< Sets m_layout1Space as the main layout */123 68 124 69 connect(m_spaceAddButton, SIGNAL(clicked()), this, SLOT(addSpaceRow())); /*!< Adds rows in the tableview after clicking on the button "Add"*/ … … 129 74 130 75 131 setFixedWidth(baseSize().width() + 485);76 setFixedWidth(baseSize().width() + 515); 132 77 } 133 78 //------------------------------------ End of the contructor declaration.--------------------------------------- … … 344 289 } 345 290 } 346 291 /************************************************************************/void SpaceWindow::closeEvent(QCloseEvent *event) { 292 293 emit spaceWindowIsClosed(5); 294 } -
trunk/yao/src/interface/src/TrajectoryWindow.cpp
r345 r348 2 2 * \file TrajectoryWindow.cpp 3 3 * \brief Traj class for visual_YAO. 4 * \version 2010/06/1 6(yyyy/mm/dd)4 * \version 2010/06/18 (yyyy/mm/dd) 5 5 * \author MAYAKI Abdouramane. 6 6 */ … … 15 15 TrajectoryWindow::TrajectoryWindow(Table <Trajectory> *aTrajectoryTable, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), localTrajectoryTable(NULL), modeleTraj(NULL), localConstantTable(NULL) { /*!< The constructor. */ 16 16 17 setupUi(this); 18 //setWindowTitle("Directive Trajectoire."); /*!< To set the window's title. */ 17 setupUi(this); // See ui_trajectorywindow.h for more. 18 19 19 localTrajectoryTable = aTrajectoryTable; 20 20 localConstantTable = aConstantTable; 21 /*m_nameLabel = new QLabel("Nom trajectoire:"); 22 m_typeLabel = new QLabel("Type :"); 23 m_labelTrajNbuptime = new QLabel("Initialisation (uptime >= 0.0):"); 24 m_labelTrajOfftime = new QLabel("Décalage (offtime >= 0.0):"); 25 m_labelTrajNDtime = new QLabel("Position (dtime):"); 26 m_labelTrajNbsteptime = new QLabel("Pas de temps (stepTime > uptime):"); 27 28 m_quitTraj = new QPushButton("Quitter"); 29 m_addButton = new QPushButton("Ajouter"); 30 m_delButton = new QPushButton("Supprimer"); 31 m_helpButton = new QPushButton("Aide"); 32 m_helpButton->setMaximumSize(35, 25);*/ 33 //m_lignetrajName = new QLineEdit; /*!< Name of the QLineEdit. */ 34 35 36 //m_comboNbuptimeTraj = new QComboBox(this); /*!< Nbuptime of the QComboBox. */ 37 // m_comboNbuptimeTraj->setMaximumSize(70, 25); 38 m_comboNbuptimeTraj->setEditable(true); 39 m_comboNbuptimeTraj->insertItem(0, ""); 40 //m_comboSteptimeTraj = new QComboBox; /*!< Nbsteptime of the QComboBox. */ 41 // m_comboSteptimeTraj->setMaximumSize(70, 25); 42 m_comboSteptimeTraj->setEditable(true); 43 m_comboSteptimeTraj->insertItem(0, ""); 44 //m_comboSteptimeTraj->setMaximumSize(35, 25); 45 //m_comboDtimeTraj = new QComboBox(this); /*!< Dtime of the QComboBox. */ 46 // m_comboDtimeTraj->setMaximumSize(70, 25); 47 m_comboDtimeTraj->setEditable(true); 48 m_comboDtimeTraj->insertItem(0, "1"); 49 //m_comboOfftimeTraj = new QComboBox(this); /*!< Offtime of the QComboBox. */ 50 // m_comboOfftimeTraj->setMaximumSize(70, 25); 51 m_comboOfftimeTraj->setEditable(true); 52 m_comboOfftimeTraj->insertItem(0, "0"); 21 22 m_comboNbuptimeTraj->setEditable(true); 23 m_comboNbuptimeTraj->insertItem(0, ""); 24 25 m_comboSteptimeTraj->setEditable(true); 26 m_comboSteptimeTraj->insertItem(0, ""); 27 28 m_comboDtimeTraj->setEditable(true); 29 m_comboDtimeTraj->insertItem(0, "1"); 30 31 m_comboOfftimeTraj->setEditable(true); 32 m_comboOfftimeTraj->insertItem(0, "0"); 33 53 34 for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++) { 54 35 m_comboNbuptimeTraj->insertItem(1, QString(it->getName().c_str())); … … 61 42 //m_ligneTypeTraj->setDisabled(true); 62 43 // m_ligneTypeTraj->setMaximumSize(30, 25); 63 44 64 45 modeleTraj = new QStandardItemModel(0, 6) ; 65 46 modeleTraj->setHorizontalHeaderLabels(QStringList() << "Nom traj." << "type" << "uptime" << "offtime" << "dtime" << "stepTime"); 66 67 //for (Table<Trajectory>::iterator it = localTrajectoryTable->begin(); it != localTrajectoryTable->end(); it++) 68 //{ 69 //modeleTraj->setItem(modele->rowCount(), 0, new QStandardItem(QString(it->getName().c_str()))); 70 //modeleTraj->setItem(modele->rowCount()-1, 1, new QStandardItem(QString(it->getText().c_str())));//Apres le 1er ajout, la ligne vaut i+1 71 72 //modeleTraj->setItem(modeleTraj->rowCount(), 0, new QStandardItem(QString(it->getName().c_str()))); 73 //modeleTraj->setItem(modeleTraj->rowCount(), 1, new QStandardItem(QString(it->getBoot()))); 74 //modeleTraj->setItem(modeleTraj->rowCount(), 2, new QStandardItem(QString(it->getSize().c_str()))); 75 //modeleTraj->setItem(modeleTraj->rowCount(), 3, new QStandardItem(QString(it->getStep().c_str()))); 76 //modeleTraj->setItem(modeleTraj->rowCount(), 4, new QStandardItem(QString(it->getOffset().c_str()))); 77 //modeleTraj->setItem(modeleTraj->rowCount(), 5, new QStandardItem(QString(it->getType().c_str()))); 78 79 //} 80 81 82 //vueTraj = new QTableView; /*!< vueTraj of the QTableWidget */ 47 for (Table<Trajectory>::iterator it = localTrajectoryTable->begin(); it != localTrajectoryTable->end(); it++) { 48 49 int row = modeleTraj->rowCount(); 50 //string t = atoi(it->getBoot()); 51 ostringstream t, offtime, dtime, steptime; 52 53 t << it->getBoot(); 54 offtime << it->getOffset(); 55 dtime << it->getStep(); 56 steptime << it->getSize(); 57 58 modeleTraj->setItem(row, 0, new QStandardItem(QString(it->getName().c_str()))); 59 modeleTraj->setItem(row, 1, new QStandardItem(QString(it->getType())));//Apres le 1er ajout, la ligne vaut i+1 60 modeleTraj->setItem(row, 2, new QStandardItem(QString((t.str().c_str())))); 61 modeleTraj->setItem(row, 3, new QStandardItem(QString(offtime.str().c_str()))); 62 modeleTraj->setItem(row, 4, new QStandardItem(QString(dtime.str().c_str()))); 63 modeleTraj->setItem(row, 5, new QStandardItem(QString(steptime.str().c_str()))); 64 65 } 66 67 83 68 vueTraj->setModel(modeleTraj); 84 69 vueTraj->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ … … 87 72 vueTraj->resizeColumnsToContents(); /*!< To adjust the Horizontal Header Labels to appear correctly in a QTableView.*/ 88 73 89 /*m_layoutGTraj = new QGridLayout;90 m_layoutGTraj->addWidget(m_nameLabel, 0, 2);91 m_layoutGTraj->addWidget(m_lignetrajName, 0, 3);92 93 m_layoutGTraj->addWidget(m_typeLabel, 1, 2);94 m_layoutGTraj->addWidget(m_ligneTypeTraj, 1, 3);95 96 m_layoutGTraj->addWidget(m_labelTrajNbuptime, 2, 2);97 m_layoutGTraj->addWidget(m_comboNbuptimeTraj, 2, 3, Qt::AlignLeft);98 99 m_layoutGTraj->addWidget(m_labelTrajNbsteptime, 5, 2);100 m_layoutGTraj->addWidget(m_comboSteptimeTraj, 5, 3, Qt::AlignLeft);101 102 m_layoutGTraj->addWidget(m_labelTrajNDtime, 4, 2);103 m_layoutGTraj->addWidget(m_comboDtimeTraj, 4, 3, Qt::AlignLeft);104 105 m_layoutGTraj->addWidget(m_labelTrajOfftime, 3, 2);106 m_layoutGTraj->addWidget(m_comboOfftimeTraj, 3, 3, Qt::AlignLeft);107 108 109 m_layoutGTraj->addWidget(vueTraj, 6, 2, 6, 3);*/110 //m_layoutGTraj->addWidget(m_addButton , 7, 5); /*!< added m_addButton in the QGridLayout */111 //m_layoutGTraj->addWidget(m_delButton , 8, 5); /*!< added m_delButton in the QGridLayout */112 //m_layoutGTraj->addWidget(m_quitTraj, 9, 5);113 //m_layoutGTraj->addWidget(m_helpButton, 11, 5);114 //setLayout(m_layoutGTraj);115 116 74 connect(m_quitTraj, SIGNAL(clicked()), this, SLOT(close())); /*!< slot for the close this windows*/ 117 75 connect(m_delButton, SIGNAL(clicked()), this, SLOT(deleteTrajRow())); /*!< slot for the delete the object selected in the view*/ … … 119 77 connect(m_helpButton, SIGNAL(clicked()), this, SLOT(callTrajHelp())); /*!< This slot opens */ 120 78 121 setFixedWidth(baseSize().width() + 5 10);79 setFixedWidth(baseSize().width() + 525); 122 80 } 123 81 … … 396 354 modeleTraj->setItem(row, 1, new QStandardItem(typeTraj)); 397 355 modeleTraj->setItem(row, 2, new QStandardItem(upTime)); 398 modeleTraj->setItem(row, 3, new QStandardItem( stepTime));356 modeleTraj->setItem(row, 3, new QStandardItem(offTime)); 399 357 modeleTraj->setItem(row, 4, new QStandardItem(dTime)); 400 modeleTraj->setItem(row, 5, new QStandardItem( offTime));358 modeleTraj->setItem(row, 5, new QStandardItem(stepTime)); 401 359 } 402 360 … … 491 449 } 492 450 */ 493 /*************************************** ********************************/451 /*************************************** Implementation of the method closeEvent(QCloseEvent ) ********************************/ 494 452 void TrajectoryWindow::closeEvent(QCloseEvent *event) { 495 453 -
trunk/yao/src/interface/src/include/MainWindow.hpp
r344 r348 65 65 void setActiveProject(const bool aBool); 66 66 bool isActiveProject(); 67 /*template <class R, class S> void createDefvalWindow(R *directive, S *espace) { 68 69 if (directive == NULL) { //to test if the object is already created. 70 71 directive = new directive ; 72 espace->addWindow(directive)->move(0, 0); //Put the object in the workspace 73 directive->show();// shows the object. 74 } 75 76 connect(directive, SIGNAL(rowIsAdded()), this, SLOT(hatUpdate())); 77 connect(directive, SIGNAL(rowIsDeleted(QString )), this, SLOT(hatUpdate(QString ))); 78 connect(directive, SIGNAL(windowIsClosed(int )), this, SLOT(initializeWindow(int ))); 79 80 }*/ 81 67 82 // void creerRepertoire(); 68 83 // void genererConstant(); … … 106 121 void changeColorNetwardButton(); 107 122 void changeColorInsertFCTButton(); 108 void enConstruction();123 void changeColorOrderButton(); 109 124 void createProjectDirectory(); 110 125 void openPathWindow(); -
trunk/yao/src/interface/src/include/OperaWindow.hpp
r340 r348 10 10 #define OperaWindow_HPP 11 11 12 #include "src/include/Entete.hpp" 13 //#include "TrajectoryWindow.hpp" 14 #include <QLineEdit> 15 #include <QLabel> 16 #include <QComboBox> 17 #include <QFormLayout> 18 #include <QGridLayout> 12 #include "TrajectoryWindow.hpp" 13 #include "../../ui_operawindow.h" 19 14 #include <QStandardItemModel> 20 #include <QTableView>21 15 #include <QStringList> 22 #include <QLabel>23 16 #include <string> 24 17 #include <QMessageBox> … … 36 29 37 30 38 class OperaWindow : public QWidget {31 class OperaWindow : public QWidget, Ui::OperaWindow { 39 32 40 33 Q_OBJECT /*!< Must be declared for using signals and slots.*/ … … 70 63 71 64 private : 72 QLabel *m_OperaNameLabel; /*!< Label of the QLineEdit. */73 QLabel *m_OperaTypeLabel; /*!< The QComboBox's type label. */74 QLabel *m_OperaD1Label; /*!< Label of the 1st dimension. */75 QLabel *m_OperaD2Label;76 QLabel *m_OperaD3Label;77 QLabel *m_OperaTrajLabel;78 79 QLineEdit *m_OperaNameLine; /*!< Name of the Opera. */80 QLineEdit *m_OperaType; /*!< Type of the Opera. */81 65 82 QComboBox *m_OperaD1; /*!< Name of the 1st dimension. */83 QComboBox *m_OperaD2; /*!< Name of the 2nd dimension. */84 QComboBox *m_OperaD3; /*!< Name of the 3rd dimension. */85 QComboBox *m_OperaTrajname; /*!< Name of the selected traj. Must be declared in the traj Window */86 66 87 67 QModelIndex index; 88 68 QStandardItemModel *modeleOpera; 89 QTableView *m_OperaTableView; /*!< Name of the QTableView's object in whitch the objects are listed for the viewer. */90 69 91 QPushButton *m_OperaAddButton; /*!< The button "add". */92 QPushButton *m_OperaEnregButton; /*!< The button "save". */93 QPushButton *m_OperaDeleteButton; /*!< The button "delete". */94 QPushButton *m_OperaHelpButton;95 QPushButton *m_OperaQuitButton; /*!< The button "Quit". */96 70 97 QHBoxLayout *m_OperaLayout1H; /*!< The 1st horizontal Layout's name. */98 QHBoxLayout *m_OperaLayout2H; /*!< The 2nd horizontal Layout's name. */99 QVBoxLayout *m_OperaLayout1V;100 QGridLayout *m_OperaLayoutG;101 102 QVBoxLayout *m_layoutPrincipalOpera;/*!< The vertical Layout's name. */103 QFormLayout *m_layout1Opera; /*!< The only QFormLayout's name. */104 71 105 72 QStringList m_horizontalHeader; -
trunk/yao/src/interface/src/include/SpaceWindow.hpp
r341 r348 10 10 #define SPACEWINDOW_HPP 11 11 12 #include "src/include/Entete.hpp" 12 #include "../../ui_spacewindow.h" 13 //#include "include/Entete.hpp" 13 14 //#include "TrajectoryWindow.hpp" 14 #include <QLineEdit>15 #include <QLabel>16 #include <QComboBox>17 #include <QFormLayout>18 #include <QGridLayout>19 15 #include <QStandardItemModel> 20 #include <QTableView>21 16 #include <QStringList> 22 #include <QLabel>23 17 #include <string> 24 18 #include <QMessageBox> … … 36 30 37 31 38 class SpaceWindow : public QWidget {32 class SpaceWindow : public QWidget, Ui::SpaceWindow { 39 33 40 34 Q_OBJECT /*!< Must be declared for using signals and slots.*/ 41 35 42 36 public : 43 37 /*! 44 38 * \brief Constructor … … 62 56 //typedef yao::Operator Space; 63 57 64 58 public slots: /*!< Functions called after a click. */ 65 59 66 60 void addSpaceRow(); … … 69 63 void callSpaceHelp(); 70 64 71 private : 72 QLabel *m_spaceNameLabel; /*!< Label of the QLineEdit. */ 73 QLabel *m_spaceTypeLabel; /*!< The QComboBox's type label. */ 74 QLabel *m_spaceD1Label; /*!< Label of the 1st dimension. */ 75 QLabel *m_spaceD2Label; 76 QLabel *m_spaceD3Label; 77 QLabel *m_spaceTrajLabel; 65 signals: 66 void spaceWindowIsClosed(int anInt); 78 67 79 QLineEdit *m_spaceNameLine; /*!< Name of the space. */ 80 QLineEdit *m_spaceType; /*!< Type of the space. */ 81 82 QComboBox *m_spaceD1; /*!< Name of the 1st dimension. */ 83 QComboBox *m_spaceD2; /*!< Name of the 2nd dimension. */ 84 QComboBox *m_spaceD3; /*!< Name of the 3rd dimension. */ 85 QComboBox *m_spaceTrajname; /*!< Name of the selected traj. Must be declared in the traj Window */ 68 protected: 69 void closeEvent(QCloseEvent *event); 70 71 private : 86 72 87 73 QModelIndex index; 88 74 QStandardItemModel *modeleSpace; 89 QTableView *m_spaceTableView; /*!< Name of the QTableView's object in whitch the objects are listed for the viewer. */90 75 91 QPushButton *m_spaceAddButton; /*!< The button "add". */92 QPushButton *m_spaceEnregButton; /*!< The button "save". */93 QPushButton *m_spaceDeleteButton; /*!< The button "delete". */94 QPushButton *m_spaceHelpButton;95 QPushButton *m_spaceQuitButton; /*!< The button "Quit". */96 97 QHBoxLayout *m_spaceLayout1H; /*!< The 1st horizontal Layout's name. */98 QHBoxLayout *m_spaceLayout2H; /*!< The 2nd horizontal Layout's name. */99 QVBoxLayout *m_spaceLayout1V;100 QGridLayout *m_spaceLayoutG;101 102 QVBoxLayout *m_layoutPrincipalSpace;/*!< The vertical Layout's name. */103 QFormLayout *m_layout1Space; /*!< The only QFormLayout's name. */104 76 105 77 QStringList m_horizontalHeader;
Note: See TracChangeset
for help on using the changeset viewer.