- Timestamp:
- 06/24/10 09:54:49 (14 years ago)
- Location:
- trunk/yao/src/interface/src
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/ContextWindow.cpp
r357 r359 26 26 m_localContext = aContext; 27 27 // localMwc = mwc; 28 28 if (isContextListEmpty()) m_contextDelButton->setDisabled(true); 29 29 m_comboContextO_REAL->insertItem(0, ""); 30 30 m_comboContextO_REAL->insertItem(1, "FLOAT"); … … 65 65 66 66 //connect(m_enregContext, SIGNAL(clicked()), this, SLOT(saveContextData())); 67 connect(m_ quitContext, SIGNAL(clicked()), this, SLOT(close()));68 connect(m_ ContextAddButton, SIGNAL(clicked()), this, SLOT(addContextRow()));69 connect(m_ ContextDeleteButton, SIGNAL(clicked()), this, SLOT(deleteContextRow()));70 connect(m_ ContextHelpButton, SIGNAL(clicked()), this, SLOT(callContextHelp()));67 connect(m_contextQuitButton, SIGNAL(clicked()), this, SLOT(close())); 68 connect(m_contextAddButton, SIGNAL(clicked()), this, SLOT(addContextRow())); 69 connect(m_contextDelButton, SIGNAL(clicked()), this, SLOT(deleteContextRow())); 70 connect(m_contextHelpButton, SIGNAL(clicked()), this, SLOT(callContextHelp())); 71 71 72 72 connect(m_addButtonO_EXTOBJ, SIGNAL(clicked()), this, SLOT(addO_EXTOBJRow())); … … 122 122 123 123 eraseDataFromLineEdit(); 124 if (!isContextListEmpty()) m_contextDelButton->setEnabled(true); 124 125 125 126 } … … 130 131 m_comboContextO_EXTOBJ->setCurrentIndex(0); 131 132 } 133 134 /********************************************************************/ 135 bool ContextWindow::isContextListEmpty() { 136 137 if (filesList.empty()) 138 return true; 139 else 140 return false; 141 } 142 132 143 /**********************************************************************/ 133 144 void ContextWindow::closeEvent(QCloseEvent *event){ … … 245 256 246 257 if (anInt != 0) { 247 m_ ContextDeleteButton->setEnabled(true);258 m_contextDelButton->setEnabled(true); 248 259 //m_enregContext->setEnabled(true); 249 260 … … 253 264 else 254 265 { 255 m_ ContextDeleteButton->setDisabled(true);266 m_contextDelButton->setDisabled(true); 256 267 //m_enregContext->setDisabled(true); 257 268 -
trunk/yao/src/interface/src/MainWindow.cpp
r358 r359 333 333 m_trajectoryWindow->show(); 334 334 335 //m_trajectoryWindow = NULL;336 335 } 337 336 -
trunk/yao/src/interface/src/ModulWindow.cpp
r357 r359 20 20 //! \brief Implementation of the Modul window for visual_YAO. 21 21 //ModulWindow::ModulWindow(QWidget *parent):QWidget(parent) { 22 ModulWindow::ModulWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Constant> *aConstantTable, MainWindowController *mwc, QWidget *parent) : QWidget(parent) {22 ModulWindow::ModulWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Constant> *aConstantTable, MainWindowController *mwc, QWidget *parent) : QWidget(parent), m_localModulTable(NULL) { 23 23 24 24 25 25 setupUi(this); 26 localConstantTable = aConstantTable; 26 localConstantTable = aConstantTable; 27 m_localModulTable = aModulTable; 27 28 28 29 QRegExp regExp("[A-Za-z_][A-Za-z1-9_]{0,}"); … … 36 37 m_comboModulInter2->setDisabled(true); 37 38 m_comboModulInter3->setDisabled(true); 39 40 if (isModulTableEmpty()) 41 m_modulDelButton->setDisabled(true); 38 42 //m_checkBoxModulArray->setDisabled(true); 39 43 // for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++) { … … 61 65 connect(m_buttonModulQuit, SIGNAL(clicked()), this, SLOT(close())); 62 66 connect(m_buttonModulAdd, SIGNAL(clicked()), this, SLOT(addModulRow())); 63 connect(m_ buttonModulDel, SIGNAL(clicked()), this, SLOT(deleteModulRow()));67 connect(m_modulDelButton, SIGNAL(clicked()), this, SLOT(deleteModulRow())); 64 68 connect(m_buttonModulHelp, SIGNAL(clicked()), this, SLOT(callModulHelp())); 65 69 … … 127 131 128 132 eraseDataFromLineEdit(); 133 if (!isModulTableEmpty()) m_modulDelButton->setEnabled(true); 129 134 130 135 } … … 190 195 191 196 } 197 /**********************************************************************/ 198 bool ModulWindow::isModulTableEmpty() { 199 200 if (m_localModulTable->empty()) 201 return true; 202 else 203 return false; 204 205 } 192 206 /*****************************************************************************************************************************/ 193 207 /*void ModulWindow::enregistrerModul() { … … 232 246 233 247 if (anInt != 0) { 234 m_ buttonModulDel->setEnabled(true);248 m_modulDelButton->setEnabled(true); 235 249 //m_enregModul->setEnabled(true); 236 250 … … 240 254 else 241 255 { 242 m_ buttonModulDel->setDisabled(true);256 m_modulDelButton->setDisabled(true); 243 257 //m_enregModul->setDisabled(true); 244 258 -
trunk/yao/src/interface/src/SpaceWindow.cpp
r348 r359 1 1 //! \file SpaceWindow.cpp 2 2 //! \brief Implementation of the Ctin window. 3 //! \version 2010/06/ 16(yyyy/mm/dd)3 //! \version 2010/06/23 (yyyy/mm/dd) 4 4 //! \author MAYAKI Abdouramane. 5 5 /* … … 7 7 Nom de classe: SpaceWindow 8 8 Role: 9 Nombre de methodes: 10 Nombre d'attributs: 9 Nombre de methodes:11 10 Nombre d'attributs:8 11 11 */ 12 12 … … 22 22 23 23 /******************************************* Contructeur ***************************************************/ 24 SpaceWindow::SpaceWindow(Table <Space> *aSpaceTable, Table <Trajectory> *aTrajectory, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent) { /*!< The constructor. */ 24 SpaceWindow::SpaceWindow(Table <Space> *aSpaceTable, Table <Trajectory> *aTrajectory, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), localTrajectoryTable(NULL), localSpaceTable(NULL) { /*!< The constructor. */ 25 25 26 setupUi(this); 26 isCalled = false; 27 //QStringList *localTrajData = trajData; 28 localSpaceTable = aSpaceTable; 29 localTrajectoryTable = aTrajectory; 30 localConstantTable = aConstantTable; 31 //localSpaceExtent = aSpaceExtent; 32 //localSpaceIdentifier = aSpaceIdentifier; 33 compteur = 0; 34 27 28 localSpaceTable = aSpaceTable; /*!< See theSpaceTable in MainWindow.hpp */ 29 localTrajectoryTable = aTrajectory; /*!< See theTrajectoryTable in MainWindow.hpp */ 30 localConstantTable = aConstantTable; /*!< See theConstantTable in MainWindow.hpp */ 31 32 QRegExp regExp("[A-Za-z_][A-Za-z0-9_]*"); 33 //QRegExp regExp2("[A-Za-z_][A-Za-z0-9_]*"); 34 35 m_spaceNameLine->setValidator(new QRegExpValidator(regExp, this)); 36 //m_spaceD1->setValidator(new QRegExpValidator(regExp2, this)); 37 if (isSpaceTableEmpty()) m_spaceDeleteButton->setDisabled(true);/*!< To disable the m_spaceDeleteButton if theTrajectoryTable is empty. */ 38 35 39 m_spaceD1->setEditable(true); 36 40 m_spaceD1->insertItem(0,""); … … 56 60 //m_spaceEnregButton = new QPushButton("Enregistrer",this); /*!< The button "save". */ 57 61 // m_spaceEnregButton->setDisabled(true); 58 m_spaceDeleteButton->setDisabled(true);59 60 modeleSpace = new QStandardItemModel(0, 6) ;61 modeleSpace->setHorizontalHeaderLabels(QStringList() << "Nom espace" << " Type" << "Dim 1" << "Dim 2" << "Dim 3" << "Nom traj");62 63 m_spaceTableView->setModel(modeleSpace); 62 //m_spaceDeleteButton->setDisabled(true); 63 64 modeleSpace = new QStandardItemModel(0, 3) ; 65 modeleSpace->setHorizontalHeaderLabels(QStringList() << "Nom espace" << "Dimension(s) " << "Nom trajectoire"); //Gives names to the columns. 66 67 m_spaceTableView->setModel(modeleSpace); /*!< The view takes model.*/ 64 68 m_spaceTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ 65 69 m_spaceTableView->setShowGrid(false); /*!< this ligne cover the grille in table */ 66 70 m_spaceTableView->setSelectionBehavior(QAbstractItemView::SelectRows); 67 m_spaceTableView->resizeColumnsToContents(); 68 71 m_spaceTableView->resizeColumnsToContents(); /*!< To optimize the column space. */ 72 73 //The following to load in the visual Yao the structure of Yao. 74 for (Table<Space>::iterator it = localSpaceTable->begin(); it != localSpaceTable->end(); it++) { 75 76 int row = modeleSpace->rowCount(); 77 78 modeleSpace->setItem(row, 0, new QStandardItem(QString(it->getProperty(0).c_str()))); /*!< Gets the space name.*/ 79 modeleSpace->setItem(row, 1, new QStandardItem(QString(it->getProperty(1).c_str()))); /*!< Gets the space dimension (1, 2 or 3).*/ 80 modeleSpace->setItem(row, 2, new QStandardItem(QString(it->getProperty(2).c_str()))); /*!< Gets the trajectory choosed in the space directive.*/ 81 } 82 83 69 84 connect(m_spaceAddButton, SIGNAL(clicked()), this, SLOT(addSpaceRow())); /*!< Adds rows in the tableview after clicking on the button "Add"*/ 70 85 connect(m_spaceDeleteButton, SIGNAL(clicked()), this, SLOT(deleteRow())); 71 86 connect(m_spaceQuitButton, SIGNAL(clicked()), this, SLOT(close())); /*!< Will be closed after a click on the button "Quit" */ 72 // connect(m_spaceEnregButton, SIGNAL(clicked()), this, SLOT(saveInYaoStructure())); 73 connect(m_spaceHelpButton, SIGNAL(clicked()), this, SLOT(callSpaceHelp())); 74 87 connect(m_spaceHelpButton, SIGNAL(clicked()), this, SLOT(callSpaceHelp())); /*!< Calls the help method.*/ 75 88 76 setFixedWidth(baseSize().width() + 5 15);89 setFixedWidth(baseSize().width() + 505); 77 90 } 78 91 //------------------------------------ End of the contructor declaration.--------------------------------------- … … 80 93 void SpaceWindow::addSpaceRow() { 81 94 95 int row = modeleSpace->rowCount(); 82 96 83 97 m_spaceDeleteButton->setEnabled(true); … … 87 101 d2 = m_spaceD2->currentText().toStdString(), 88 102 d3 = m_spaceD3->currentText().toStdString(), 103 dim = d1 + " " + d2 + " " + d3, 89 104 traj = m_spaceTrajname->currentText().toStdString(); 90 91 92 /* if (!isString(name)) { 93 QMessageBox::about(this, tr("Erreur de saisie!"), 94 tr("<p>Le premier champ contient au moins un caractere non conforme!<p> Les Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 95 return; 96 } 97 if (!isInt(d1)) { 98 QMessageBox::about(this, tr("Erreur de saisie!"), 99 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D1! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 100 return; 101 } 102 if (!isInt(d2)) { 103 QMessageBox::about(this, tr("Erreur de saisie!"), 104 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D2! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 105 return; 106 } 107 if (!isInt(d3)) { 108 QMessageBox::about(this, tr("Erreur de saisie!"), 109 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D3! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 110 return; 111 } 112 113 if (!isString(traj)) { 114 QMessageBox::about(this, tr("Erreur de saisie!"), 115 tr("<p>Vous avez saisi au moins un caractere non conforme au niveau du champ de la trajectoire!<p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 116 return; 117 } 118 119 //static int row = 0; 120 // int l = 0; 121 //else 122 //if (l >= 0) 123 // {*/ 124 int row = modeleSpace->rowCount(); 125 126 modeleSpace->setItem(row, 0, new QStandardItem(m_spaceNameLine->text())); 127 //modeleSpace->setItem(row, 1, new QStandardItem(m_spaceType->text())); 128 modeleSpace->setItem(row, 2, new QStandardItem(m_spaceD1->currentText())); 129 modeleSpace->setItem(row, 3, new QStandardItem(m_spaceD2->currentText())); 130 modeleSpace->setItem(row, 4, new QStandardItem(m_spaceD3->currentText())); 131 modeleSpace->setItem(row, 5, new QStandardItem(m_spaceTrajname->currentText())); 105 106 Constant *c1; //Nous créons d'abord un pointeur de constante. 107 Constant *c2; //Nous créons d'abord un pointeur de constante. 108 Constant *c3; //Nous créons d'abord un pointeur de constante. 109 110 c1 = localConstantTable->find(d1); //Ensuite on passe au pointeur le resultat de la recherche de la chaine en utilisant find. 111 c2 = localConstantTable->find(d2); //Ensuite on passe au pointeur le resultat de la recherche de la chaine en utilisant find. 112 c3 = localConstantTable->find(d3); //Ensuite on passe au pointeur le resultat de la recherche de la chaine en utilisant find. 113 modeleSpace->setItem(row, 0, new QStandardItem(m_spaceNameLine->text())); 114 115 //vector <string> theShape; 116 /*modeleSpace->setItem(row, 0, new QStandardItem(m_spaceNameLine->text())); 117 modeleSpace->setItem(row, 1, new QStandardItem(QString(dim.c_str()))); 118 modeleSpace->setItem(row, 2, new QStandardItem(m_spaceTrajname->currentText())); 132 119 133 120 Identifier id(name, row); … … 136 123 vecteur.push_back(toInt(d2)); 137 124 vecteur.push_back(toInt(d3)); 138 //Component(const std::string& aName, const T* aParent);139 125 Space espace(name, localTrajectoryTable->find(traj), vecteur); 140 //Component com(name, );141 126 localSpaceTable->push_back(espace); 142 //localSpaceIdentifier->push_back(id); 143 //for (Table <Identifier>::iterator it = localSpaceExtent->begin(); it != localSpaceExtent->end(); it++) 144 //cout << "Voici le dernier ajout: " << it->getName().toStdString() << endl; 145 //m_localData.push_back(m_spaceNameLine->text()); //+ " " + m_spaceType->text() + " " + m_spaceD1->currentText() + 146 //" " + m_spaceD2->currentText() + " " + m_spaceD3->currentText() + 147 //" " + m_spaceTrajname->currentText()); //<< m_spaceNameLine->text() << m_spaceType->text(); 148 // row++; 149 toInitialize(); 127 toInitialize();*/ 128 129 if (c1 != NULL) { //C'est alors une constante. 130 131 132 //modeleSpace->setItem(row, 1, new QStandardItem(QString(.c_str()))); 133 //string constantValue = localConstantTable->find(hatFile)->getText(); //"getText()" returns the constant value. 134 // constantValue.append(".h"); 135 //m_hatnameModel->setItem(m_hatnameModel->rowCount(), new QStandardItem(QString(hatFile.c_str())));//QStandardItem(QString(constantValue.c_str()))) ; 136 //localHeaderList->push_back(hatFile); 137 //eraseDataFromLineEdit(); 138 //m_delHatButton->setEnabled(true); 139 cout << "Cool, c'est une constante!" << endl; 140 } 141 else 142 cout << "Purée!" << endl; 143 144 if (c2 != NULL) { //C'est alors une constante. 145 //string constantValue = localConstantTable->find(hatFile)->getText(); //"getText()" returns the constant value. 146 // constantValue.append(".h"); 147 //m_hatnameModel->setItem(m_hatnameModel->rowCount(), new QStandardItem(QString(hatFile.c_str())));//QStandardItem(QString(constantValue.c_str()))) ; 148 //localHeaderList->push_back(hatFile); 149 //eraseDataFromLineEdit(); 150 //m_delHatButton->setEnabled(true); 151 cout << "Cool, c'est une constante!" << endl; 152 } 153 else 154 cout << "Purée!" << endl; 155 156 if (c3 != NULL) { //C'est alors une constante. 157 //string constantValue = localConstantTable->find(hatFile)->getText(); //"getText()" returns the constant value. 158 // constantValue.append(".h"); 159 //m_hatnameModel->setItem(m_hatnameModel->rowCount(), new QStandardItem(QString(hatFile.c_str())));//QStandardItem(QString(constantValue.c_str()))) ; 160 //localHeaderList->push_back(hatFile); 161 //eraseDataFromLineEdit(); 162 //m_delHatButton->setEnabled(true); 163 cout << "Cool, c'est une constante!" << endl; 164 } 165 else 166 cout << "Purée!" << endl; 167 168 169 170 // else { //Ce n'est pas une constante. 171 172 173 // if (!isInt(d1)) { 174 // QMessageBox::about(this, tr("Erreur de saisie!"), 175 // tr("<p>Saisir des valeurs entiÚres dans le champ D1! <p>.")); 176 // return; 177 // } 178 179 /* if (!isString(name)) { 180 QMessageBox::about(this, tr("Erreur de saisie!"), 181 tr("<p>Le premier champ contient au moins un caractere non conforme!<p> Les Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 182 return; 183 } 184 if (!isInt(d1)) { 185 QMessageBox::about(this, tr("Erreur de saisie!"), 186 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D1! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 187 return; 188 } 189 if (!isInt(d2)) { 190 QMessageBox::about(this, tr("Erreur de saisie!"), 191 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D2! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 192 return; 193 } 194 if (!isInt(d3)) { 195 QMessageBox::about(this, tr("Erreur de saisie!"), 196 tr("<p>Seuls les nombres entiers sont acceptes au niveau du champ D3! <p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 197 return; 198 } 199 200 if (!isString(traj)) { 201 QMessageBox::about(this, tr("Erreur de saisie!"), 202 tr("<p>Vous avez saisi au moins un caractere non conforme au niveau du champ de la trajectoire!<p> Cliquer sur <b>ok</b> pour fermer cette fenetre.")); 203 return; 204 } 205 206 //static int row = 0; 207 // int l = 0; 208 //else 209 //if (l >= 0) 210 // {*/ 211 212 /*modeleSpace->setItem(row, 0, new QStandardItem(m_spaceNameLine->text())); 213 modeleSpace->setItem(row, 1, new QStandardItem(QString(dim.c_str()))); 214 modeleSpace->setItem(row, 2, new QStandardItem(m_spaceTrajname->currentText())); 215 216 Identifier id(name, row); 217 vector <int> vecteur; 218 vecteur.push_back(toInt(d1)); 219 vecteur.push_back(toInt(d2)); 220 vecteur.push_back(toInt(d3)); 221 Space espace(name, localTrajectoryTable->find(traj), vecteur); 222 localSpaceTable->push_back(espace); 223 toInitialize();*/ 150 224 // } 151 //testPresenceLigne(); 225 226 if (!isSpaceTableEmpty()) m_spaceDeleteButton->setEnabled(true); 152 227 } 153 228 … … 165 240 //int row = m_spaceTableView->rowCount(); 166 241 //m_spaceTableView->insertRow(row); 167 //compteur ++;168 242 169 243 //} … … 173 247 174 248 //m_spaceTableView->removeRow(m_spaceTableView->currentRow()); 175 //testPresenceLigne();176 249 177 250 QItemSelectionModel *selection = m_spaceTableView->selectionModel(); … … 182 255 { 183 256 modeleSpace->removeRows(m_spaceTableView->currentIndex().row(), 1); 184 //localTrajectoryTable->erase(localTrajectoryTable->begin() + r);257 localSpaceTable->erase(localSpaceTable->begin() + r); 185 258 186 259 } 187 } 188 260 261 if (isSpaceTableEmpty()) m_spaceDeleteButton->setDisabled(true); 262 } 263 264 /**********************************************************************/ 265 bool SpaceWindow::isSpaceTableEmpty() { 266 267 if (localSpaceTable->empty()) 268 return true; 269 else 270 return false; 271 } 189 272 /************************************** Implementation of function saveInYaoStructure() ***********************************/ 190 273 void SpaceWindow::saveInYaoStructure() { … … 196 279 197 280 /****************************************************************************************************************************/ 198 QStringList SpaceWindow::getData() {199 200 //QStringList test;201 return m_spaceData;202 }203 281 204 282 /****************************************************************************************************************************/ … … 258 336 259 337 /****************************************************************************************************************************/ 260 void SpaceWindow::testPresenceLigne() { 261 262 if (m_localData.isEmpty()) 263 { 264 m_spaceDeleteButton->setDisabled(true); 265 //m_spaceEnregButton->setDisabled(true); 266 } 267 else 268 { 269 //m_spaceDeleteButton->setEnabled(true); 270 m_spaceDeleteButton->setDisabled(true); 271 } 272 } 273 /**************************************************************************/ 274 bool SpaceWindow::testContenu(int anInt) { 275 276 if (anInt != 0) { 277 //m_spaceEnregButton->setEnabled(true); 278 m_spaceDeleteButton->setEnabled(true); 279 280 return true; 281 282 } 283 else 284 { 285 //m_spaceEnregButton->setDisabled(true); 286 m_spaceDeleteButton->setDisabled(true); 287 288 return false; 289 } 290 } 338 /************************************************************************/ 291 339 /************************************************************************/void SpaceWindow::closeEvent(QCloseEvent *event) { 292 340 -
trunk/yao/src/interface/src/include/ContextWindow.hpp
r357 r359 44 44 void deleteContextRow(); 45 45 void callContextHelp(); 46 bool isContextListEmpty(); 46 47 47 48 protected : -
trunk/yao/src/interface/src/include/ModulWindow.hpp
r357 r359 23 23 24 24 void eraseDataFromLineEdit(); 25 bool isModulTableEmpty(); 25 26 private slots: 26 27 -
trunk/yao/src/interface/src/include/SpaceWindow.hpp
r348 r359 46 46 SpaceWindow(yao::Table <yao::Space> *aSpaceTable, yao::Table <yao::Trajectory> *aTrajectory, yao::Table <yao::Constant> *aConstantTable, QWidget *parent=0); /*!< This function sets the file's name. */ 47 47 48 QStringList getData(); /*!< This function returns the space's data. */49 48 void toInitialize(); // Est appelée pour réinitialiser les champs. 50 49 bool isString(std::string aString); // Teste si le parametre est une chaine. 51 50 bool isInt(std::string aStringToInt);//Teste si le parametre est un entier. 52 51 //void addRow(); /*!< This function is called to add row in the visual window model. */ 53 void testPresenceLigne();54 bool testContenu(int anInt);55 52 const int toInt(const std::string& s); 56 53 //typedef yao::Operator Space; 54 bool isSpaceTableEmpty(); 57 55 58 56 public slots: /*!< Functions called after a click. */ … … 79 77 QStringList m_localData; 80 78 //SpaceController m_spc; 81 //yao::Component t;82 //yao::Table <yao::Identifier> *localSpaceIdentifier;83 //yao::Table <Operator> *localSpaceExtent;84 79 yao::Table <yao::Trajectory> *localTrajectoryTable; 85 80 yao::Table <yao::Constant> *localConstantTable; 86 81 yao::Table <yao::Space> *localSpaceTable; //!< Table of so-called spaces (model operators). 87 //yao::Component theComponent;88 bool isCalled;89 int compteur;90 82 91 83 }; -
trunk/yao/src/interface/src/ui_/contextwindow.ui
r347 r359 267 267 </widget> 268 268 </widget> 269 <widget class="QWidget" name=" ">269 <widget class="QWidget" name="layoutWidget"> 270 270 <property name="geometry"> 271 271 <rect> … … 345 345 <layout class="QVBoxLayout" name="verticalLayout"> 346 346 <item> 347 <widget class="QPushButton" name="m_ ContextAddButton">347 <widget class="QPushButton" name="m_contextAddButton"> 348 348 <property name="text"> 349 349 <string>Ajouter</string> … … 352 352 </item> 353 353 <item> 354 <widget class="QPushButton" name="m_ ContextDeleteButton">354 <widget class="QPushButton" name="m_contextDelButton"> 355 355 <property name="text"> 356 356 <string>Supprimer</string> … … 359 359 </item> 360 360 <item> 361 <widget class="QPushButton" name="m_ quitContext">361 <widget class="QPushButton" name="m_contextQuitButton"> 362 362 <property name="text"> 363 363 <string>Quitter</string> … … 367 367 </layout> 368 368 </widget> 369 <widget class="QPushButton" name="m_ ContextHelpButton">369 <widget class="QPushButton" name="m_contextHelpButton"> 370 370 <property name="geometry"> 371 371 <rect> 372 372 <x>590</x> 373 <y>1 40</y>373 <y>130</y> 374 374 <width>41</width> 375 375 <height>27</height> … … 401 401 <tabstop>m_checkBoxO_DBG_TRC_LWARD</tabstop> 402 402 <tabstop>m_checkBoxO_DBG_TRC_FWARD</tabstop> 403 <tabstop>m_ ContextAddButton</tabstop>404 <tabstop>m_ ContextDeleteButton</tabstop>405 <tabstop>m_ quitContext</tabstop>403 <tabstop>m_contextAddButton</tabstop> 404 <tabstop>m_contextDelButton</tabstop> 405 <tabstop>m_contextQuitButton</tabstop> 406 406 <tabstop>m_contextTableView</tabstop> 407 <tabstop>m_ ContextHelpButton</tabstop>407 <tabstop>m_contextHelpButton</tabstop> 408 408 </tabstops> 409 409 <resources/> -
trunk/yao/src/interface/src/ui_/modulwindow.ui
r356 r359 450 450 <widget class="QPushButton" name="m_buttonLoperaDel"> 451 451 <property name="enabled"> 452 <bool> false</bool>452 <bool>true</bool> 453 453 </property> 454 454 <property name="geometry"> … … 470 470 <x>10</x> 471 471 <y>70</y> 472 <width>30 1</width>472 <width>307</width> 473 473 <height>29</height> 474 474 </rect> … … 544 544 </item> 545 545 <item> 546 <widget class="QPushButton" name="m_ buttonModulDel">546 <widget class="QPushButton" name="m_modulDelButton"> 547 547 <property name="enabled"> 548 <bool> false</bool>548 <bool>true</bool> 549 549 </property> 550 550 <property name="text"> … … 603 603 <tabstop>m_loperaListView</tabstop> 604 604 <tabstop>m_buttonModulAdd</tabstop> 605 <tabstop>m_ buttonModulDel</tabstop>605 <tabstop>m_modulDelButton</tabstop> 606 606 <tabstop>m_buttonModulQuit</tabstop> 607 607 <tabstop>m_modulTableView</tabstop> -
trunk/yao/src/interface/src/ui_/spacewindow.ui
r347 r359 7 7 <x>0</x> 8 8 <y>0</y> 9 <width> 516</width>10 <height>39 2</height>9 <width>499</width> 10 <height>399</height> 11 11 </rect> 12 12 </property> … … 19 19 <x>10</x> 20 20 <y>10</y> 21 <width> 501</width>21 <width>481</width> 22 22 <height>191</height> 23 23 </rect> … … 29 29 <enum>QFrame::Raised</enum> 30 30 </property> 31 <widget class="QWidget" name=" ">31 <widget class="QWidget" name="layoutWidget"> 32 32 <property name="geometry"> 33 33 <rect> … … 184 184 </layout> 185 185 </widget> 186 <zorder>m_spaceD1</zorder>187 <zorder>m_spaceD2</zorder>188 <zorder>m_spaceD3</zorder>189 <zorder>m_spaceTrajname</zorder>190 <zorder>m_spaceNameLine</zorder>191 <zorder>horizontalSpacer</zorder>192 <zorder>horizontalSpacer_2</zorder>193 <zorder>horizontalSpacer_3</zorder>194 <zorder>horizontalSpacer_4</zorder>195 <zorder>m_spaceNameLabel</zorder>196 <zorder>m_spaceD2Label</zorder>197 <zorder>m_spaceD1Label</zorder>198 <zorder>m_spaceD3Label</zorder>199 <zorder>m_spaceTrajLabel</zorder>200 <zorder>horizontalSpacer_5</zorder>201 <zorder>m_spaceNameLine</zorder>202 <zorder>m_spaceNameLine</zorder>203 <zorder>m_spaceNameLine</zorder>204 <zorder></zorder>205 186 </widget> 206 187 <widget class="QFrame" name="frame_2"> … … 209 190 <x>10</x> 210 191 <y>210</y> 211 <width> 501</width>192 <width>481</width> 212 193 <height>181</height> 213 194 </rect> … … 237 218 <x>10</x> 238 219 <y>10</y> 239 <width>3 91</width>220 <width>361</width> 240 221 <height>161</height> 241 222 </rect> 242 223 </property> 243 224 </widget> 244 <widget class="QWidget" name=" ">245 <property name="geometry"> 246 <rect> 247 <x> 410</x>225 <widget class="QWidget" name="layoutWidget"> 226 <property name="geometry"> 227 <rect> 228 <x>390</x> 248 229 <y>30</y> 249 230 <width>81</width> -
trunk/yao/src/interface/src/ui_/trajectorywindow.ui
r358 r359 174 174 <x>410</x> 175 175 <y>40</y> 176 <width>8 7</width>176 <width>81</width> 177 177 <height>95</height> 178 178 </rect>
Note: See TracChangeset
for help on using the changeset viewer.