Changeset 464 for trunk/yao

Timestamp:

10/22/10 19:45:23 (14 years ago)

Author:

yerima

Message:

Working on the orderwindow.

Location:

trunk/yao/src/interface/src

Files:

• ModinspaceWindow.cpp (modified) (1 diff)
• include/ModinspaceWindow.hpp (modified) (2 diffs)
• ui_/modinspace.ui (modified) (7 diffs)
• ui_/orderwindow.ui (modified) (4 diffs)

trunk/yao/src/interface/src/ModinspaceWindow.cpp

@@ -65 +65 @@
         m_axesModel                     = new QStandardItemModel(0, 1) ;
         m_modulNameModel                = new QStandardItemModel(0, 0) ;
-        m_outlineModel                  = new QStandardItemModel(0, 3) ;
-                m_outlineModel->setHorizontalHeaderLabels(QStringList() << "" << "" << ""); 
+        m_outlineModel                  = new QStandardItemModel(0, 4) ;
+                m_outlineModel->setHorizontalHeaderLabels(QStringList() << "" << "" << "" << ""); 
 
         m_axesListView->setModel(m_axesModel);
         m_modulNameListView->setModel(m_modulNameModel);
         m_outlineTreeView1->setModel(m_outlineModel);
+        
+        //connect(m_axesListView, SIGNAL(clicked(QModelIndex)), this, SLOT(deleteAxesRow(QModelIndex)));
+        //connect(m_modulNameListView, SIGNAL(clicked(QModelIndex)), this, SLOT(deleteModulRow(QModelIndex)));
+        
+        connect(m_modinspaceDeleteButton, SIGNAL(clicked()), this, SLOT(deleteAxesRow()));
+        connect(m_modinspaceDeleteButton, SIGNAL(clicked()), this, SLOT(deleteModulRow()));
+
+        connect(m_rightAxesButton, SIGNAL(clicked()), this, SLOT(addTheAxesRow()));
+        connect(m_rightModulNameButton, SIGNAL(clicked()), this, SLOT(addTheModulRow()));
+        //connect(m_modinspaceDeleteButton, SIGNAL(clicked()), this, SLOT(deleteTheRow()));
+
+}
+/******************************** implementation of method ***********************************/
+/*void ModinspaceWindow::callClicked(const QModelIndex &index) {
+        
+        QStandardItem *item = m_axesModel->itemFromIndex(index);        
+        
+        //cout << "Voici le text: " << item->text().toStdString() << endl; 
+        
+}*/
+/********************************* Implementation of the selectedFunction(QModelIndex index) method  ***********************************/
+void ModinspaceWindow::addTheAxesRow() {
+        
+        if (m_spaceOrOperaNameComboBox->currentText().isEmpty()) {
+        
+                QMessageBox::critical(this, "Avis", "Précisez d'abord l'espace ou l'opérateur avant de faire le choix des axes.");
+                return;
+        }
+
+        QString theAxe = m_axesComboBox->currentText();
+
+        if (theAxe.isEmpty()) return;
+        
+        m_axesModel->setItem(m_axesModel->rowCount(), 0, new QStandardItem(theAxe));    
+        m_axesComboBox->setCurrentIndex(0);
+}
+
+/********************************* Implementation of the addInstructionRow()  method *************************************************/
+void ModinspaceWindow::addTheModulRow() {
+
+        QString theModul = m_modulNameComboBox->currentText();
+
+        if (theModul.isEmpty()) return;
+        
+        m_modulNameModel->setItem(m_modulNameModel->rowCount(), 0, new QStandardItem(theModul));        
+        m_modulNameComboBox->setCurrentIndex(0);
+
+}
+/******************************* Implementation of the deleteModulRow(const QModelIndex &index) method ****************************************/  
+void ModinspaceWindow::deleteAxesRow() {
+        
+                
+        //QStandardItem *item = m_axesModel->itemFromIndex(index);      
+
+        QItemSelectionModel *selectionFromAxes = m_axesListView->selectionModel();
+        //QItemSelectionModel *selectionFromModul = m_modulNameListView->selectionModel();
+
+        indexForAxes = selectionFromAxes->currentIndex();
+        //indexForModul = selectionFromModul->currentIndex();
+
+        QVariant axesElement = m_axesModel->data(indexForAxes, Qt::DisplayRole);
+        //QVariant modulElement = m_modulNameModel->data(indexForModul, Qt::DisplayRole);
+        
+        if(axesElement.toString().isEmpty())
+                return;
+                
+        //if(!axesElement.toString().isEmpty())
+                m_axesModel->removeRows(m_axesListView->currentIndex().row(), 1);// Le 2Úme parametre indique le nombre de ligne à supprimer
+        //else
+        //      if(!modulElement.toString().isEmpty()) 
+        //              m_modulNameModel->removeRows(m_modulNameListView->currentIndex().row(), 1);// Le 2Úme parametre indique le nombre de ligne à supprimer
+
 
 }
 
