- Timestamp:
- 10/18/10 17:48:55 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/ConstantWindow.cpp
r457 r458 28 28 //localConstantController = aConstantController; 29 29 QRegExp regExp("[A-Za-z_][A-Za-z0-9_]*"); //{0,}"); * means zero or more occurrence of the 2nd bloc. 30 QRegExp regExp2("[ 0-9]+[.0-9]?[0-9]*[eE]?[+-]?[0-9]+");30 QRegExp regExp2("[A-Za-z0-9_][A-Za-z0-9]*[.0-9]?[0-9]*[eE]?[+-]?[0-9]+"); 31 31 m_ligneNom->setValidator(new QRegExpValidator(regExp, this)); 32 32 m_ligneValeur->setValidator(new QRegExpValidator(regExp2, this)); … … 85 85 } 86 86 m_delButton->setEnabled(true); 87 88 Constant *c; 89 90 c = m_localConstantTable->find(Val.toStdString()); 91 if (c != NULL) 92 Val = QString(c->getText().c_str());//QString(m_localConstantTable->getText().c_str()); 93 else { 94 95 for(int i=0; i < Val.size(); i++) 96 if (!(Val[i] >= '0' && Val[i] <= '9')) { 97 98 QMessageBox::critical(this, "Avertissement", "Seuls les noms des constantes defval sont acceptés sous forme de chaines."); 99 return; 100 } 101 //else 102 } 103 87 104 Constant localConstant (Nom.toStdString(), Val.toStdString()); 88 105 //for (Table<Constant>::iterator it = m_localConstantTable->begin(); it != m_localConstantTable->end(); it++) … … 98 115 99 116 m_localConstantTable->push_back(localConstant); 100 m_defvalModel->setItem(m_defvalModel->rowCount(), 0, new QStandardItem( m_ligneNom->text()));101 m_defvalModel->setItem(m_defvalModel->rowCount()-1, 1, new QStandardItem( m_ligneValeur->text()));//Apres le 1er ajout, la ligne vaut i+1117 m_defvalModel->setItem(m_defvalModel->rowCount(), 0, new QStandardItem(Nom)); 118 m_defvalModel->setItem(m_defvalModel->rowCount()-1, 1, new QStandardItem(Val));//Apres le 1er ajout, la ligne vaut i+1 102 119 103 120 emit rowIsAdded(); // signal emis lorsqu'une ligne a été correctement rajoutée dans le tableau.
Note: See TracChangeset
for help on using the changeset viewer.