- Timestamp:
- 10/26/10 19:01:57 (14 years ago)
- Location:
- trunk/yao/src/interface/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/ConstantWindow.cpp
r460 r469 240 240 void ConstantWindow::callConstantHelp() { 241 241 242 QMessageBox::about(this, tr("Aide sur la directive Constant."),242 QMessageBox::about(this, tr("Aide sur la directive Defval"), 243 243 ("<p> La directive Defval appelée aussi Constant permet d'associer un nom symbolique à une valeur. Voici les différents emplois:" 244 "<p><u>Exemple 1</u>: defval szx 12 <p><u>Exemple 2</u>: defval szy \"chaine\"<p> <u>Exemple 3</u>: defval szz szx" 244 "<p><u>Exemple 1</u>: defval szx 12 (nombre entier douze) <p><u>Exemple 2</u>: defval szy \"chaine\" (chaine de caractÚres)<p> <u>Exemple 3</u>: defval szz szx (nom d'une autre constante defval)." 245 "<p>Dans la fenêtre graphique, vous devez renseigner les champs nom et valeur de la constante. Visual Yao vérifie la syntaxe " 246 "et vous guide au fur et à mesure." 247 "<br>Le bouton \"Ajouter\" permet d'insérer des nouveaux enregistrements (ici le nom et la valeur d'une constante) dans la structure de données); " 248 "<br>Le bouton \"Supprimer\" permet de retirer un enregistrement sélectionné de la structure de données;" 249 "<br> Le bouton \"Quitter\" permet de fermer la fenêtre;" 250 "<br> Le bouton \"Aide\" permet d'afficher cette fenêtre." 245 251 "<p> Pour plus d'informations sur defval, <a href=\"help/constante_aide.html\">cliquez ici.</a>")); 246 252 -
trunk/yao/src/interface/src/ModinspaceWindow.cpp
r468 r469 66 66 m_modulNameModel = new QStandardItemModel(0, 0) ; 67 67 m_outlineModel = new QStandardItemModel(0, 4) ; 68 m_outlineModel->setHorizontalHeaderLabels(QStringList() << " " << "" << "" << "");68 m_outlineModel->setHorizontalHeaderLabels(QStringList() << " " << " " << " " << " "); 69 69 70 70 m_axesListView->setModel(m_axesModel); 71 71 m_modulNameListView->setModel(m_modulNameModel); 72 72 m_outlineTreeView1->setModel(m_outlineModel); 73 73 //m_outlineTreeView1->resizeColumnsToContents(); 74 //m_outlineTreeView1->setShowGrid(false); 74 75 //connect(m_axesListView, SIGNAL(clicked(QModelIndex)), this, SLOT(deleteAxesRow(QModelIndex))); 75 76 //connect(m_modulNameListView, SIGNAL(clicked(QModelIndex)), this, SLOT(deleteModulRow(QModelIndex))); … … 81 82 connect(m_rightModulNameButton, SIGNAL(clicked()), this, SLOT(addTheModulRow())); 82 83 //connect(m_modinspaceDeleteButton, SIGNAL(clicked()), this, SLOT(deleteTheRow())); 83 connect(m_blocEndCheckBox, SIGNAL(clicked(bool )), this, SLOT(addBlockEndRow(bool ))); 84 connect(m_endCheckBox, SIGNAL(clicked(bool )), this, SLOT(addEndRow(bool ))); 84 connect(m_beginOrEndComboBox, SIGNAL(currentIndexChanged (int )), this, SLOT(addBlockEndRow(int ))); 85 //connect(m_blocEndCheckBox, SIGNAL(clicked(bool )), this, SLOT(addBlockEndRow(bool ))); 86 //connect(m_endCheckBox, SIGNAL(clicked(bool )), this, SLOT(addEndRow(bool ))); 85 87 86 88 } 87 89 /******************************** implementation of method ***********************************/ 88 void ModinspaceWindow::addBlockEndRow(bool aBool) { 89 90 void ModinspaceWindow::addBlockEndRow(int anInt) { 91 92 int col = m_outlineModel->columnCount(); 90 93 int row0 = m_outlineModel->rowCount(); 91 if (aBool && row0 >= 2) 92 m_outlineModel->setItem(row0, 1, new QStandardItem("forder")); 94 static int ordercounter = 1; 95 static int fordercounter = 0; 96 97 switch(anInt) { 98 case 0: break; 99 case 1:{ 100 m_outlineModel->setItem(row0, ordercounter + 1, new QStandardItem("order")); 101 ordercounter++; 102 } break; 103 case 2: { 93 104 105 m_outlineModel->setItem(row0, ordercounter, new QStandardItem("forder")); 106 fordercounter++; 107 }break; 108 case 3: { 109 m_outlineModel->setItem(row0, 0, new QStandardItem("forder")); 110 m_spaceOrOperaNameComboBox->setDisabled(true); 111 m_axesComboBox->setDisabled(true); 112 } break; 113 } 114 115 //if (row0 >= 2){ 116 117 // m_outlineModel->setItem(1, col, new QStandardItem("forder")); 118 //} 94 119 } 95 120 /******************************** implementation of method ***********************************/ 96 void ModinspaceWindow::addEndRow(bool aBool) {121 /*void ModinspaceWindow::addEndRow(bool aBool) { 97 122 98 123 int row0 = m_outlineModel->rowCount(); … … 100 125 m_outlineModel->setItem(row0, 0, new QStandardItem("forder")); 101 126 102 } 127 }*/ 103 128 /********************************* Implementation of the selectedFunction(QModelIndex index) method ***********************************/ 104 129 /******************************** implementation of method ***********************************/ … … 113 138 void ModinspaceWindow::addTheAxesRow() { 114 139 140 static int cpt = 0; 141 115 142 QString theAxe = m_axesComboBox->currentText(); // 116 143 int row0 = m_outlineModel->rowCount(); … … 130 157 m_axesComboBox->setCurrentIndex(0); 131 158 132 m_outlineModel->setItem(row0, 0, new QStandardItem("order")); 133 //m_theLocalModulTable->push_back(); 134 m_outlineModel->setItem(row0, 1, new QStandardItem("modinpace")); 135 m_outlineModel->setItem(row0, 2, new QStandardItem(spaceOrOpera)); 136 m_outlineModel->setItem(row1, 1, new QStandardItem("order")); 137 m_outlineModel->setItem(row1, 2, new QStandardItem(theAxe)); 159 if (!cpt) { 160 161 m_outlineModel->setItem(row0, 0, new QStandardItem("order")); 162 m_outlineModel->setItem(row0, 1, new QStandardItem("modinpace")); 163 m_outlineModel->setItem(row0, 2, new QStandardItem(spaceOrOpera)); 164 m_outlineModel->setItem(row1, 1, new QStandardItem("order")); 165 cpt++; 166 167 } //m_theLocalModulTable->push_back(); 168 169 static int col = m_outlineModel->columnCount(); 170 m_outlineModel->setItem(1, col-2, new QStandardItem(theAxe)); 171 col++; 138 172 //m_theLocalAxesTable->push_back(theAxe.toStdString()); 139 173 //m_outlineModel->setItem(row1, 1, new QStandardItem("order")); … … 154 188 QString theModul = m_modulNameComboBox->currentText(); 155 189 190 int row0 = m_outlineModel->rowCount(); 191 156 192 if (theModul.isEmpty()) return; 157 193 158 194 m_modulNameModel->setItem(m_modulNameModel->rowCount(), 0, new QStandardItem(theModul)); 195 m_outlineModel->setItem(row0, 2, new QStandardItem(theModul)); 196 197 m_spaceOrOperaNameComboBox->setDisabled(true); 198 m_axesComboBox->setDisabled(true); 199 159 200 m_modulNameComboBox->setCurrentIndex(0); 160 201 -
trunk/yao/src/interface/src/OrderWindow.cpp
r460 r469 20 20 21 21 /***************************************** Implementation of the Construtor OrderWindow() *************************************************/ 22 OrderWindow::OrderWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Modul> *aModulTable, QWidget *parent) : stateOfSpaceintrajEndCheckBox(false), QWidget(parent) {22 OrderWindow::OrderWindow(Table <Trajectory> *aTrajectoryTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, Table <Modul> *aModulTable, QWidget *parent) : stateOfSpaceintrajEndCheckBox(false), QWidget(parent) { 23 23 24 24 setupUi(this); … … 88 88 void OrderWindow::theOrderHelp() { 89 89 90 QMessageBox::about(this, tr("Aide sur la directive Order"), (" "));90 QMessageBox::about(this, tr("Aide sur la directive Order"), ("Order permet d'indiquer l'enchainement, l'ordre de calcul dans YAO. Il existent deux cas d'utilisation: modinspace et spaceintraj. Les étapes à suivre sont les suivantes: <br> Faire un choix dans le champ deroulant \"modinspace/spaceintraj\"; <br> Pour le cas de modinspace, indiquer d'abord les coordonnées (possibilité de répeter les operations), ensuite les modules (possibilité de faire plusieurs opérations) et enfin préciser la condition d'arrêt.<br> Pour le cas de spaceintraj, choisir respectivement la trajectoire, les espaces et cocher la case \"Fin de saisie\".")); 91 91 92 92 } -
trunk/yao/src/interface/src/include/ModinspaceWindow.hpp
r468 r469 32 32 void deleteAxesRow(); 33 33 void deleteModulRow(); 34 void addBlockEndRow( bool aBool);35 void addEndRow(bool aBool);34 void addBlockEndRow(int anInt); 35 // void addEndRow(bool aBool); 36 36 37 37 signals: -
trunk/yao/src/interface/src/ui_/modinspace.ui
r464 r469 7 7 <x>0</x> 8 8 <y>0</y> 9 <width> 689</width>9 <width>790</width> 10 10 <height>440</height> 11 11 </rect> … … 82 82 <rect> 83 83 <x>20</x> 84 <y>2 50</y>84 <y>230</y> 85 85 <width>91</width> 86 86 <height>27</height> … … 92 92 <rect> 93 93 <x>120</x> 94 <y>2 50</y>94 <y>230</y> 95 95 <width>26</width> 96 96 <height>25</height> … … 99 99 <property name="text"> 100 100 <string>...</string> 101 </property>102 </widget>103 <widget class="QCheckBox" name="m_endCheckBox">104 <property name="geometry">105 <rect>106 <x>20</x>107 <y>350</y>108 <width>111</width>109 <height>22</height>110 </rect>111 </property>112 <property name="text">113 <string>Fin de saisie</string>114 101 </property> 115 102 </widget> … … 120 107 <y>30</y> 121 108 <width>131</width> 122 <height>3 21</height>109 <height>301</height> 123 110 </rect> 124 111 </property> … … 171 158 </layout> 172 159 </widget> 173 <widget class="QCheckBox" name="m_blocEndCheckBox"> 174 <property name="geometry"> 175 <rect> 176 <x>20</x> 177 <y>320</y> 178 <width>111</width> 179 <height>22</height> 180 </rect> 181 </property> 182 <property name="text"> 183 <string>Fin de bloc</string> 160 <widget class="QComboBox" name="m_beginOrEndComboBox"> 161 <property name="geometry"> 162 <rect> 163 <x>160</x> 164 <y>340</y> 165 <width>131</width> 166 <height>27</height> 167 </rect> 168 </property> 169 <item> 170 <property name="text"> 171 <string/> 172 </property> 173 </item> 174 <item> 175 <property name="text"> 176 <string>Début d'un bloc</string> 177 </property> 178 </item> 179 <item> 180 <property name="text"> 181 <string>Fin d'un bloc</string> 182 </property> 183 </item> 184 <item> 185 <property name="text"> 186 <string>Fin de sélection</string> 187 </property> 188 </item> 189 </widget> 190 <widget class="QLabel" name="label"> 191 <property name="geometry"> 192 <rect> 193 <x>20</x> 194 <y>341</y> 195 <width>131</width> 196 <height>21</height> 197 </rect> 198 </property> 199 <property name="text"> 200 <string>Conditions d'arrêt</string> 184 201 </property> 185 202 </widget> … … 190 207 <x>410</x> 191 208 <y>10</y> 192 <width> 271</width>209 <width>371</width> 193 210 <height>421</height> 194 211 </rect> … … 205 222 <x>10</x> 206 223 <y>40</y> 207 <width> 251</width>224 <width>351</width> 208 225 <height>371</height> 209 226 </rect> … … 213 230 <property name="geometry"> 214 231 <rect> 215 <x>1 10</x>232 <x>170</x> 216 233 <y>10</y> 217 234 <width>59</width> -
trunk/yao/src/interface/src/ui_/orderwindow.ui
r464 r469 7 7 <x>0</x> 8 8 <y>0</y> 9 <width>7 09</width>9 <width>799</width> 10 10 <height>543</height> 11 11 </rect> … … 19 19 <x>10</x> 20 20 <y>60</y> 21 <width> 691</width>21 <width>781</width> 22 22 <height>441</height> 23 23 </rect> … … 33 33 <property name="geometry"> 34 34 <rect> 35 <x>2 00</x>35 <x>220</x> 36 36 <y>20</y> 37 37 <width>291</width> … … 55 55 <property name="geometry"> 56 56 <rect> 57 <x> 620</x>57 <x>710</x> 58 58 <y>510</y> 59 59 <width>81</width> -
trunk/yao/src/interface/src/ui_/spaceintraj.ui
r460 r469 7 7 <x>0</x> 8 8 <y>0</y> 9 <width> 687</width>10 <height>4 17</height>9 <width>789</width> 10 <height>442</height> 11 11 </rect> 12 12 </property> … … 20 20 <y>80</y> 21 21 <width>371</width> 22 <height>3 31</height>22 <height>351</height> 23 23 </rect> 24 24 </property> … … 66 66 <rect> 67 67 <x>10</x> 68 <y>3 00</y>68 <y>320</y> 69 69 <width>111</width> 70 70 <height>22</height> … … 75 75 </property> 76 76 </widget> 77 <widget class="QWidget" name=" ">77 <widget class="QWidget" name="layoutWidget"> 78 78 <property name="geometry"> 79 79 <rect> 80 80 <x>280</x> 81 81 <y>120</y> 82 <width>8 1</width>83 <height>6 1</height>82 <width>87</width> 83 <height>62</height> 84 84 </rect> 85 85 </property> … … 107 107 <x>390</x> 108 108 <y>10</y> 109 <width> 291</width>110 <height>4 01</height>109 <width>391</width> 110 <height>421</height> 111 111 </rect> 112 112 </property> … … 122 122 <x>10</x> 123 123 <y>40</y> 124 <width> 271</width>125 <height>3 51</height>124 <width>371</width> 125 <height>371</height> 126 126 </rect> 127 127 </property> … … 130 130 <property name="geometry"> 131 131 <rect> 132 <x>1 30</x>132 <x>180</x> 133 133 <y>10</y> 134 134 <width>59</width>
Note: See TracChangeset
for help on using the changeset viewer.