Changeset 380 for trunk/yao

Timestamp:

07/06/10 15:27:19 (14 years ago)

Author:

yerima

Message:

Control on the d2 and d3 priority in space and opera window. Adding row is possible in the connection window.

Location:

trunk/yao/src/interface/src

Files:

• ConnectionWindow.cpp (modified) (3 diffs)
• ModulWindow.cpp (modified) (6 diffs)
• OperaWindow.cpp (modified) (1 diff)
• SpaceWindow.cpp (modified) (6 diffs)
• TrajectoryWindow.cpp (modified) (1 diff)
• include/ConnectionWindow.hpp (modified) (1 diff)
• ui_/modulwindow.ui (modified) (1 diff)

trunk/yao/src/interface/src/ConnectionWindow.cpp

@@ -131 +131 @@
         try
                 {
+                        int row = m_ctinModel->rowCount();//To have the current row of the tableView.
+
+                        string modulIn   = m_ctinModulInCombo->currentText().toStdString(),
+                                in       = m_ctinInCombo->currentText().toStdString(),
+                                in2      = m_ctinModulInCombo->currentText().toStdString(),
+                                in3      = m_ctinModulInCombo->currentText().toStdString(),
+                                modulOut = m_ctinModulOutCombo->currentText().toStdString();
+                
+                        if (!modulIn.empty() && !modulOut.empty()) 
+                                {
+                                        m_ctinModel->setItem(row, 0, new QStandardItem(QString(modulIn.c_str())));
+                                        m_ctinModel->setItem(row, 2, new QStandardItem(QString(modulOut.c_str())));
+                                }       
+
                 }
 
@@ -138 +152 @@
                 }
         
