- Timestamp:
- 10/25/10 08:18:39 (14 years ago)
- Location:
- trunk/yao/src/interface
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/ModinspaceWindow.cpp
r464 r465 22 22 23 23 /*********************************************************************************************************************************/ 24 ModinspaceWindow::ModinspaceWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, QWidget *parent) : QWidget(parent) {24 ModinspaceWindow::ModinspaceWindow(Table <Modul> *aModulTable, Table <Space> *aSpaceTable, Table <Operator> *anOperatorTable, QWidget *parent) : QWidget(parent), m_theLocalAxesTable(NULL), m_theLocalModulTable(NULL) { 25 25 26 26 setupUi(this); … … 94 94 void ModinspaceWindow::addTheAxesRow() { 95 95 96 QString theAxe = m_axesComboBox->currentText(); // 97 int row0 = m_outlineModel->rowCount(); 98 int row1 = m_outlineModel->rowCount() + 1; 99 100 if (theAxe.isEmpty()) return; //If the axes combobox is not empty, the space combobox will be verified. 101 96 102 if (m_spaceOrOperaNameComboBox->currentText().isEmpty()) { 97 103 … … 99 105 return; 100 106 } 101 102 QString theAxe = m_axesComboBox->currentText();103 104 if (theAxe.isEmpty()) return;105 107 108 QString spaceOrOpera = m_spaceOrOperaNameComboBox->currentText(); 109 106 110 m_axesModel->setItem(m_axesModel->rowCount(), 0, new QStandardItem(theAxe)); 107 111 m_axesComboBox->setCurrentIndex(0); 112 113 m_outlineModel->setItem(row0, 0, new QStandardItem("order")); 114 //m_theLocalModulTable->push_back(); 115 m_outlineModel->setItem(row0, 1, new QStandardItem("modinpace")); 116 m_outlineModel->setItem(row0, 2, new QStandardItem(spaceOrOpera)); 117 m_outlineModel->setItem(row1, 1, new QStandardItem("order")); 118 m_outlineModel->setItem(row1, 2, new QStandardItem(theAxe)); 119 //m_theLocalAxesTable->push_back(theAxe.toStdString()); 120 //m_outlineModel->setItem(row1, 1, new QStandardItem("order")); 121 122 //for (vector <string>::iterator it = m_theLocalAxesTable->begin(); it != m_theLocalAxesTable->end(); it++) 123 //m_outlineModel->setItem(row1, m_outlineModel->columnCount(), new QStandardItem(QString(it->c_str()))); 124 //m_outlineModel->setItem(row1, m_outlineModel->columnCount(), new QStandardItem(QString(theAxe))); 125 //m_outlineModel->setItem(row1, 2, new QStandardItem("order")); 126 127 128 //if (m_blocEndCheckBox->isChecked()) 129 // ; 108 130 } 109 131 … … 112 134 113 135 QString theModul = m_modulNameComboBox->currentText(); 136 137 if (theModul.isEmpty()) return; 114 138 115 if (theModul.isEmpty()) return;116 117 139 m_modulNameModel->setItem(m_modulNameModel->rowCount(), 0, new QStandardItem(theModul)); 118 140 m_modulNameComboBox->setCurrentIndex(0); 119 141 120 142 } 143 121 144 /******************************* Implementation of the deleteModulRow(const QModelIndex &index) method ****************************************/ 122 145 void ModinspaceWindow::deleteAxesRow() { 123 146 124 125 147 //QStandardItem *item = m_axesModel->itemFromIndex(index); 126 148 -
trunk/yao/src/interface/src/include/ModinspaceWindow.hpp
r464 r465 50 50 QModelIndex indexForAxes; 51 51 QModelIndex indexForModul; 52 /*QStandardItemModel *m_instructionLeftModel; 53 QStandardItemModel *m_instructionRightModel; 54 QStandardItem *initialisation; 55 QStandardItem *minimisation; 56 QStandardItem *input_output; 57 QStandardItem *test; 58 QStandardItem *execution; 59 QStandardItem *user_functions; 60 //QStandardItemModel *m_orderModel; 61 */ 52 53 std::vector <std::string> *m_theLocalAxesTable; 54 std::vector <std::string> *m_theLocalModulTable; 62 55 }; 63 56 #endif // MODINSPACEwINDOW_HPP
Note: See TracChangeset
for help on using the changeset viewer.