-/********************************* Implementation of the selectedFunction(QModelIndex index) method  ***********************************/
-/*void ModinspaceWindow::selectedFunction(QModelIndex index) {
+/******************************* Implementation of the deleteModulRow(const QModelIndex &index) method ****************************************/  
+void ModinspaceWindow::deleteModulRow() {
+        
+        
+        //QStandardItem *item = m_modulNameModel->itemFromIndex(index); 
 
-        QItemSelectionModel *selection = m_proposedParametersListView->selectionModel();
-        //index = selection->currentIndex();
-        QVariant element = m_instructionLeftModel->data(index, Qt::DisplayRole);
-        QString chaine = element.toString();//.toStdString();
-        m_fonctionNameLineEdit->setText(chaine);
-        //QMessageBox::about(this, "Avis", chaine);
-        //int r = index.row();
+        //QItemSelectionModel *selectionFromAxes = m_axesListView->selectionModel();
+        QItemSelectionModel *selectionFromModul = m_modulNameListView->selectionModel();
+
+        //indexForAxes = selectionFromAxes->currentIndex();
+        indexForModul = selectionFromModul->currentIndex();
+
+        //QVariant axesElement = m_axesModel->data(indexForAxes, Qt::DisplayRole);
+        QVariant modulElement = m_modulNameModel->data(indexForModul, Qt::DisplayRole);
         
-}*/
+        if(modulElement.toString().isEmpty())
+                return;
+                
+        //if(!axesElement.toString().isEmpty())
+        //      m_axesModel->removeRows(m_axesListView->currentIndex().row(), 1);// Le 2Úme parametre indique le nombre de ligne à supprimer
+        //else
+        //      if(!modulElement.toString().isEmpty()) 
+                        m_modulNameModel->removeRows(m_modulNameListView->currentIndex().row(), 1);// Le 2Úme parametre indique le nombre de ligne à supprimer
 
-/********************************* Implementation of the addInstructionRow()  method *************************************************/
-/*void ModinspaceWindow::addInstructionRow() {
 
-        QString nom  = m_fonctionNameLineEdit->text();
-        QString val  = m_fonctionParameterLineEdit->text();
-        
-        if (nom.isEmpty()){ 
-  
-                            QMessageBox::critical(this, "Avertissement", "Le champ \"<I>Nom de la fonction<I>\" est obligatoire! Veuillez sélectionner une fonction parmi celles qui sont proposées dans la partie gauche de la fenêtre.");
-                            return; // Arrêt de la méthode
-                    }
-  
-          else {
-                  //if (!(m_ligneNom->text().isEmpty()) || (m_ligneValeur->text().isEmpty())) {
-                    //      m_delButton->setEnabled(true);
-                    //      Constant localConstant (Nom.toStdString(), Val.toStdString());
-                    //              m_localConstantTable->push_back(localConstant);
-                        m_instructionRightModel->setItem(m_instructionRightModel->rowCount(), 0, new QStandardItem(nom));
-                        m_instructionRightModel->setItem(m_instructionRightModel->rowCount()-1, 1, new QStandardItem(val));
-                                
-                        m_fonctionNameLineEdit->setText("");
-                        m_fonctionParameterLineEdit->setText("");
-                  }
-
-}*/
-
+}
 /***********************************************************************************************************************/
 /***************************************************** End of file *****************************************************/

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

@@ -28 +28 @@
                 //void addInstructionRow();     
                 //void selectedFunction(QModelIndex index);
+                void addTheAxesRow(); 
+                void addTheModulRow(); 
+                void deleteAxesRow(); 
+                void deleteModulRow(); 
                 
         signals:
@@ -43 +47 @@
                 QStandardItemModel *m_modulNameModel;
                 QStandardItemModel *m_outlineModel;
+                
+                QModelIndex indexForAxes; 
+                QModelIndex indexForModul; 
                 /*QStandardItemModel *m_instructionLeftModel;
                 QStandardItemModel *m_instructionRightModel;

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

@@ -8 +8 @@
     <y>0</y>
     <width>689</width>
-    <height>417</height>
+    <height>440</height>
    </rect>
   </property>
@@ -20 +20 @@
      <y>50</y>
      <width>391</width>
-     <height>361</height>
+     <height>381</height>
     </rect>
    </property>
@@ -105 +105 @@
      <rect>
       <x>20</x>
-      <y>330</y>
+      <y>350</y>
       <width>111</width>
       <height>22</height>
@@ -145 +145 @@
     </layout>
    </widget>
-   <widget class="QWidget" name="">
+   <widget class="QWidget" name="layoutWidget">
     <property name="geometry">
      <rect>
       <x>300</x>
       <y>160</y>
-      <width>81</width>
+      <width>87</width>
       <height>62</height>
      </rect>
@@ -170 +170 @@
      </item>
     </layout>
+   </widget>
+   <widget class="QCheckBox" name="m_blocEndCheckBox">
+    <property name="geometry">
+     <rect>
+      <x>20</x>
+      <y>320</y>
+      <width>111</width>
+      <height>22</height>
+     </rect>
+    </property>
+    <property name="text">
+     <string>Fin de bloc</string>
+    </property>
    </widget>
   </widget>
@@ -178 +191 @@
      <y>10</y>
      <width>271</width>
-     <height>401</height>
+     <height>421</height>
     </rect>
    </property>
@@ -193 +206 @@
       <y>40</y>
       <width>251</width>
-      <height>351</height>
+      <height>371</height>
      </rect>
     </property>

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

@@ -8 +8 @@
     <y>0</y>
     <width>709</width>
-    <height>523</height>
+    <height>543</height>
    </rect>
   </property>
@@ -20 +20 @@
      <y>60</y>
      <width>691</width>
-     <height>421</height>
+     <height>441</height>
     </rect>
    </property>
@@ -56 +56 @@
     <rect>
      <x>620</x>
-     <y>490</y>
+     <y>510</y>
      <width>81</width>
      <height>27</height>
@@ -69 +69 @@
     <rect>
      <x>10</x>
-     <y>490</y>
+     <y>510</y>
      <width>51</width>
      <height>21</height>