-
-/*
- static int row = 0;
-  int l = 0;
-  QString texte = " from ";
-
-QString comboline1 = comboBoxctin1->currentText();
-QString comboline2 = comboBoxctin2->currentText();
-QString comboline3 = comboBoxctin3->currentText();
-QString comboline4 = comboBoxctin4->currentText();
-//QString comboline5 = comboBoxctin1->currentText();
-//QString comboline1 = comboBoxctin1->currentText();
-
-
-             for(int i = 0; i<comboline1.size(); i++)
-        //if (m_ligneNomTraj->text().isEmpty())
-     if(!((comboline1.at(i) >= QChar('a')&& comboline1.at(i) <= QChar('z')) || (comboline1.at(i) >= QChar('A')&& comboline1.at(i) <= QChar('Z')) //--------
-         || (comboline1.at(i) >= QChar('0')&& comboline1.at(i) <= QChar('9')) || (comboline1.at(i) == QChar('_')))) //|| (line1.isEmpty())
-    {
-        QMessageBox::critical(this, "Erreur", "Veuillez entrer une valeur correcte pour le module entre1");
-        return; // Arrêt de la méthode
-    }
-       for(int i1 = 0; i1<comboline2.size(); i1++)
-        //if (m_ligneNomTraj->text().isEmpty())
-     if(!((comboline2.at(i1) >= QChar('0')&& comboline2.at(i1) <= QChar('9')))) //|| (line1.isEmpty())
-    {
-        QMessageBox::critical(this, "Erreur", "Veuillez entrer une valeur correcte pour le module entre 2");
-        return; // Arrêt de la méthode
-    }
-       for(int i3 = 0; i3<comboline3.size(); i3++) 
-     if(!((comboline3.at(i3) >= QChar('0')&& comboline3.at(i3) <= QChar('9')))) //||
-    {
-        QMessageBox::critical(this, "Erreur", "Veuillez entrer une valeur correcte pour le module sortie 2");
-        return; // Arrêt de la méthode
-    }
-       for(int i4 = 0; i4<comboline4.size(); i4++)
-     if(!((comboline4.at(i4) >= QChar('a')&& comboline4.at(i4) <= QChar('z')) || (comboline4.at(i4) >= QChar('A')&& comboline4.at(i4) <= QChar('Z'))
-         || (comboline4.at(i4) >= QChar('0')&& comboline4.at(i4) <= QChar('9')) || (comboline4.at(i4) == QChar('_')))) //|| 
-    {
-        QMessageBox::critical(this, "Erreur", "Veuillez entrer une valeur correcte pour le module sortie 1");
-        return; // Arrêt de la méthode
-    }
-       
- 
-       if ((comboBoxctin1->currentText().isEmpty()) || (comboBoxctin2->currentText().isEmpty()) || (comboBoxctin3->currentText().isEmpty()) || (comboBoxctin4->currentText().isEmpty()) || (comboBoxctin_i->currentText().isEmpty()))
-        {
-    QMessageBox::critical(this, "Erreur", "Il y a au moins un module d'entree non definie: entrer la valeur manquante SVP!!!!");
-        return; // Arrêt de la méthode
-    }
-
-       else if ((comboBoxctin3->currentText().isEmpty()) || (comboBoxctin4->currentText().isEmpty()))
-        {
-    QMessageBox::critical(this, "Erreur", "Il y a au moins un module de sortie non definie: entrer la valeur manquante SVP!");
-        return; // Arrêt de la méthode
-    }
-       else if (comboBoxctin_i->currentText().isEmpty())
-        {
-    QMessageBox::critical(this, "Erreur", "La valeur de l'axe i est vide: entrer la valeur manquante SVP!");
-        return; // Arrêt de la méthode
-    }
-
-if (l >= 0)
-{
-     
-
-      tableWidgetctin1->setItem(row, 0, new QTableWidgetItem(comboBoxctin1->currentText()));
-      tableWidgetctin1->setItem(row, 1, new QTableWidgetItem(comboBoxctin2->currentText()));
-      tableWidgetctin1->setItem(row, 2, new QTableWidgetItem(comboBoxctin4->currentText()));
-      tableWidgetctin1->setItem(row, 3, new QTableWidgetItem(comboBoxctin3->currentText()));
-      tableWidgetctin1->setItem(row, 4, new QTableWidgetItem(comboBoxctin_i->currentText()));
-      tableWidgetctin1->setItem(row, 5, new QTableWidgetItem(comboBoxctin_j->currentText()));
-      tableWidgetctin1->setItem(row, 6, new QTableWidgetItem(comboBoxctin_k->currentText()));
-
-          CtinData.push_back(comboBoxctin1->currentText() + " " + comboBoxctin2->currentText() + texte + comboBoxctin4->currentText() +
-                                                          " " + comboBoxctin3->currentText() + " " + comboBoxctin_i->currentText() +
-                                                          " " + comboBoxctin_j->currentText() + " " + comboBoxctin_k->currentText() +
-                                                          " " + comboBoxctin_t->currentText()); 
-    row++;
-//}
-        }
-//writefileCtin();
-
-*/
 }
 /********************************************** Implementation of the deleteCtinRow() method  *********************************************************/
@@ -227 +158 @@
         try
                 {
+                        QItemSelectionModel *selection =m_ctinTableView->selectionModel();
+                        index = selection->currentIndex();
+                        QVariant element = m_ctinModel->data(index, Qt::DisplayRole);
+                        int r = index.row();
+                        if (selection->hasSelection())// Permet de supprimer la ligne qui est selectionnée. Evite ainsi certains effets indesirables.
+                                  {   
+                                        m_ctinModel->removeRows(m_ctinTableView->currentIndex().row(), 1);
+                                         //m_localModulTable->erase(m_localModulTable->begin() + r); 
+                                         
+                                         //if(isModulTableEmpty()) m_modulDelButton->setDisabled(true);
+                                }
                 }
 

trunk/yao/src/interface/src/ModulWindow.cpp

@@ -34 +34 @@
         QRegExp regExp("[A-Za-z_][A-Za-z1-9_]{0,}"); 
         m_modulNameLine->setValidator(new QRegExpValidator(regExp, this));
