- Timestamp:
- 06/22/10 13:58:30 (14 years ago)
- Location:
- trunk/yao/src/interface/src
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/ConstantWindow.cpp
r355 r357 33 33 if(isConstantTableEmpty()) m_delButton ->setDisabled(true); /*!< setDisabled is true. */ 34 34 35 m odele= new QStandardItemModel(0, 2);//Nombre de lignes et colonnes du modÚle.36 m odele->setHorizontalHeaderLabels(QStringList() << "Constante(s)" << "Valeur(s)"); /*!< displays the QTableWidget */35 m_defvalModel = new QStandardItemModel(0, 2);//Nombre de lignes et colonnes du modÚle. 36 m_defvalModel->setHorizontalHeaderLabels(QStringList() << "Constante(s)" << "Valeur(s)"); /*!< displays the QTableWidget */ 37 37 38 38 for (Table<Constant>::iterator it = m_localConstantTable->begin(); it != m_localConstantTable->end(); it++) 39 39 { 40 m odele->setItem(modele->rowCount(), 0, new QStandardItem(QString(it->getName().c_str())));41 m odele->setItem(modele->rowCount()-1, 1, new QStandardItem(QString(it->getText().c_str())));//Apres le 1er ajout, la ligne vaut i+140 m_defvalModel->setItem(m_defvalModel->rowCount(), 0, new QStandardItem(QString(it->getName().c_str()))); 41 m_defvalModel->setItem(m_defvalModel->rowCount()-1, 1, new QStandardItem(QString(it->getText().c_str())));//Apres le 1er ajout, la ligne vaut i+1 42 42 } 43 43 //if (mwc->isStringLiteral("malkj")) cout << "cest bon ça" << endl; else cout << "Oh dommage!" << endl; 44 m_tableView->setModel(m odele);44 m_tableView->setModel(m_defvalModel); 45 45 m_tableView->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ 46 46 m_tableView->setShowGrid(false); /*!< this ligne cover the grille in table */ … … 112 112 113 113 114 m odele->setItem(modele->rowCount(), 0, new QStandardItem(m_ligneNom->text()));115 m odele->setItem(modele->rowCount()-1, 1, new QStandardItem(m_ligneValeur->text()));//Apres le 1er ajout, la ligne vaut i+1114 m_defvalModel->setItem(m_defvalModel->rowCount(), 0, new QStandardItem(m_ligneNom->text())); 115 m_defvalModel->setItem(m_defvalModel->rowCount()-1, 1, new QStandardItem(m_ligneValeur->text()));//Apres le 1er ajout, la ligne vaut i+1 116 116 117 117 emit rowIsAdded(); // signal emis lorsqu'une a été correctement rajoutée dans le tableau. … … 130 130 QItemSelectionModel *selection = m_tableView->selectionModel(); 131 131 index = selection->currentIndex(); 132 QVariant element = m odele->data(index, Qt::DisplayRole);132 QVariant element = m_defvalModel->data(index, Qt::DisplayRole); 133 133 int r = index.row(); 134 134 if (selection->hasSelection())// Permet de supprimer la ligne qui est selectionnée. Evite ainsi certains effets indesirables. 135 135 { 136 m odele->removeRows(m_tableView->currentIndex().row(), 1);136 m_defvalModel->removeRows(m_tableView->currentIndex().row(), 1); 137 137 m_localConstantTable->erase(m_localConstantTable->begin() + r); 138 138 -
trunk/yao/src/interface/src/ContextWindow.cpp
r350 r357 19 19 //! \brief Implementation of the Context window for visual_YAO. 20 20 /******************************************************************************************************************************************************/ 21 ContextWindow::ContextWindow(Context *aContext, Table <Constant> *aConstantTable, MainWindowController *mwc, QWidget *parent) : QWidget(parent), localConstantTable(NULL), contextModele(NULL) {21 ContextWindow::ContextWindow(Context *aContext, Table <Constant> *aConstantTable, MainWindowController *mwc, QWidget *parent) : QWidget(parent), localConstantTable(NULL), m_contextModel(NULL) { 22 22 23 23 setupUi(this); … … 46 46 47 47 filesListModele = new QStringListModel(filesList); 48 contextModele= new QStandardItemModel(0, 14);//Nombre de lignes et colonnes du modÚle.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 */50 51 m_contextTableView->setModel( contextModele);48 m_contextModel = new QStandardItemModel(0, 14);//Nombre de lignes et colonnes du modÚle. 49 m_contextModel->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 */ 50 51 m_contextTableView->setModel(m_contextModel); 52 52 m_contextTableView->resizeColumnsToContents(); 53 53 m_contextTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ … … 57 57 /*for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++) { 58 58 59 contextModele->setItem(row, 0, new QStandardItem(m_comboContextO_REAL->currentText()));59 m_contextModel->setItem(row, 0, new QStandardItem(m_comboContextO_REAL->currentText())); 60 60 } */ 61 61 … … 98 98 //testContenu(compteur); 99 99 100 int row = contextModele->rowCount();100 int row = m_contextModel->rowCount(); 101 101 /*if (!localMwc->isIntegerLiteral(m_comboContextO_PARALLEL->currentText().toStdString())) { 102 102 … … 104 104 return; // Arrêt de la méthode 105 105 }*/ 106 contextModele->setItem(row, 0, new QStandardItem(m_comboContextO_REAL->currentText()));107 contextModele->setItem(row, 1, new QStandardItem(m_comboContextO_MQN->currentText()));108 contextModele->setItem(row, 2, new QStandardItem(m_comboContextO_PARALLEL->currentText()));109 contextModele->setItem(row, 3, new QStandardItem(m_comboContextO_NETWARD->currentText()));110 111 contextModele->setItem(row, 4, new QStandardItem(m_comboContextO_EXTOBJ->currentText()));106 m_contextModel->setItem(row, 0, new QStandardItem(m_comboContextO_REAL->currentText())); 107 m_contextModel->setItem(row, 1, new QStandardItem(m_comboContextO_MQN->currentText())); 108 m_contextModel->setItem(row, 2, new QStandardItem(m_comboContextO_PARALLEL->currentText())); 109 m_contextModel->setItem(row, 3, new QStandardItem(m_comboContextO_NETWARD->currentText())); 110 111 m_contextModel->setItem(row, 4, new QStandardItem(m_comboContextO_EXTOBJ->currentText())); 112 112 //if (m_checkBoxO_GRADTEST->isChecked()) 113 m_checkBoxO_GRADTEST->isChecked()? contextModele->setItem(row, 5, new QStandardItem("oui")):contextModele->setItem(row, 5, new QStandardItem("non"));114 m_checkBoxO_VARINCR->isChecked() ? contextModele->setItem(row, 6, new QStandardItem("oui")):contextModele->setItem(row, 6, new QStandardItem("non"));115 m_checkBoxO_DBG_NANF->isChecked()? contextModele->setItem(row, 7, new QStandardItem("oui")):contextModele->setItem(row, 7, new QStandardItem("non"));116 m_checkBoxO_DBG_TING->isChecked()? contextModele->setItem(row, 8, new QStandardItem("oui")):contextModele->setItem(row, 8, new QStandardItem("non"));117 m_checkBoxO_DBG_BETA->isChecked()? contextModele->setItem(row, 9, new QStandardItem("oui")):contextModele->setItem(row, 9, new QStandardItem("non"));118 m_checkBoxO_DBG_TRC_FWARD->isChecked()? contextModele->setItem(row, 10, new QStandardItem("oui")):contextModele->setItem(row, 10, new QStandardItem("non"));119 m_checkBoxO_DBG_TRC_BWARD->isChecked()? contextModele->setItem(row, 11, new QStandardItem("oui")):contextModele->setItem(row, 11, new QStandardItem("non"));120 m_checkBoxO_DBG_TRC_LWARD->isChecked()? contextModele->setItem(row, 12, new QStandardItem("oui")):contextModele->setItem(row, 12, new QStandardItem("non"));121 m_checkBoxO_DBG_TRC_AWARD->isChecked()? contextModele->setItem(row, 13, new QStandardItem("oui")):contextModele->setItem(row, 13, new QStandardItem("non"));113 m_checkBoxO_GRADTEST->isChecked()?m_contextModel->setItem(row, 5, new QStandardItem("oui")):m_contextModel->setItem(row, 5, new QStandardItem("non")); 114 m_checkBoxO_VARINCR->isChecked() ?m_contextModel->setItem(row, 6, new QStandardItem("oui")):m_contextModel->setItem(row, 6, new QStandardItem("non")); 115 m_checkBoxO_DBG_NANF->isChecked()?m_contextModel->setItem(row, 7, new QStandardItem("oui")):m_contextModel->setItem(row, 7, new QStandardItem("non")); 116 m_checkBoxO_DBG_TING->isChecked()?m_contextModel->setItem(row, 8, new QStandardItem("oui")):m_contextModel->setItem(row, 8, new QStandardItem("non")); 117 m_checkBoxO_DBG_BETA->isChecked()?m_contextModel->setItem(row, 9, new QStandardItem("oui")):m_contextModel->setItem(row, 9, new QStandardItem("non")); 118 m_checkBoxO_DBG_TRC_FWARD->isChecked()?m_contextModel->setItem(row, 10, new QStandardItem("oui")):m_contextModel->setItem(row, 10, new QStandardItem("non")); 119 m_checkBoxO_DBG_TRC_BWARD->isChecked()?m_contextModel->setItem(row, 11, new QStandardItem("oui")):m_contextModel->setItem(row, 11, new QStandardItem("non")); 120 m_checkBoxO_DBG_TRC_LWARD->isChecked()?m_contextModel->setItem(row, 12, new QStandardItem("oui")):m_contextModel->setItem(row, 12, new QStandardItem("non")); 121 m_checkBoxO_DBG_TRC_AWARD->isChecked()?m_contextModel->setItem(row, 13, new QStandardItem("oui")):m_contextModel->setItem(row, 13, new QStandardItem("non")); 122 122 123 123 eraseDataFromLineEdit(); -
trunk/yao/src/interface/src/HatNameWindow.cpp
r355 r357 13 13 /*************************************** The class constructor: HatNameWindow() ********************************************************************/ 14 14 HatNameWindow::HatNameWindow(vector <string> *aHeaderList, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), modeleFichiers(NULL), 15 hatView(NULL), m odeleHatName(NULL), localHeaderList(NULL), localConstantTable(NULL)15 hatView(NULL), m_hatnameModel(NULL), localHeaderList(NULL), localConstantTable(NULL) 16 16 17 17 { … … 42 42 m_comboHatName->setEditable(true); 43 43 44 m odeleHatName= new QStandardItemModel(0, 1);//(listeFichiers);44 m_hatnameModel = new QStandardItemModel(0, 1);//(listeFichiers); 45 45 for (vector <string>::iterator it = localHeaderList->begin(); it != localHeaderList->end(); it++) 46 m odeleHatName->appendRow(new QStandardItem(it->c_str()));46 m_hatnameModel->appendRow(new QStandardItem(it->c_str())); 47 47 hatView = new QListView; 48 hatView->setModel(m odeleHatName);48 hatView->setModel(m_hatnameModel); 49 49 50 50 m_boutonouvrir->setIcon(QIcon("Images/icons/openfile.png")); //Affichage d'une image sur le bouton "ouvrir" … … 124 124 string constantValue = localConstantTable->find(hatFile)->getText(); //"getText()" returns the constant value. 125 125 constantValue.append(".h"); 126 m odeleHatName->setItem(modeleHatName->rowCount(), new QStandardItem(QString(hatFile.c_str())));//QStandardItem(QString(constantValue.c_str())));126 m_hatnameModel->setItem(m_hatnameModel->rowCount(), new QStandardItem(QString(hatFile.c_str())));//QStandardItem(QString(constantValue.c_str()))); 127 127 localHeaderList->push_back(hatFile); 128 128 eraseDataFromLineEdit(); … … 158 158 159 159 localHeaderList->push_back(hatFile); 160 m odeleHatName->setItem(modeleHatName->rowCount(), new QStandardItem(QString(hatFile.c_str())));160 m_hatnameModel->setItem(m_hatnameModel->rowCount(), new QStandardItem(QString(hatFile.c_str()))); 161 161 eraseDataFromLineEdit(); 162 162 } … … 179 179 { 180 180 QString fichier = hatFile.c_str(); 181 m odeleHatName->setItem(modeleHatName->rowCount(), new QStandardItem(QString(hatFile.c_str())));181 m_hatnameModel->setItem(m_hatnameModel->rowCount(), new QStandardItem(QString(hatFile.c_str()))); 182 182 localHeaderList->push_back(hatFile); 183 183 … … 198 198 return; 199 199 200 QVariant element = m odeleHatName->data(index, Qt::DisplayRole);//Récupération de la valeur de l'élément courant.200 QVariant element = m_hatnameModel->data(index, Qt::DisplayRole);//Récupération de la valeur de l'élément courant. 201 201 int r = index.row();// Récuperation de la ligne de l'élément courant. 202 202 if (selection->hasSelection()) // Evite certains effets indésirables: suppression de la derniere ligne aprÚs clic sur le vide. 203 203 { 204 m odeleHatName->removeRows(hatView->currentIndex().row(), 1);// Le 2Úme parametre indique le nombre de ligne à supprimer204 m_hatnameModel->removeRows(hatView->currentIndex().row(), 1);// Le 2Úme parametre indique le nombre de ligne à supprimer 205 205 localHeaderList->erase(localHeaderList->begin() + r);//On met à jour la structure de données en supprimant aussi l'élement. 206 206 //m_tableView->resizeRowToContents(c - 1); // columnCountChanged(c , c-1); -
trunk/yao/src/interface/src/MainWindow.cpp
r356 r357 48 48 49 49 setCentralWidget(espace); //Ici, se précise la zone centrale de la QMainWindow. 50 50 51 51 // Appel des differentes méthodes crées. 52 52 createActions(); //Appel de la methode createActions(), voir le code ci-aprÚs. -
trunk/yao/src/interface/src/ModulWindow.cpp
r356 r357 44 44 // m_comboModulLopera->insertItem(1, QString(it->getName().c_str())); 45 45 // } 46 ModulModele= new QStandardItemModel(0, 11);47 ModulModele->setHorizontalHeaderLabels(QStringList() << "Nom" << "space/opera" << "input" << "output" << "target" << "noward" << "autonet" << "netward" << "cout" << "lopera" << "tempo");46 m_modulModel = new QStandardItemModel(0, 11); 47 m_modulModel->setHorizontalHeaderLabels(QStringList() << "Nom" << "space/opera" << "input" << "output" << "target" << "noward" << "autonet" << "netward" << "cout" << "lopera" << "tempo"); 48 48 49 m_modulTableView->setModel( ModulModele);49 m_modulTableView->setModel(m_modulModel); 50 50 m_modulTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); 51 51 m_modulTableView->setShowGrid(false); … … 104 104 //testContenu(compteur); 105 105 106 int row = ModulModele->rowCount();106 int row = m_modulModel->rowCount(); 107 107 /*if (!localMwc->isIntegerLiteral(m_comboModulAutonet->currentText().toStdString())) { 108 108 … … 110 110 return; // Arrêt de la méthode 111 111 }*/ 112 // ModulModele->setItem(row, 0, new QStandardItem(m_comboModulSpaceName->currentText()));113 // ModulModele->setItem(row, 1, new QStandardItem(m_comboModulOperaName->currentText()));114 // ModulModele->setItem(row, 2, new QStandardItem(m_comboModulAutonet->currentText()));115 // ModulModele->setItem(row, 3, new QStandardItem(m_comboModulClonof->currentText()));116 117 // ModulModele->setItem(row, 4, new QStandardItem(m_comboModulLopera->currentText()));112 // m_modulModel->setItem(row, 0, new QStandardItem(m_comboModulSpaceName->currentText())); 113 // m_modulModel->setItem(row, 1, new QStandardItem(m_comboModulOperaName->currentText())); 114 // m_modulModel->setItem(row, 2, new QStandardItem(m_comboModulAutonet->currentText())); 115 // m_modulModel->setItem(row, 3, new QStandardItem(m_comboModulClonof->currentText())); 116 117 // m_modulModel->setItem(row, 4, new QStandardItem(m_comboModulLopera->currentText())); 118 118 //if (m_checkBoxNoward->isChecked()) 119 // m_checkBoxNoward->isChecked()? ModulModele->setItem(row, 5, new QStandardItem("oui")):ModulModele->setItem(row, 5, new QStandardItem("non"));120 //m_checkBoxTempo->isChecked() ? ModulModele->setItem(row, 6, new QStandardItem("oui")):ModulModele->setItem(row, 6, new QStandardItem("non"));121 //m_checkBoxCout->isChecked()? ModulModele->setItem(row, 7, new QStandardItem("oui")):ModulModele->setItem(row, 7, new QStandardItem("non"));122 //m_checkBoxSpec->isChecked()? ModulModele->setItem(row, 8, new QStandardItem("oui")):ModulModele->setItem(row, 8, new QStandardItem("non"));123 //m_checkBoxNetward->isChecked()? ModulModele->setItem(row, 9, new QStandardItem("oui")):ModulModele->setItem(row, 9, new QStandardItem("non"));124 //m_checkBoxModulHidjac->isChecked()? ModulModele->setItem(row, 10, new QStandardItem("oui")):ModulModele->setItem(row, 10, new QStandardItem("non"));125 //m_checkBoxModulManage->isChecked()? ModulModele->setItem(row, 11, new QStandardItem("oui")):ModulModele->setItem(row, 11, new QStandardItem("non"));126 //m_checkBoxModulArray->isChecked()? ModulModele->setItem(row, 12, new QStandardItem("oui")):ModulModele->setItem(row, 12, new QStandardItem("non"));119 // m_checkBoxNoward->isChecked()?m_modulModel->setItem(row, 5, new QStandardItem("oui")):m_modulModel->setItem(row, 5, new QStandardItem("non")); 120 //m_checkBoxTempo->isChecked() ?m_modulModel->setItem(row, 6, new QStandardItem("oui")):m_modulModel->setItem(row, 6, new QStandardItem("non")); 121 //m_checkBoxCout->isChecked()?m_modulModel->setItem(row, 7, new QStandardItem("oui")):m_modulModel->setItem(row, 7, new QStandardItem("non")); 122 //m_checkBoxSpec->isChecked()?m_modulModel->setItem(row, 8, new QStandardItem("oui")):m_modulModel->setItem(row, 8, new QStandardItem("non")); 123 //m_checkBoxNetward->isChecked()?m_modulModel->setItem(row, 9, new QStandardItem("oui")):m_modulModel->setItem(row, 9, new QStandardItem("non")); 124 //m_checkBoxModulHidjac->isChecked()?m_modulModel->setItem(row, 10, new QStandardItem("oui")):m_modulModel->setItem(row, 10, new QStandardItem("non")); 125 //m_checkBoxModulManage->isChecked()?m_modulModel->setItem(row, 11, new QStandardItem("oui")):m_modulModel->setItem(row, 11, new QStandardItem("non")); 126 //m_checkBoxModulArray->isChecked()?m_modulModel->setItem(row, 12, new QStandardItem("oui")):m_modulModel->setItem(row, 12, new QStandardItem("non")); 127 127 128 128 eraseDataFromLineEdit(); -
trunk/yao/src/interface/src/NetwardWindow.cpp
r350 r357 1 1 //! \file NetwardWindow.cpp 2 2 //! \brief Implementation of the Netward window for visual_YAO. 3 //! \version 2010/06/ 16(yyyy/mm/dd)3 //! \version 2010/06/22 (yyyy/mm/dd) 4 4 //! \author MAYAKI Abdouramane. 5 5 … … 23 23 24 24 25 QStringList horizontalHeaders;26 horizontalHeaders << "Nom Netward" << "Entrees" << "Sorties"; /*!< added Nom Netward Entrees and sorties in table */25 //QStringList horizontalHeaders; 26 //horizontalHeaders << "Nom " << "Entrees" << "Sorties"; /*!< added Nom Netward Entrees and sorties in table */ 27 27 28 //vueNetward = new QTableWidget(0, 3); /*!< vueNetward declaration */ 29 //vueNetward->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ 30 //vueNetward->setShowGrid(false); /*!< this ligne cover the grille in table */ 31 //vueNetward->setSelectionBehavior(QAbstractItemView::SelectRows); /*!< this ligne give a section of the ligne */ 32 //vueNetward->setHorizontalHeaderLabels(horizontalHeaders); /*!< displays the QTableWidget */ 28 //m_netwardTableView = new QTableWidget(0, 3); /*!< m_netwardTableView declaration */ 29 m_netwardModel = new QStandardItemModel(0, 3); 30 m_netwardModel->setHorizontalHeaderLabels(QStringList() << "Nom du réseau" << "Entrees" << "Sorties"); /*!< displays the QTableWidget */ 33 31 34 //index1 = vueNetward->currentIndex(); 32 m_netwardTableView->setModel(m_netwardModel); 33 m_netwardTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ 34 m_netwardTableView->setShowGrid(false); /*!< this ligne cover the grille in table */ 35 m_netwardTableView->setSelectionBehavior(QAbstractItemView::SelectRows); /*!< this ligne give a section of the ligne */ 36 m_netwardTableView->resizeColumnsToContents(); 37 //index1 = m_netwardTableView->currentIndex(); 35 38 36 39 … … 87 90 { 88 91 89 vueNetward->setItem(row, 0, new QTableWidgetItem(m_ligneNomNetward -> text()));90 vueNetward->setItem(row, 1, new QTableWidgetItem(m_ligneNbiNetward -> text()));91 vueNetward->setItem(row, 2, new QTableWidgetItem(m_ligneNbsNetward -> text()));92 m_netwardTableView->setItem(row, 0, new QTableWidgetItem(m_ligneNomNetward -> text())); 93 m_netwardTableView->setItem(row, 1, new QTableWidgetItem(m_ligneNbiNetward -> text())); 94 m_netwardTableView->setItem(row, 2, new QTableWidgetItem(m_ligneNbsNetward -> text())); 92 95 93 96 netwardData.push_back(m_ligneNomNetward -> text() + " " + m_ligneNbiNetward -> text() + " " + m_ligneNbsNetward -> text()); … … 105 108 /*void NetwardWindow::deleteNetwardRow() { 106 109 107 vueNetward->removeRow(vueNetward->currentRow());110 m_netwardTableView->removeRow(m_netwardTableView->currentRow()); 108 111 isCalled = true; 109 112 … … 138 141 /*void NetwardWindow::addRowNetward() { 139 142 140 int row = vueNetward->rowCount();141 vueNetward->insertRow(row);143 int row = m_netwardTableView->rowCount(); 144 m_netwardTableView->insertRow(row); 142 145 143 146 }*/ … … 148 151 QTableWidgetItem *cel2 = new QTableWidgetItem; 149 152 150 for (int i = 0; i < vueNetward->rowCount() ; i++) {151 cel1 = vueNetward->item(i,0);152 cel2 = vueNetward->item(i,1);153 for (int i = 0; i < m_netwardTableView->rowCount() ; i++) { 154 cel1 = m_netwardTableView->item(i,0); 155 cel2 = m_netwardTableView->item(i,1); 153 156 154 157 //defvalData.push_back(cell1->text() + " " + cell2->text()); -
trunk/yao/src/interface/src/OperaWindow.cpp
r350 r357 58 58 m_OperaDeleteButton->setDisabled(true); 59 59 60 m odeleOpera= new QStandardItemModel(0, 6) ;61 m odeleOpera->setHorizontalHeaderLabels(QStringList() << "Nom Opera" << "Type" << "Dim 1" << "Dim 2" << "Dim 3" << "Nom traj");62 63 m_OperaTableView->setModel(m odeleOpera);60 m_operaModel = new QStandardItemModel(0, 6) ; 61 m_operaModel->setHorizontalHeaderLabels(QStringList() << "Nom Opera" << "Type" << "Dim 1" << "Dim 2" << "Dim 3" << "Nom traj"); 62 63 m_OperaTableView->setModel(m_operaModel); 64 64 m_OperaTableView->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ 65 65 m_OperaTableView->setShowGrid(false); /*!< this ligne cover the grille in table */ … … 128 128 //if (l >= 0) 129 129 // {*/ 130 int row = m odeleOpera->rowCount();130 int row = m_operaModel->rowCount(); 131 131 132 m odeleOpera->setItem(row, 0, new QStandardItem(m_OperaNameLine->text()));133 //m odeleOpera->setItem(row, 1, new QStandardItem(m_OperaType->text()));134 m odeleOpera->setItem(row, 2, new QStandardItem(m_OperaD1->currentText()));135 m odeleOpera->setItem(row, 3, new QStandardItem(m_OperaD2->currentText()));136 m odeleOpera->setItem(row, 4, new QStandardItem(m_OperaD3->currentText()));137 m odeleOpera->setItem(row, 5, new QStandardItem(m_OperaTrajname->currentText()));132 m_operaModel->setItem(row, 0, new QStandardItem(m_OperaNameLine->text())); 133 //m_operaModel->setItem(row, 1, new QStandardItem(m_OperaType->text())); 134 m_operaModel->setItem(row, 2, new QStandardItem(m_OperaD1->currentText())); 135 m_operaModel->setItem(row, 3, new QStandardItem(m_OperaD2->currentText())); 136 m_operaModel->setItem(row, 4, new QStandardItem(m_OperaD3->currentText())); 137 m_operaModel->setItem(row, 5, new QStandardItem(m_OperaTrajname->currentText())); 138 138 139 139 Identifier id(name, row); … … 182 182 QItemSelectionModel *selection = m_OperaTableView->selectionModel(); 183 183 index = selection->currentIndex(); 184 QVariant element = m odeleOpera->data(index, Qt::DisplayRole);184 QVariant element = m_operaModel->data(index, Qt::DisplayRole); 185 185 int r = index.row(); 186 186 if (selection->hasSelection())// Permet de supprimer la ligne qui est selectionnée. Evite ainsi certains effets indesirables. 187 187 { 188 m odeleOpera->removeRows(m_OperaTableView->currentIndex().row(), 1);188 m_operaModel->removeRows(m_OperaTableView->currentIndex().row(), 1); 189 189 //localTrajectoryTable->erase(localTrajectoryTable->begin() + r); 190 190 -
trunk/yao/src/interface/src/OrderWindow.cpp
r356 r357 1 1 //! \file OrderWindow.cpp 2 2 //! \brief Implementation of the OrderWindow window for visual_YAO. 3 //! \version 2010/06/ 16(yyyy/mm/dd)3 //! \version 2010/06/22 (yyyy/mm/dd) 4 4 //! \author MAYAKI Abdouramane. 5 5 … … 21 21 22 22 setupUi(this); 23 23 24 setFixedWidth(baseSize().width() + 765); 25 26 m_orderModel = new QStandardItemModel(0, 5); 24 27 } 25 28 -
trunk/yao/src/interface/src/TrajectoryWindow.cpp
r356 r357 13 13 14 14 /****************************************** Implementation of the constructor TrajectoryWindow() ***************************************************/ 15 TrajectoryWindow::TrajectoryWindow(Table <Trajectory> *aTrajectoryTable, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), localTrajectoryTable(NULL), m odeleTraj(NULL), localConstantTable(NULL) { /*!< The constructor. */15 TrajectoryWindow::TrajectoryWindow(Table <Trajectory> *aTrajectoryTable, Table <Constant> *aConstantTable, QWidget *parent) : QWidget(parent), localTrajectoryTable(NULL), m_trajModel(NULL), localConstantTable(NULL) { /*!< The constructor. */ 16 16 17 17 setupUi(this); // See ui_trajectorywindow.h for more. … … 43 43 // m_ligneTypeTraj->setMaximumSize(30, 25); 44 44 45 m odeleTraj= new QStandardItemModel(0, 6) ;46 m odeleTraj->setHorizontalHeaderLabels(QStringList() << "Nom traj." << "type" << "uptime" << "offtime" << "dtime" << "stepTime");45 m_trajModel = new QStandardItemModel(0, 6) ; 46 m_trajModel->setHorizontalHeaderLabels(QStringList() << "Nom traj." << "type" << "uptime" << "offtime" << "dtime" << "stepTime"); 47 47 for (Table<Trajectory>::iterator it = localTrajectoryTable->begin(); it != localTrajectoryTable->end(); it++) { 48 48 49 int row = m odeleTraj->rowCount();49 int row = m_trajModel->rowCount(); 50 50 //string t = atoi(it->getBoot()); 51 51 ostringstream t, offtime, dtime, steptime; … … 56 56 steptime << it->getSize(); 57 57 58 m odeleTraj->setItem(row, 0, new QStandardItem(QString(it->getName().c_str())));59 m odeleTraj->setItem(row, 1, new QStandardItem(QString(it->getType())));//Apres le 1er ajout, la ligne vaut i+160 m odeleTraj->setItem(row, 2, new QStandardItem(QString((t.str().c_str()))));61 m odeleTraj->setItem(row, 3, new QStandardItem(QString(offtime.str().c_str())));62 m odeleTraj->setItem(row, 4, new QStandardItem(QString(dtime.str().c_str())));63 m odeleTraj->setItem(row, 5, new QStandardItem(QString(steptime.str().c_str())));58 m_trajModel->setItem(row, 0, new QStandardItem(QString(it->getName().c_str()))); 59 m_trajModel->setItem(row, 1, new QStandardItem(QString(it->getType())));//Apres le 1er ajout, la ligne vaut i+1 60 m_trajModel->setItem(row, 2, new QStandardItem(QString((t.str().c_str())))); 61 m_trajModel->setItem(row, 3, new QStandardItem(QString(offtime.str().c_str()))); 62 m_trajModel->setItem(row, 4, new QStandardItem(QString(dtime.str().c_str()))); 63 m_trajModel->setItem(row, 5, new QStandardItem(QString(steptime.str().c_str()))); 64 64 65 65 } 66 66 67 67 68 vueTraj->setModel(m odeleTraj);68 vueTraj->setModel(m_trajModel); 69 69 vueTraj->setEditTriggers(QAbstractItemView::NoEditTriggers); /*!< this ligne give no edit mode*/ 70 70 vueTraj->setShowGrid(false); /*!< this ligne cover the grille in table */ … … 224 224 //string constantValue = localConstantTable->find(upTime.toStdString())->getText(); 225 225 226 /*m odeleTraj->setItem(row, 0, new QStandardItem(trajName));227 m odeleTraj->setItem(modeleTraj->rowCount(), 1, new QStandardItem(QString(constantValue.c_str())));228 m odeleTraj->setItem(row, 2, new QStandardItem(upTime));229 m odeleTraj->setItem(row, 3, new QStandardItem(offTime));230 m odeleTraj->setItem(row, 4, new QStandardItem(dTime));231 m odeleTraj->setItem(row, 5, new QStandardItem(stepTime));226 /*m_trajModel->setItem(row, 0, new QStandardItem(trajName)); 227 m_trajModel->setItem(m_trajModel->rowCount(), 1, new QStandardItem(QString(constantValue.c_str()))); 228 m_trajModel->setItem(row, 2, new QStandardItem(upTime)); 229 m_trajModel->setItem(row, 3, new QStandardItem(offTime)); 230 m_trajModel->setItem(row, 4, new QStandardItem(dTime)); 231 m_trajModel->setItem(row, 5, new QStandardItem(stepTime)); 232 232 //hatHeaderList->push_back(hatFile); 233 233 initialiserChamps();*/ … … 350 350 Trajectory localTrajectory(trajName.toStdString(), boot, size, step, offset, 'M');//Trajectory object. 351 351 localTrajectoryTable->push_back(localTrajectory); //Trajectory vector (contents many objects) 352 int row = m odeleTraj->rowCount(); //To get all time the last line number.353 m odeleTraj->setItem(row, 0, new QStandardItem(trajName));354 m odeleTraj->setItem(row, 1, new QStandardItem(typeTraj));355 m odeleTraj->setItem(row, 2, new QStandardItem(upTime));356 m odeleTraj->setItem(row, 3, new QStandardItem(offTime));357 m odeleTraj->setItem(row, 4, new QStandardItem(dTime));358 m odeleTraj->setItem(row, 5, new QStandardItem(stepTime));352 int row = m_trajModel->rowCount(); //To get all time the last line number. 353 m_trajModel->setItem(row, 0, new QStandardItem(trajName)); 354 m_trajModel->setItem(row, 1, new QStandardItem(typeTraj)); 355 m_trajModel->setItem(row, 2, new QStandardItem(upTime)); 356 m_trajModel->setItem(row, 3, new QStandardItem(offTime)); 357 m_trajModel->setItem(row, 4, new QStandardItem(dTime)); 358 m_trajModel->setItem(row, 5, new QStandardItem(stepTime)); 359 359 360 360 emit trajRowIsAdded(); … … 371 371 QItemSelectionModel *selection = vueTraj->selectionModel(); 372 372 index = selection->currentIndex(); 373 QVariant element = m odeleTraj->data(index, Qt::DisplayRole);373 QVariant element = m_trajModel->data(index, Qt::DisplayRole); 374 374 int r = index.row(); 375 375 if (selection->hasSelection())// Permet de supprimer la ligne qui est selectionnée. Evite ainsi certains effets indesirables. 376 376 { 377 m odeleTraj->removeRows(vueTraj->currentIndex().row(), 1);377 m_trajModel->removeRows(vueTraj->currentIndex().row(), 1); 378 378 localTrajectoryTable->erase(localTrajectoryTable->begin() + r); 379 379 -
trunk/yao/src/interface/src/include/ConnectionWindow.hpp
r356 r357 53 53 private : 54 54 55 55 QStringList CtinData; 56 56 QStandardItemModel *m_ctinModel; 57 57 -
trunk/yao/src/interface/src/include/ConstantWindow.hpp
r355 r357 70 70 QStringList m_savedData; 71 71 72 QStandardItemModel *m odele;72 QStandardItemModel *m_defvalModel; 73 73 QModelIndex index; 74 74 //QTableView *m_tableView; -
trunk/yao/src/interface/src/include/ContextWindow.hpp
r344 r357 61 61 QStringListModel *filesListModele; 62 62 63 QStandardItemModel * contextModele;63 QStandardItemModel *m_contextModel; 64 64 QStandardItemModel *O_EXTOBJModele; 65 65 QModelIndex index; -
trunk/yao/src/interface/src/include/HatNameWindow.hpp
r341 r357 122 122 QListView *hatView; 123 123 124 QStandardItemModel *m odeleHatName;124 QStandardItemModel *m_hatnameModel; 125 125 126 126 QFileDialog *boiteDialogue; -
trunk/yao/src/interface/src/include/InsertFCTWindow.hpp
r351 r357 10 10 11 11 #include "../../ui_insertfctwindow.h" 12 #include <QStandardItemModel> 12 13 #include <QMessageBox> 13 14 #include <QStringList> … … 28 29 void insertFCTWindowIsClosed(int ); 29 30 30 private :31 32 31 33 32 protected: 34 33 void closeEvent(QCloseEvent *event); 35 34 35 private : 36 QStandardItemModel *m_insertFCTModel; 36 37 37 38 }; -
trunk/yao/src/interface/src/include/ModulWindow.hpp
r356 r357 39 39 40 40 private: 41 QStandardItemModel * ModulModele;41 QStandardItemModel *m_modulModel; 42 42 QStandardItemModel *O_EXTOBJModele; 43 43 QModelIndex index; -
trunk/yao/src/interface/src/include/NetwardWindow.hpp
r350 r357 2 2 * \file Netwardwindow.hpp 3 3 * \brief Netward class for visual_YAO. 4 * \version 2010/06/ 16(yyyy/mm/dd)4 * \version 2010/06/22 (yyyy/mm/dd) 5 5 * \author MAYAKI Abdouramane. 6 6 */ … … 11 11 12 12 #include "../../ui_netwardwindow.h" 13 //#include "src/include/Entete.hpp"14 //#include <QGridLayout>15 //#include <QTableWidget>16 //#include <QGroupBox>17 13 #include <QMessageBox> 18 14 #include <QTextStream> 19 15 #include <QModelIndex> 16 #include <QStandardItemModel> 20 17 21 18 class NetwardWindow : public QWidget, Ui::NetwardWindow { … … 28 25 * 29 26 * Constructor of the class NetwardWindow 30 *31 27 * 32 28 */ … … 34 30 35 31 //--void addRowNetward(); 36 //QStringList getDataNetward(); /*!< This function returns the netward's data. */37 //void initialiserNetward();38 32 39 33 public slots : /*!< Functions called after a click. */ 40 34 41 35 //void addNetwardRow(); /*!< This function is called to add row in the visual window model. */ 42 //void addRowNetward();43 36 //void deleteNetwardRow(); /*!< This function is called to delete row from the Yao model. */ 44 37 //void callNetwardHelp(); /*!< This function is called to help of this directive.*/ 45 //void initialiserChamps();46 //--void saveNetwardData();47 38 48 39 signals: … … 54 45 private : 55 46 56 //bool isCalled; 57 58 QModelIndex index1; 59 60 //QStringList netwardData; 47 QModelIndex index1; 48 QStandardItemModel *m_netwardModel; 61 49 62 50 }; -
trunk/yao/src/interface/src/include/OperaWindow.hpp
r350 r357 72 72 73 73 QModelIndex index; 74 QStandardItemModel *m odeleOpera;74 QStandardItemModel *m_operaModel; 75 75 76 76 QStringList m_horizontalHeader; -
trunk/yao/src/interface/src/include/OrderWindow.hpp
r351 r357 12 12 13 13 #include "../../ui_orderwindow.h" 14 #include <QStandardItemModel> 14 15 15 16 class OrderWindow : public QWidget, public Ui::OrderWindow { … … 20 21 OrderWindow(QWidget *parent=0); 21 22 22 private :23 24 23 private slots: 25 24 … … 30 29 void closeEvent(QCloseEvent *event); 31 30 31 private : 32 QStandardItemModel *m_orderModel; 32 33 }; 33 34 #endif // ORDERWINDOW_HPP -
trunk/yao/src/interface/src/include/TrajectoryWindow.hpp
r356 r357 56 56 57 57 int compteur; 58 QStandardItemModel *m odeleTraj;58 QStandardItemModel *m_trajModel; 59 59 QModelIndex index; 60 60 yao::Table <yao::Trajectory> *localTrajectoryTable; -
trunk/yao/src/interface/src/ui_/netwardwindow.ui
r350 r357 49 49 </property> 50 50 <property name="buddy"> 51 <cstring> lineEdit</cstring>51 <cstring>m_nameNetwardLine</cstring> 52 52 </property> 53 53 </widget> … … 87 87 <layout class="QVBoxLayout" name="verticalLayout_3"> 88 88 <item> 89 <widget class="QLineEdit" name=" lineEdit"/>89 <widget class="QLineEdit" name="m_nameNetwardLine"/> 90 90 </item> 91 91 <item> 92 <widget class="QComboBox" name=" comboBox"/>92 <widget class="QComboBox" name="m_comboNbi"/> 93 93 </item> 94 94 <item> 95 <widget class="QComboBox" name=" comboBox_2"/>95 <widget class="QComboBox" name="m_comboNbs"/> 96 96 </item> 97 97 </layout> … … 100 100 </widget> 101 101 </widget> 102 <widget class="QFrame" name=" frame_2">102 <widget class="QFrame" name="m_frameView"> 103 103 <property name="geometry"> 104 104 <rect> … … 118 118 <property name="geometry"> 119 119 <rect> 120 <x>2 76</x>120 <x>282</x> 121 121 <y>70</y> 122 122 <width>81</width> … … 126 126 <layout class="QVBoxLayout" name="verticalLayout"> 127 127 <item> 128 <widget class="QPushButton" name=" pushButton">128 <widget class="QPushButton" name="m_addNetwardButton"> 129 129 <property name="text"> 130 130 <string>Ajouter</string> … … 133 133 </item> 134 134 <item> 135 <widget class="QPushButton" name=" pushButton_2">135 <widget class="QPushButton" name="m_delNetwardButton"> 136 136 <property name="text"> 137 137 <string>Supprimer</string> … … 140 140 </item> 141 141 <item> 142 <widget class="QPushButton" name=" pushButton_3">142 <widget class="QPushButton" name="m_quitNetwardButton"> 143 143 <property name="text"> 144 144 <string>Quitter</string> … … 148 148 </layout> 149 149 </widget> 150 <widget class="QPushButton" name=" pushButton_4">150 <widget class="QPushButton" name="m_helpNetwardButton"> 151 151 <property name="geometry"> 152 152 <rect> … … 161 161 </property> 162 162 </widget> 163 <widget class="QTableView" name=" tableView">163 <widget class="QTableView" name="m_netwardTableView"> 164 164 <property name="geometry"> 165 165 <rect> … … 174 174 </widget> 175 175 <tabstops> 176 <tabstop> comboBox</tabstop>177 <tabstop> comboBox_2</tabstop>178 <tabstop> pushButton</tabstop>179 <tabstop> pushButton_2</tabstop>180 <tabstop> tableView</tabstop>181 <tabstop> pushButton_3</tabstop>182 <tabstop> pushButton_4</tabstop>176 <tabstop>m_comboNbi</tabstop> 177 <tabstop>m_comboNbs</tabstop> 178 <tabstop>m_addNetwardButton</tabstop> 179 <tabstop>m_delNetwardButton</tabstop> 180 <tabstop>m_netwardTableView</tabstop> 181 <tabstop>m_quitNetwardButton</tabstop> 182 <tabstop>m_helpNetwardButton</tabstop> 183 183 </tabstops> 184 184 <resources/>
Note: See TracChangeset
for help on using the changeset viewer.