Хранилища Subversion OpenInventory

Сравнить редакции

Не учитывать пробелы Редакция 71 → Редакция 72

/trunk/ClassEditor/classeditor.cpp
175,7 → 175,8
 
 
 
model = new QSqlTableModel(this); // õðàíèëèùå îáúåêòîâ êëàññà
model = new QSqlTableModel(); // õðàíèëèùå îáúåêòîâ êëàññà
tableForInstance = new QTableView();
mymodel = new MyModel(this);
//modelForDescription = new QSqlTableModel(this);
modelForDescription = new ModelForDescriptionTable(this);
239,7 → 240,7
*/
ui->tableView_2->setItemDelegateForColumn(3, &classTableDelegate);
 
currIndexOfClassesTable = modelForDescription->index(0, 1);
currIndexOfClassesTable = mymodel->index(0, 1);
QModelIndex index_temp;
 
currClassID = mymodel->data(mymodel->index(0,0)).toString();
264,11 → 265,12
 
model->setTable(class_instance);
//model->setTable(tr("memory"));
model->setEditStrategy(QSqlTableModel::OnFieldChange);
model->setEditStrategy(QSqlTableModel::OnManualSubmit);
model->select();
tableForInstance.setModel(model);
tableForInstance.resizeColumnsToContents();
tableForInstance.show();
tableForInstance->setModel(model);
tableForInstance->resizeColumnsToContents();
tableForInstance->setWindowTitle(class_instance);
tableForInstance->show();
 
modelForDescription->setFilter(str_fltr);
modelForDescription->select();
279,7 → 281,7
//connect(ui->tableView, SIGNAL(clicked(const QModelIndex)), this, SLOT(on_tableView_clicked(const QModelIndex)));
connect(mymodel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(on_myModel_dataChanged(QModelIndex,QModelIndex)));
connect(modelForDescription, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(on_modelForDescription_dataChanged(QModelIndex,QModelIndex)));
connect(ui->newClassAction, SIGNAL(triggered(bool)), this, SLOT(on_pushButton_clicked(bool)));
//connect(ui->newClassAction, SIGNAL(triggered(bool)), this, SLOT(on_pushButton_clicked(bool)));
connect(ui->action_ID, SIGNAL(triggered(bool)), this, SLOT(on_action_ID_triggered(bool)));
connect(ui->action_showAlias, SIGNAL(triggered(bool)), this, SLOT(on_action_showAlias_triggered(bool))); // ïîêàçûâàòü ïñåâäîíèìû
connect(ui->action_showInstance, SIGNAL(triggered(bool)), this, SLOT(on_action_showInstance_triggered(bool))); // ïîêàçûâàòü õðàíèëèùà îáúåêòîâ
287,6 → 289,7
connect(ui->action_removeAllFields, SIGNAL(triggered()), this, SLOT(on_pushButton_5_clicked())); // óäàëèòü âñå ïîëÿ
connect(ui->action_removeSelectedClasses, SIGNAL(triggered()), this, SLOT(on_pushButton_2_clicked())); // óäàëèòü âûäåëåííûå êëàññû
connect(ui->action_removeAllClasses, SIGNAL(triggered()), this, SLOT(on_action_removeAllClasses())); // óäàëèòü âûäåëåííûå êëàññû
connect(ui->action_newClass, SIGNAL(triggered()), this, SLOT(on_pushButton_clicked())); // óäàëèòü âûäåëåííûå êëàññû
}
 
 
302,6 → 305,8
ClassEditor::~ClassEditor()
{
delete ui;
delete model;
delete tableForInstance;
// delete field;
// delete settdialog;
}
413,6 → 418,10
//ok = rec.isEmpty();
//QString currientClassID;
//currientClassID = rec.value(1).toString();
QString Inctance_str;
int currRow = ClassEditor::currIndexOfClassesTable.row(); //
Inctance_str = mymodel->data(mymodel->index(currRow, 3)).toString();
 
int row = modelForDescription->rowCount();
modelForDescription->insertRows(row, 1);
modelForDescription->setData(modelForDescription->index(row, 5), QVariant(currClassID), Qt::EditRole);
454,12 → 463,29
tmp_str = ui->tableView->model()->data(index_tmp).toString();
instance_str = ui->tableView->model()->data(index_instance).toString();
// instance_str.append(tr("_inctance"));
/*
Inctance_model.clear();
Inctance_model.setTable(instance_str);
Inctance_model.select();
tableForInstance_new.setModel(&Inctance_model);
tableForInstance_new.show();
*/
// model->clear();
tableForInstance->close();
delete model;
delete tableForInstance;
model = new QSqlTableModel();
tableForInstance = new QTableView();
model->setTable(instance_str);
model->setEditStrategy(QSqlTableModel::OnManualSubmit);
tableForInstance->setModel(model);
 
model->setTable(instance_str);
model->select();
tableForInstance.setWindowTitle(instance_str);
tableForInstance->setWindowTitle(instance_str);
tableForInstance->show();
 
// tableForInstance.setModel(model);
tableForInstance.resizeColumnsToContents();
tableForInstance->resizeColumnsToContents();
 
currClassID = tmp_str;
// ui->label->setText(QVariant(currIndexOfClassesTable.row()).toString());
/trunk/ClassEditor/classeditor.h
31,15 → 31,19
SqlTable *table;
QModelIndex currIndexOfClassesTable; // ïåðåìåííàÿ õðàíèò òåêóùèé èíäåêñ òàáëèöû êëàññîâ
QString currClassID; // òåêóùèé èäåíòèôèêàòîð êëàññà
QString currInctanceTable; // èìÿ òàáëèöû-õðàíèëèùà îáúåêòîâ äëÿ âûáðàííîãî êëàññà
 
QSqlTableModel* model;
// QSqlTableModel* modelForDescription;
ModelForDescriptionTable* modelForDescription;
 
QSqlTableModel* Inctance_model;
 
QTableView* tableForDescription;
MyModel* mymodel;
 
QTableView tableForInstance; // çäåñü áóäåì îòîáðàæàòü òàáëèöó-õðàíèëèùå îáúåêòîà êëàññà
QTableView* tableForInstance; // çäåñü áóäåì îòîáðàæàòü òàáëèöó-õðàíèëèùå îáúåêòîà êëàññà
QTableView tableForInstance_new; // çäåñü áóäåì îòîáðàæàòü òàáëèöó-õðàíèëèùå îáúåêòîà êëàññà
 
DelegateForClassesTable classTableDelegate;
 
/trunk/ClassEditor/classeditor.ui
183,7 → 183,7
<addaction name="separator"/>
<addaction name="action_removeSelectedClasses"/>
</widget>
<addaction name="newClassAction"/>
<addaction name="action_newClass"/>
<addaction name="separator"/>
<addaction name="menu_3"/>
<addaction name="separator"/>
203,7 → 203,7
</attribute>
</widget>
<widget class="QStatusBar" name="statusBar"/>
<action name="newClassAction">
<action name="action_newClass">
<property name="text">
<string>Новый класс</string>
</property>