Changeset 361

Timestamp:

06/24/10 19:55:00 (14 years ago)

Author:

yerima

Message:

Some update in modul window.

Location:

trunk/yao/src/interface/src

Files:

• ModulWindow.cpp (modified) (1 diff)
• OperaWindow.cpp (modified) (3 diffs)
• ui_/modulwindow.ui (modified) (4 diffs)
• ui_/operawindow.ui (modified) (1 diff)

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

@@ -28 +28 @@
 
         QRegExp regExp("[A-Za-z_][A-Za-z1-9_]{0,}"); 
-        m_lineModulName->setValidator(new QRegExpValidator(regExp, this));
+        m_modulNameLine->setValidator(new QRegExpValidator(regExp, this));
         m_comboModulOpera->setDisabled(true);
         m_comboModulTarget->insertItem(0, " ");

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

@@ -52 +52 @@
                 m_operaTrajname->insertItem(1, QString(it->getName().c_str()));
         
-        modeleOpera                             = new QStandardItemModel(0, 3) ;
-                modeleOpera->setHorizontalHeaderLabels(QStringList() << "Nom Opera" << "Dimension(s) " << "Nom trajectoire"); //Gives names to the columns.
+        modeleOpera                             = new QStandardItemModel(0, 4) ;
+                modeleOpera->setHorizontalHeaderLabels(QStringList() << "Nom Opera" << "Type" << "Dimension(s) " << "Trajectoire"); //Gives names to the columns.
 
                 m_operaTableView->setModel(modeleOpera); /*!< The view takes model.*/
@@ -67 +67 @@
                 
             modeleOpera->setItem(row, 0, new QStandardItem(QString(it->getProperty(0).c_str()))); /*!< Gets the Opera name.*/
-            modeleOpera->setItem(row, 1, new QStandardItem(QString(it->getProperty(1).c_str()))); /*!< Gets the Opera dimension (1, 2 or 3).*/
-            modeleOpera->setItem(row, 2, new QStandardItem(QString(it->getProperty(2).c_str()))); /*!< Gets the trajectory choosed in the Opera directive.*/
+            modeleOpera->setItem(row, 2, new QStandardItem(QString(it->getProperty(1).c_str()))); /*!< Gets the Opera dimension (1, 2 or 3).*/
+            modeleOpera->setItem(row, 3, new QStandardItem(QString(it->getProperty(2).c_str()))); /*!< Gets the trajectory choosed in the Opera directive.*/
           }
 
@@ -179 +179 @@
 
                 modeleOpera->setItem(row, 0, new QStandardItem(m_operaNameLine->text()));
-                modeleOpera->setItem(row, 1, new QStandardItem(QString(dim.c_str())));
-                modeleOpera->setItem(row, 2, new QStandardItem(m_operaTrajname->currentText()));
+                modeleOpera->setItem(row, 2, new QStandardItem(QString(dim.c_str())));
+                modeleOpera->setItem(row, 3, new QStandardItem(m_operaTrajname->currentText()));
                 
                 if (!(d1.empty() || d2.empty() || d3.empty())) {

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

@@ -45 +45 @@
        </property>
        <property name="buddy">
-        <cstring>m_lineModulName</cstring>
+        <cstring>m_modulNameLine</cstring>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="m_lineModulName"/>
+      <widget class="QLineEdit" name="m_modulNameLine"/>
      </item>
     </layout>
@@ -470 +470 @@
       <x>10</x>
       <y>70</y>
-      <width>307</width>
+      <width>301</width>
       <height>29</height>
      </rect>
@@ -531 +531 @@
       <x>660</x>
       <y>40</y>
-      <width>81</width>
+      <width>87</width>
       <height>95</height>
      </rect>
@@ -578 +578 @@
  </widget>
  <tabstops>
-  <tabstop>m_lineModulName</tabstop>
+  <tabstop>m_modulNameLine</tabstop>
   <tabstop>m_operaRadioButton</tabstop>
   <tabstop>m_lineModulInput</tabstop>

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

@@ -110 +110 @@
         <layout class="QHBoxLayout" name="horizontalLayout_5">
          <item>
-          <widget class="QLineEdit" name="lineEdit"/>
+          <widget class="QLineEdit" name="lineEdit">
+           <property name="text">
+            <string>M</string>
+           </property>
+          </widget>
          </item>
          <item>