+        QRegExp regExp2("[1-9]{0,}"); 
+        m_modulInputLine->setValidator(new QRegExpValidator(regExp2, this));
+        m_modulOutputLine->setValidator(new QRegExpValidator(regExp2, this));
+        
         //Modul(&m_localModulName);
 
@@ -107 +111 @@
         connect(m_buttonLoperaDel, SIGNAL(clicked()), this, SLOT(deleteLoperaRow()));
 
-        setFixedWidth(baseSize().width() + 766);
+        setFixedWidth(baseSize().width() + 780);
 
 
@@ -143 +147 @@
                          modulAttributs = "target " + target;
                  }               
-        
-
-        if (!(modulName.empty() || modulParent.empty() )) { // !(false) => true if there are data in the lineEDit.
-        
-                m_modulModel->setItem(row, 0, new QStandardItem(QString(modulName.c_str())));  
-                m_modulModel->setItem(row, 1, new QStandardItem(QString(modulParent.c_str())));  
-                if (!input.empty())
-                        { 
-                                m_modulModel->setItem(row, 2, new QStandardItem(QString(input.c_str())));  
-                                if (!output.empty()) 
-                                        m_modulModel->setItem(row, 3, new QStandardItem(QString(output.c_str())));
+        if (!(output.empty() && input.empty()) && modulName.empty())
+                        {
+                                QMessageBox::critical(this, "Erreur", "Veuillez d'abord renseigner le champ \"nom module\".");
+                                return; // Arrêt de la méthode
+
                         }
-                if (!(output.empty()) && (input.empty())) {
-                        QMessageBox::critical(this, "Erreur", "Veuillez préciser la valeur du champ \"input\".");
-                        return; // Arrêt de la méthode
-                } 
-
-                if (!target.empty())
+
+
+
+        if (!(modulName.empty() && modulParent.empty())) 
+                { // !(false) => true if there are data in the lineEDit.
+        
+                        m_modulModel->setItem(row, 0, new QStandardItem(QString(modulName.c_str())));  
+                        m_modulModel->setItem(row, 1, new QStandardItem(QString(modulParent.c_str())));  
+                        if (!input.empty())
+                                { 
+                                        m_modulModel->setItem(row, 2, new QStandardItem(QString(input.c_str())));  
+                                        if (!output.empty()) 
+                                                m_modulModel->setItem(row, 3, new QStandardItem(QString(output.c_str())));
+                                }
+                        if (!(output.empty()) && (input.empty())) {
+                                QMessageBox::critical(this, "Erreur", "Veuillez préciser la valeur du champ \"input\".");
+                                return; // Arrêt de la méthode
+                        } 
+                        if (!target.empty())
                                 m_modulModel->setItem(row, 4, new QStandardItem(QString(target.c_str())));  
 
@@ -175 +186 @@
                 if (!m_modulNowardCheckBox->isChecked ()) generateModulFile(modulName);                 
         }
-
+        else 
+                {
+                        QMessageBox::critical(this, "Erreur", "Veuillez renseigner le champ \"nom module\" ou \"space or opera\".");
+                                 return; // Arrêt de la méthode
+
+                }
         toInitialize();
         if (!isModulTableEmpty()) m_modulDelButton->setEnabled(true);   
@@ -237 +253 @@
                 {
 
-/*                      
-           if (selection->hasSelection())// Permet de supprimer la ligne qui est selectionnée. Evite ainsi certains effets indesirables.
-            {
-                   modeleSpace->removeRows(m_spaceTableView->currentIndex().row(), 1);
-                   localSpaceTable->erase(localSpaceTable->begin() + r);
- 
-           }
- 
-         if (isSpaceTableEmpty()) m_spaceDeleteButton->setDisabled(true);
-*/
-                        //QItemSelectionModel *selection = m_modulTableView->selectionModel();
-                        //QModelIndex indexElementSelectionne = selection->currentIndex();
-        
-                        //int c = m_tableView->currentIndex().row();//renvoie le numero de la ligne selectionnée.
                         QItemSelectionModel *selection = m_modulTableView->selectionModel();
                         index = selection->currentIndex();
@@ -260 +262 @@
                                         m_localModulTable->erase(m_localModulTable->begin() + r); 
     
-                                        /*for (unsigned int i=0; i < localHeaderList->size(); i++ ) //Parcourt le vecteur de HatName en fonction de sa taille (nombre d'éléments)
-                                                {   
-                                                        //localConstantTable->find(hatFile)->getText(); 
-                                                        if (element.toString().toStdString() == localHeaderList->at(i)) //Teste si l'élément à supprimer dans defval est aussi dans hat
-                                                                localHeaderList->erase(localHeaderList->begin() + i);//localHeaderList->begin() +i );   
-                                                }   
-                                            */
-                                        //emit rowIsDeleted(element.toString()); // signal emis lorsqu'une ligne est retirée du tableau. 
                                         if(isModulTableEmpty()) m_modulDelButton->setDisabled(true);
                                 }   

trunk/yao/src/interface/src/OperaWindow.cpp

@@ -169 +169 @@
                 theShape.push_back(toInt(d3));
         }
- 
+        //Priority between d2 and d3 dimension. 
+        if (!d3.empty() && d2.empty())
+                                {       
+                                         QMessageBox::about(this, tr("Erreur de saisie!"), tr("<p> Veuillez renseigner le champ \"dimension 2\"."));
+                                          return;
+                                 
+                                }
+        
+
         if (name.empty()) { 
                 QMessageBox::about(this, tr("Operator: erreur de saisie."),

trunk/yao/src/interface/src/SpaceWindow.cpp

@@ -84 +84 @@
         setFixedWidth(baseSize().width() + 505);
 }
+
 //------------------------------------  End of the contructor declaration.---------------------------------------
 /*************************************  Implementation of function addSpaceRow *************************************************/
@@ -176 +177 @@
                                                 theShape.push_back(toInt(d3));
                                         }
+                                //Priority between d2 and d3 dimension.
+                                if (!d3.empty() && d2.empty()) 
+                                {
+                                        QMessageBox::about(this, tr("Erreur de saisie!"), tr("<p> Veuillez renseigner le champ \"dimension 2\"."));
+                                         return;
+        
+                                }
+
  
                                 if (name.empty()) { 
@@ -198 +207 @@
                                                 if (!isSpaceTableEmpty()) m_spaceDeleteButton->setEnabled(true);
                                         }
-                }
+                                        }
 
                 catch(...)
