Хранилища Subversion OpenInventory

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

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

/trunk/DBViewer/mainwindow.cpp
77,15 → 77,13
getDatabaseData();
//// sql_mogel = new QSqlTableModel();
sql_mogel = new MyModel();
filter_model = new MyModel();
filtr_model = new MyModel();
 
 
model_is_build = true;
connect(sql_mogel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(on_sql_mogel_dataChanged(QModelIndex,QModelIndex)));
connect(model_for_ListModelsTable, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(on_model_for_ListModelsTable_dataChanged(QModelIndex,QModelIndex)));
connect(filter_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(on_filter_model_dataChanged(QModelIndex,QModelIndex)));
 
 
ui->pushButton_3->setEnabled(false);
ui->pushButton_4->setEnabled(false);
 
115,7 → 113,7
MainWindow::~MainWindow()
{
delete sql_mogel;
delete filter_model;
delete filtr_model;
delete ui;
delete model_for_ListModelsTable;
}
853,10 → 851,9
ui->pushButton_12->setEnabled(false);
// ui->tableView->reset();
// MainWindow::filtr_model->clear();
disconnect(filter_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(on_filter_model_dataChanged(QModelIndex,QModelIndex)));
delete filter_model;
filter_model = new QSqlTableModel();
connect(filter_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(on_filter_model_dataChanged(QModelIndex,QModelIndex)));
delete filtr_model;
filtr_model = new MyModel();
 
int index;
classesID_list = class_list_map.keys();
classesNameList = class_list_map.values();
880,12 → 877,9
QString class_id;
QString model_id;
QString filtr_str;
QString inctance;
QStringList conditionList;
class_id = item->text(1);
model_id = item->text(6);
inctance = MainWindow::getClassInctance(class_id);
 
filtr_str = tr("`Model_ID` = ");
filtr_str.append(model_id);
filtr_str.append(tr(" AND `Class_ID` = "));
892,16 → 886,14
filtr_str.append(class_id);
// filtr_str.append(tr("`"));
 
disconnect(filter_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(on_filter_model_dataChanged(QModelIndex,QModelIndex)));
delete filter_model;
delete filtr_model;
// filtr_model = new MyModel();
 
filter_model = new QSqlTableModel();
connect(filter_model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(on_filter_model_dataChanged(QModelIndex,QModelIndex)));
filter_model->setTable(tr("Filters"));
filter_model->setFilter(filtr_str);
filter_model->select();
ui->tableView_3->setModel(filter_model);
filtr_model = new QSqlTableModel();
filtr_model->setTable(tr("Filters"));
filtr_model->setFilter(filtr_str);
filtr_model->select();
ui->tableView_3->setModel(filtr_model);
 
 
ui->tableView_3->hideColumn(0);
954,7 → 946,7
ui->treeWidget->hideColumn(2);
ui->treeWidget->hideColumn(3);
ui->treeWidget->hideColumn(4);
// ui->treeWidget->hideColumn(5);
ui->treeWidget->hideColumn(5);
ui->treeWidget->hideColumn(6);
 
ui->tableView_2->hideColumn(0);