- Timestamp:
- 06/20/10 23:51:43 (14 years ago)
- Location:
- trunk/yao/src/interface/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/MainWindow.cpp
r351 r354 495 495 m_contextButton->setEnabled(true); 496 496 m_trajButton->setEnabled(true); 497 m_spaceButton->setEnabled( true);498 m_operaButton->setEnabled( true);497 m_spaceButton->setEnabled(false); 498 m_operaButton->setEnabled(false); 499 499 m_netwardButton->setEnabled(true); 500 500 m_modulButton->setEnabled(true); -
trunk/yao/src/interface/src/ModulWindow.cpp
r350 r354 25 25 setupUi(this); 26 26 localConstantTable = aConstantTable; 27 28 29 27 30 28 QRegExp regExp("[A-Za-z_][A-Za-z1-9_]{0,}"); 31 // m_lineModulName->setValidator(new QRegExpValidator(regExp, this)); 32 33 // m_comboModulTarget->insertItem(0, " "); 34 // m_comboModulTarget->insertItem(1, "uptime"); 35 // m_comboModulTarget->insertItem(2, "steptime"); 36 // m_comboModulTarget->insertItem(3, "alltime"); 29 m_lineModulName->setValidator(new QRegExpValidator(regExp, this)); 30 m_comboModulOpera->setDisabled(true); 31 /*if (m_checkBoxModulNoward->isChecked()) { 32 33 m_checkBoxModulSpec->setDisabled(true); 34 m_checkBoxModulNetward->setDisabled(true); 35 m_labelModulAutonet->setDisabled(true); 36 m_comboModulAutonet->setDisabled(true); 37 38 39 }*/ 40 m_comboModulTarget->insertItem(0, " "); 41 m_comboModulTarget->insertItem(1, "uptime"); 42 m_comboModulTarget->insertItem(2, "steptime"); 43 m_comboModulTarget->insertItem(3, "alltime"); 37 44 38 45 // for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++) { … … 51 58 connect(m_buttonModulHelp, SIGNAL(clicked()), this, SLOT(callModulHelp())); 52 59 60 connect(m_checkBoxModulNoward, SIGNAL(toggled(bool )), m_checkBoxModulSpec, SLOT(setDisabled(bool ))); 61 connect(m_checkBoxModulNoward, SIGNAL(toggled(bool )), m_checkBoxModulNetward, SLOT(setDisabled(bool ))); 62 connect(m_checkBoxModulNoward, SIGNAL(toggled(bool )), m_labelModulAutonet, SLOT(setDisabled(bool ))); 63 connect(m_checkBoxModulNoward, SIGNAL(toggled(bool )), m_comboModulAutonet, SLOT(setDisabled(bool ))); 64 65 connect(m_spaceRadioButton, SIGNAL(toggled(bool )), m_comboModulOpera, SLOT(setDisabled(bool ))); 66 connect(m_operaRadioButton, SIGNAL(toggled(bool )), m_comboModulSpace, SLOT(setDisabled(bool ))); 67 68 53 69 54 70 connect(m_buttonLoperaAdd, SIGNAL(clicked()), this, SLOT(addO_EXTOBJRow())); … … 56 72 connect(m_buttonLoperaDel, SIGNAL(clicked()), this, SLOT(deleteO_EXTOBJRow())); 57 73 58 setFixedWidth(baseSize().width() + 7 06);74 setFixedWidth(baseSize().width() + 766); 59 75 60 76 -
trunk/yao/src/interface/src/ui_/modulwindow.ui
r346 r354 7 7 <x>0</x> 8 8 <y>0</y> 9 <width>7 03</width>9 <width>766</width> 10 10 <height>520</height> 11 11 </rect> … … 19 19 <x>10</x> 20 20 <y>10</y> 21 <width> 691</width>21 <width>751</width> 22 22 <height>301</height> 23 23 </rect> … … 45 45 </property> 46 46 <property name="buddy"> 47 <cstring> lineModulName</cstring>47 <cstring>m_lineModulName</cstring> 48 48 </property> 49 49 </widget> 50 50 </item> 51 51 <item> 52 <widget class="QLineEdit" name=" lineModulName"/>52 <widget class="QLineEdit" name="m_lineModulName"/> 53 53 </item> 54 54 </layout> 55 55 </widget> 56 <widget class="QWidget" name="">57 <property name="geometry">58 <rect>59 <x>20</x>60 <y>70</y>61 <width>159</width>62 <height>24</height>63 </rect>64 </property>65 <layout class="QHBoxLayout" name="horizontalLayout_13">66 <item>67 <widget class="QRadioButton" name="m_spaceRadioButton">68 <property name="text">69 <string>Space</string>70 </property>71 <property name="checked">72 <bool>true</bool>73 </property>74 </widget>75 </item>76 <item>77 <widget class="QRadioButton" name="m_operaRadioButton">78 <property name="text">79 <string>Opera</string>80 </property>81 </widget>82 </item>83 </layout>84 </widget>85 56 <widget class="QWidget" name="layoutWidget"> 86 57 <property name="geometry"> 87 58 <rect> 88 <x> 20</x>59 <x>10</x> 89 60 <y>110</y> 90 <width>1 51</width>91 <height>1 01</height>61 <width>161</width> 62 <height>111</height> 92 63 </rect> 93 64 </property> … … 106 77 </item> 107 78 <item> 79 <spacer name="horizontalSpacerInput"> 80 <property name="orientation"> 81 <enum>Qt::Horizontal</enum> 82 </property> 83 <property name="sizeHint" stdset="0"> 84 <size> 85 <width>80</width> 86 <height>20</height> 87 </size> 88 </property> 89 </spacer> 90 </item> 91 <item> 108 92 <widget class="QLineEdit" name="lineModulInput"/> 109 93 </item> … … 123 107 </item> 124 108 <item> 109 <spacer name="horizontalSpacerOutput"> 110 <property name="orientation"> 111 <enum>Qt::Horizontal</enum> 112 </property> 113 <property name="sizeHint" stdset="0"> 114 <size> 115 <width>80</width> 116 <height>20</height> 117 </size> 118 </property> 119 </spacer> 120 </item> 121 <item> 125 122 <widget class="QLineEdit" name="lineModulOutput"/> 126 123 </item> … … 135 132 </property> 136 133 <property name="buddy"> 137 <cstring> comboModulTarget</cstring>134 <cstring>m_comboModulTarget</cstring> 138 135 </property> 139 136 </widget> 140 137 </item> 141 138 <item> 142 <widget class="QComboBox" name=" comboModulTarget"/>139 <widget class="QComboBox" name="m_comboModulTarget"/> 143 140 </item> 144 141 </layout> … … 162 159 <property name="geometry"> 163 160 <rect> 164 <x> 260</x>161 <x>320</x> 165 162 <y>10</y> 166 163 <width>131</width> … … 179 176 <x>10</x> 180 177 <y>10</y> 181 <width>11 3</width>178 <width>111</width> 182 179 <height>261</height> 183 180 </rect> … … 185 182 <layout class="QVBoxLayout" name="verticalLayout_3"> 186 183 <item> 187 <widget class="QCheckBox" name=" checkBoxModulNoward">184 <widget class="QCheckBox" name="m_checkBoxModulNoward"> 188 185 <property name="text"> 189 186 <string>noward</string> … … 206 203 </item> 207 204 <item> 208 <widget class="QCheckBox" name=" checkBoxSpec">205 <widget class="QCheckBox" name="m_checkBoxModulSpec"> 209 206 <property name="text"> 210 207 <string>spec</string> … … 213 210 </item> 214 211 <item> 215 <widget class="QCheckBox" name=" checkBoxNetward">212 <widget class="QCheckBox" name="m_checkBoxModulNetward"> 216 213 <property name="text"> 217 214 <string>netward</string> … … 239 236 <property name="geometry"> 240 237 <rect> 241 <x>4 00</x>238 <x>460</x> 242 239 <y>10</y> 243 240 <width>281</width> … … 301 298 <layout class="QHBoxLayout" name="horizontalLayout_6"> 302 299 <item> 303 <widget class="QLabel" name=" label_5">300 <widget class="QLabel" name="m_labelModulAutonet"> 304 301 <property name="text"> 305 302 <string>autonet</string> 306 303 </property> 307 304 <property name="buddy"> 308 <cstring> comboModulAutonet</cstring>305 <cstring>m_comboModulAutonet</cstring> 309 306 </property> 310 307 </widget> 311 308 </item> 312 309 <item> 313 <widget class="QComboBox" name=" comboModulAutonet"/>310 <widget class="QComboBox" name="m_comboModulAutonet"/> 314 311 </item> 315 312 </layout> … … 328 325 </item> 329 326 <item> 330 <spacer name="horizontalSpacer ">327 <spacer name="horizontalSpacerCovt"> 331 328 <property name="orientation"> 332 329 <enum>Qt::Horizontal</enum> … … 334 331 <property name="sizeHint" stdset="0"> 335 332 <size> 336 <width> 40</width>333 <width>50</width> 337 334 <height>20</height> 338 335 </size> … … 391 388 <property name="geometry"> 392 389 <rect> 393 <x>4 00</x>390 <x>460</x> 394 391 <y>140</y> 395 392 <width>281</width> … … 467 464 </property> 468 465 </widget> 469 <zorder>layoutWidget</zorder> 470 <zorder>m_loperaListView</zorder> 471 <zorder>m_buttonLoperaAdd</zorder> 472 <zorder>m_buttonLoperaDel</zorder> 473 <zorder>frame_5</zorder> 466 </widget> 467 <widget class="QWidget" name=""> 468 <property name="geometry"> 469 <rect> 470 <x>10</x> 471 <y>70</y> 472 <width>301</width> 473 <height>29</height> 474 </rect> 475 </property> 476 <layout class="QHBoxLayout" name="horizontalLayout_13"> 477 <item> 478 <widget class="QRadioButton" name="m_spaceRadioButton"> 479 <property name="text"> 480 <string>Space</string> 481 </property> 482 <property name="checked"> 483 <bool>true</bool> 484 </property> 485 </widget> 486 </item> 487 <item> 488 <widget class="QComboBox" name="m_comboModulSpace"/> 489 </item> 490 <item> 491 <widget class="QRadioButton" name="m_operaRadioButton"> 492 <property name="text"> 493 <string>Opera</string> 494 </property> 495 </widget> 496 </item> 497 <item> 498 <widget class="QComboBox" name="m_comboModulOpera"/> 499 </item> 500 </layout> 474 501 </widget> 475 502 </widget> … … 479 506 <x>10</x> 480 507 <y>320</y> 481 <width> 691</width>508 <width>751</width> 482 509 <height>191</height> 483 510 </rect> … … 494 521 <x>10</x> 495 522 <y>10</y> 496 <width> 571</width>523 <width>641</width> 497 524 <height>171</height> 498 525 </rect> … … 502 529 <property name="geometry"> 503 530 <rect> 504 <x> 590</x>531 <x>660</x> 505 532 <y>40</y> 506 <width>8 7</width>533 <width>81</width> 507 534 <height>95</height> 508 535 </rect> … … 538 565 <property name="geometry"> 539 566 <rect> 540 <x> 590</x>567 <x>660</x> 541 568 <y>150</y> 542 569 <width>41</width> … … 551 578 </widget> 552 579 <tabstops> 553 <tabstop>lineModulName</tabstop> 554 <tabstop>m_spaceRadioButton</tabstop> 580 <tabstop>m_lineModulName</tabstop> 555 581 <tabstop>m_operaRadioButton</tabstop> 556 582 <tabstop>lineModulInput</tabstop> 557 583 <tabstop>checkBoxModulArray</tabstop> 558 584 <tabstop>lineModulOutput</tabstop> 559 <tabstop> comboModulTarget</tabstop>560 <tabstop> checkBoxModulNoward</tabstop>585 <tabstop>m_comboModulTarget</tabstop> 586 <tabstop>m_checkBoxModulNoward</tabstop> 561 587 <tabstop>checkBoxTempo</tabstop> 562 588 <tabstop>checkBoxCout</tabstop> 563 <tabstop> checkBoxSpec</tabstop>564 <tabstop> checkBoxNetward</tabstop>589 <tabstop>m_checkBoxModulSpec</tabstop> 590 <tabstop>m_checkBoxModulNetward</tabstop> 565 591 <tabstop>checkBoxModulHidjac</tabstop> 566 592 <tabstop>checkBoxModulManage</tabstop> … … 568 594 <tabstop>comboModulInter2</tabstop> 569 595 <tabstop>comboModulInter3</tabstop> 570 <tabstop> comboModulAutonet</tabstop>596 <tabstop>m_comboModulAutonet</tabstop> 571 597 <tabstop>comboModulClonol</tabstop> 572 598 <tabstop>comboModulCovt</tabstop>
Note: See TracChangeset
for help on using the changeset viewer.