Changeset 457 for trunk/yao

Timestamp:

10/18/10 13:48:34 (14 years ago)

Author:

yerima

Message:

Two defval constant connot have the same name.

Location:

trunk/yao/src/interface/src

Files:

• ConstantWindow.cpp (modified) (3 diffs)
• InstructionWindow.cpp (modified) (1 diff)

trunk/yao/src/interface/src/ConstantWindow.cpp

@@ -57 +57 @@
         
         setFixedWidth(baseSize().width() + 335);
+        
         //      move(0, 0);
 }
@@ -75 +76 @@
         else {
                 if (!(m_ligneNom->text().isEmpty()) || (m_ligneValeur->text().isEmpty())) {
+        
+                        for (Table<Constant>::iterator it = m_localConstantTable->begin(); it != m_localConstantTable->end(); it++)
+                                if (it->getName() == Nom.toStdString())
+                                        {
+                                                QMessageBox::critical(this, "Avertissement", "Ce nom existe déjà !");
+                                                eraseDataFromLineEdit();
+                                                return;
+                                        }
                         m_delButton->setEnabled(true);                     
                         Constant localConstant (Nom.toStdString(), Val.toStdString());  
@@ -88 +97 @@
                         //              }
                 
-                                m_localConstantTable->push_back(localConstant);
+                        m_localConstantTable->push_back(localConstant);
                         m_defvalModel->setItem(m_defvalModel->rowCount(), 0, new QStandardItem(m_ligneNom->text()));
                         m_defvalModel->setItem(m_defvalModel->rowCount()-1, 1, new QStandardItem(m_ligneValeur->text()));//Apres le 1er ajout, la ligne vaut i+1

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

@@ -166 +166 @@
                                 //savedData.push_back(nom+" "+val);
                                 m_localInstructionData->push_back(nom.toStdString()+" "+val.toStdString());//=  (QStringList() << str1 << str2 << str3);
-                                
+                                m_rightButton;  
                                 emit activeTheIAction();
                   }