@@ -211 +220 @@
       return atoi(s.c_str());
 }
-
-/************************************* Implementation of function addRow **************************************************/
-//void SpaceWindow::addRow() {
-
-        //int row = m_spaceTableView->rowCount();
-        //m_spaceTableView->insertRow(row);
-
-//}
 
 /************************************** Implementation of function deleteRow **********************************************/
@@ -266 +267 @@
 
 }
+
 /****************************************************************************************************************************/
 bool SpaceWindow::isString(string aString) {
@@ -322 +324 @@
 }
 /***************************************************************************************************************************************************/
-/*********************************************** End of file. **************************************************************************************/
+/**************************************************************** End of file. *********************************************************************/
 /***************************************************************************************************************************************************/

trunk/yao/src/interface/src/TrajectoryWindow.cpp

@@ -265 +265 @@
        || (upTime.at(k) == QChar('E')) || (upTime.at(k) == QChar('e')))) {
 
-                QMessageBox::critical(this, "Erreur", "Nbuptime doit-être une valeur entiÚre.");
+                QMessageBox::critical(this, "Erreur", "uptime doit-être une valeur entiÚre.");
 
                 return; // Arrêt de la méthode 

trunk/yao/src/interface/src/include/ConnectionWindow.hpp

@@ -67 +67 @@
 
         private :
-
+                        QModelIndex index;
                         QStringList CtinData;
                         QStandardItemModel *m_ctinModel;

trunk/yao/src/interface/src/ui_/modulwindow.ui

@@ -489 +489 @@
       <x>10</x>
       <y>70</y>
-      <width>307</width>
+      <width>301</width>
       <height>29</height>
      </rect>