Форматирование кода
This commit is contained in:
parent
5035851480
commit
8e4a301e30
|
|
@ -40,7 +40,8 @@ _bstr_t to_bstr_t(QString str){
|
|||
}
|
||||
|
||||
QString from_bstr_t(_bstr_t str){
|
||||
return QString::fromUtf16(reinterpret_cast<const ushort*>((const WCHAR*)str));
|
||||
return QString::fromUtf16(
|
||||
reinterpret_cast<const ushort*>((const WCHAR*)str));
|
||||
}
|
||||
|
||||
QVariant from_variant_t(const _variant_t &arg){
|
||||
|
|
|
|||
253
mainwindow.cpp
253
mainwindow.cpp
|
|
@ -9,54 +9,92 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||
{
|
||||
setupUi(this);
|
||||
connect(diffAction, SIGNAL(triggered(bool)), this, SLOT(runDiff()));
|
||||
connect(saveLogFileAction, SIGNAL(triggered(bool)), this, SLOT(saveLogFile()));
|
||||
connect(openFirstFileAction, SIGNAL(triggered(bool)), this, SLOT(openFirstFile()));
|
||||
connect(openSecondFileAction, SIGNAL(triggered(bool)),this, SLOT(openSecondFile()));
|
||||
connect(saveLogFileAction, SIGNAL(triggered(bool)),
|
||||
this, SLOT(saveLogFile()));
|
||||
connect(openFirstFileAction, SIGNAL(triggered(bool)),
|
||||
this, SLOT(openFirstFile()));
|
||||
connect(openSecondFileAction, SIGNAL(triggered(bool)),
|
||||
this, SLOT(openSecondFile()));
|
||||
connect(exitAction, SIGNAL(triggered(bool)),this, SLOT(close()));
|
||||
m_diffModel = NULL;
|
||||
|
||||
QSettings settings("ASCON", "StructuresDifference");
|
||||
settings.beginGroup("DiffOption");
|
||||
|
||||
classIdCheckBox->setChecked(settings.value("classId",true).toBool());
|
||||
classBlockedCheckBox->setChecked(settings.value("classBlocked",true).toBool());
|
||||
classScreenNameCheckBox->setChecked(settings.value("classScreenName",true).toBool());
|
||||
classBaseClassCheckBox->setChecked(settings.value("classBaseClass",true).toBool());
|
||||
classChildCheckBox->setChecked(settings.value("classChild",true).toBool());
|
||||
classFilterCheckBox->setChecked(settings.value("classFilter",true).toBool());
|
||||
classPermsCheckBox->setChecked(settings.value("classPerms",true).toBool());
|
||||
permGroupCheckBox->setChecked(settings.value("permGroup",true).toBool());
|
||||
classIdCheckBox->setChecked(
|
||||
settings.value("classId",true).toBool());
|
||||
classBlockedCheckBox->setChecked(
|
||||
settings.value("classBlocked",true).toBool());
|
||||
classScreenNameCheckBox->setChecked(
|
||||
settings.value("classScreenName",true).toBool());
|
||||
classBaseClassCheckBox->setChecked(
|
||||
settings.value("classBaseClass",true).toBool());
|
||||
classChildCheckBox->setChecked(
|
||||
settings.value("classChild",true).toBool());
|
||||
classFilterCheckBox->setChecked(
|
||||
settings.value("classFilter",true).toBool());
|
||||
classPermsCheckBox->setChecked(
|
||||
settings.value("classPerms",true).toBool());
|
||||
permGroupCheckBox->setChecked(
|
||||
settings.value("permGroup",true).toBool());
|
||||
|
||||
attrIdCheckBox->setChecked(settings.value("attrId",true).toBool());
|
||||
attrDataTypeCheckBox->setChecked(settings.value("attrDataType",true).toBool());
|
||||
attrTypeCheckBox->setChecked(settings.value("attrType",true).toBool());
|
||||
attrScreenNameCheckBox->setChecked(settings.value("attrScreenName",true).toBool());
|
||||
attrAliasNameCheckBox->setChecked(settings.value("attrAliasName",true).toBool());
|
||||
attrFuncReadCheckBox->setChecked(settings.value("attrFuncRead",true).toBool());
|
||||
attrFuncWriteCheckBox->setChecked(settings.value("attrFuncWrite",true).toBool());
|
||||
attrBlockedCheckBox->setChecked(settings.value("attrBlocked",true).toBool());
|
||||
attrMeasureUnitCheckBox->setChecked(settings.value("attrMeasureUnit",true).toBool());
|
||||
attrMeasureEntityCheckBox->setChecked(settings.value("attrMeasureEntity",true).toBool());
|
||||
attrLimitCheckBox->setChecked(settings.value("attrLimit",true).toBool());
|
||||
attrForbidInputCheckBox->setChecked(settings.value("attrForbidInput",true).toBool());
|
||||
attrBaseClassCheckBox->setChecked(settings.value("attrBaseClass",true).toBool());
|
||||
attrPrecisionCheckBox->setChecked(settings.value("attrPrecision",true).toBool());
|
||||
attrGroupCheckBox->setChecked(settings.value("attrGroup",true).toBool());
|
||||
attrPropCheckBox->setChecked(settings.value("attrProp",true).toBool());
|
||||
attrPermsCheckBox->setChecked(settings.value("attrPerms",true).toBool());
|
||||
attrInheritedcheckBox->setChecked(settings.value("attrInherited",true).toBool());
|
||||
attrIdCheckBox->setChecked(
|
||||
settings.value("attrId",true).toBool());
|
||||
attrDataTypeCheckBox->setChecked(
|
||||
settings.value("attrDataType",true).toBool());
|
||||
attrTypeCheckBox->setChecked(
|
||||
settings.value("attrType",true).toBool());
|
||||
attrScreenNameCheckBox->setChecked(
|
||||
settings.value("attrScreenName",true).toBool());
|
||||
attrAliasNameCheckBox->setChecked(
|
||||
settings.value("attrAliasName",true).toBool());
|
||||
attrFuncReadCheckBox->setChecked(
|
||||
settings.value("attrFuncRead",true).toBool());
|
||||
attrFuncWriteCheckBox->setChecked(
|
||||
settings.value("attrFuncWrite",true).toBool());
|
||||
attrBlockedCheckBox->setChecked(
|
||||
settings.value("attrBlocked",true).toBool());
|
||||
attrMeasureUnitCheckBox->setChecked(
|
||||
settings.value("attrMeasureUnit",true).toBool());
|
||||
attrMeasureEntityCheckBox->setChecked(
|
||||
settings.value("attrMeasureEntity",true).toBool());
|
||||
attrLimitCheckBox->setChecked(
|
||||
settings.value("attrLimit",true).toBool());
|
||||
attrForbidInputCheckBox->setChecked(
|
||||
settings.value("attrForbidInput",true).toBool());
|
||||
attrBaseClassCheckBox->setChecked(
|
||||
settings.value("attrBaseClass",true).toBool());
|
||||
attrPrecisionCheckBox->setChecked(
|
||||
settings.value("attrPrecision",true).toBool());
|
||||
attrGroupCheckBox->setChecked(
|
||||
settings.value("attrGroup",true).toBool());
|
||||
attrPropCheckBox->setChecked(
|
||||
settings.value("attrProp",true).toBool());
|
||||
attrPermsCheckBox->setChecked(
|
||||
settings.value("attrPerms",true).toBool());
|
||||
attrInheritedcheckBox->setChecked(
|
||||
settings.value("attrInherited",true).toBool());
|
||||
|
||||
objIdCheckBox->setChecked(settings.value("objId",true).toBool());
|
||||
objOwnerIdCheckBox->setChecked(settings.value("objOwnerId",true).toBool());
|
||||
objWasChangedCheckBox->setChecked(settings.value("objWasChanged",true).toBool());
|
||||
objReadOnlyCheckBox->setChecked(settings.value("objReadOnly",true).toBool());
|
||||
objChildsCheckBox->setChecked(settings.value("objChilds",true).toBool());
|
||||
|
||||
objAttrNameCheckBox->setChecked(settings.value("objAttrName",true).toBool());
|
||||
objAttrValueCheckBox->setChecked(settings.value("objAttrValue",true).toBool());
|
||||
objAttrMeasureUnitCheckBox->setChecked(settings.value("objAttrMeasureUnit",true).toBool());
|
||||
objAttrPrecisionCheckBox->setChecked(settings.value("objAttrPrecision",true).toBool());
|
||||
objAttrOwnerIdCheckBox->setChecked(settings.value("objAttrOwnerId",true).toBool());
|
||||
objIdCheckBox->setChecked(
|
||||
settings.value("objId",true).toBool());
|
||||
objOwnerIdCheckBox->setChecked(
|
||||
settings.value("objOwnerId",true).toBool());
|
||||
objWasChangedCheckBox->setChecked(
|
||||
settings.value("objWasChanged",true).toBool());
|
||||
objReadOnlyCheckBox->setChecked(
|
||||
settings.value("objReadOnly",true).toBool());
|
||||
objChildsCheckBox->setChecked(
|
||||
settings.value("objChilds",true).toBool());
|
||||
objAttrNameCheckBox->setChecked(
|
||||
settings.value("objAttrName",true).toBool());
|
||||
objAttrValueCheckBox->setChecked(
|
||||
settings.value("objAttrValue",true).toBool());
|
||||
objAttrMeasureUnitCheckBox->setChecked(
|
||||
settings.value("objAttrMeasureUnit",true).toBool());
|
||||
objAttrPrecisionCheckBox->setChecked(
|
||||
settings.value("objAttrPrecision",true).toBool());
|
||||
objAttrOwnerIdCheckBox->setChecked(
|
||||
settings.value("objAttrOwnerId",true).toBool());
|
||||
|
||||
settings.endGroup();
|
||||
|
||||
|
|
@ -65,8 +103,9 @@ MainWindow::MainWindow(QWidget *parent) :
|
|||
|
||||
void MainWindow::saveLogFile()
|
||||
{
|
||||
QString fileName = QFileDialog::getSaveFileName(NULL, tr("Сохранение лога сравнения"),
|
||||
"", tr("Текстовые файлы (*.txt)"));
|
||||
QString fileName = QFileDialog::getSaveFileName(
|
||||
NULL, tr("Сохранение лога сравнения"),
|
||||
"", tr("Текстовые файлы (*.txt)"));
|
||||
QFile file(fileName);
|
||||
if ( file.open(QIODevice::WriteOnly) )
|
||||
{
|
||||
|
|
@ -79,11 +118,13 @@ void MainWindow::saveLogFile()
|
|||
void MainWindow::runDiff()
|
||||
{
|
||||
if (!QFile(m_firstFileName).exists()){
|
||||
logPlainTextEdit->appendPlainText("Не существует первый файл: " + m_firstFileName);
|
||||
logPlainTextEdit->appendPlainText(
|
||||
"Не существует первый файл: " + m_firstFileName);
|
||||
return;
|
||||
}
|
||||
if (!QFile(m_secondFileName).exists()) {
|
||||
logPlainTextEdit->appendPlainText("Не существует второй файл: " + m_secondFileName);
|
||||
logPlainTextEdit->appendPlainText(
|
||||
"Не существует второй файл: " + m_secondFileName);
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -96,12 +137,16 @@ void MainWindow::runDiff()
|
|||
logPlainTextEdit->appendPlainText("Первый файл: " + m_firstFileName);
|
||||
logPlainTextEdit->appendPlainText("Второй файл: " + m_secondFileName);
|
||||
if (vModelDst!=NULL && vModelSrc!=NULL) {
|
||||
logPlainTextEdit->appendPlainText(m_diffModel->differenceAttrGroups(vModelSrc, vModelDst));
|
||||
logPlainTextEdit->appendPlainText(m_diffModel->differenceModels(vModelSrc, vModelDst));
|
||||
logPlainTextEdit->appendPlainText(
|
||||
m_diffModel->differenceAttrGroups(vModelSrc, vModelDst));
|
||||
logPlainTextEdit->appendPlainText(
|
||||
m_diffModel->differenceModels(vModelSrc, vModelDst));
|
||||
logPlainTextEdit->appendPlainText("\nПроверка закончена");
|
||||
}
|
||||
} else
|
||||
QMessageBox::warning(this, tr("Ошибка соединения"), tr("Ошибка соединения с сервером приложений"));
|
||||
QMessageBox::warning(this,
|
||||
tr("Ошибка соединения"),
|
||||
tr("Ошибка соединения с сервером приложений"));
|
||||
delete m_diffModel;
|
||||
}
|
||||
|
||||
|
|
@ -110,7 +155,8 @@ void MainWindow::openFirstFile()
|
|||
m_firstFileName = QFileDialog::getOpenFileName(
|
||||
this, tr("Открытие файла "),
|
||||
"", tr("VTP файл (*.vtp)"));
|
||||
logPlainTextEdit->appendPlainText("Выбран первый файл: " + m_firstFileName);
|
||||
logPlainTextEdit->appendPlainText(
|
||||
"Выбран первый файл: " + m_firstFileName);
|
||||
}
|
||||
|
||||
void MainWindow::openSecondFile()
|
||||
|
|
@ -118,7 +164,8 @@ void MainWindow::openSecondFile()
|
|||
m_secondFileName = QFileDialog::getOpenFileName(
|
||||
this, tr("Открытие файла "),
|
||||
"", tr("VTP файл (*.vtp)"));
|
||||
logPlainTextEdit->appendPlainText("Выбран второй файл: " + m_secondFileName);
|
||||
logPlainTextEdit->appendPlainText(
|
||||
"Выбран второй файл: " + m_secondFileName);
|
||||
}
|
||||
|
||||
void MainWindow::setCheckBox()
|
||||
|
|
@ -168,45 +215,81 @@ void MainWindow::closeEvent(QCloseEvent *event)
|
|||
{
|
||||
QSettings settings("ASCON", "StructuresDifference");
|
||||
settings.beginGroup("DiffOption");
|
||||
settings.setValue("classId", classIdCheckBox->isChecked());
|
||||
settings.setValue("classBlocked", classBlockedCheckBox->isChecked());
|
||||
settings.setValue("classScreenName", classScreenNameCheckBox->isChecked());
|
||||
settings.setValue("classBaseClass", classBaseClassCheckBox->isChecked());
|
||||
settings.setValue("classChild", classChildCheckBox->isChecked());
|
||||
settings.setValue("classFilter", classFilterCheckBox->isChecked());
|
||||
settings.setValue("classPerms", classPermsCheckBox->isChecked());
|
||||
settings.setValue("permGroup", permGroupCheckBox->isChecked());
|
||||
settings.setValue("classId",
|
||||
classIdCheckBox->isChecked());
|
||||
settings.setValue("classBlocked",
|
||||
classBlockedCheckBox->isChecked());
|
||||
settings.setValue("classScreenName",
|
||||
classScreenNameCheckBox->isChecked());
|
||||
settings.setValue("classBaseClass",
|
||||
classBaseClassCheckBox->isChecked());
|
||||
settings.setValue("classChild",
|
||||
classChildCheckBox->isChecked());
|
||||
settings.setValue("classFilter",
|
||||
classFilterCheckBox->isChecked());
|
||||
settings.setValue("classPerms",
|
||||
classPermsCheckBox->isChecked());
|
||||
settings.setValue("permGroup",
|
||||
permGroupCheckBox->isChecked());
|
||||
|
||||
settings.setValue("attrId", attrIdCheckBox->isChecked());
|
||||
settings.setValue("attrDataType", attrDataTypeCheckBox->isChecked());
|
||||
settings.setValue("attrType", attrTypeCheckBox->isChecked());
|
||||
settings.setValue("attrScreenName", attrScreenNameCheckBox->isChecked());
|
||||
settings.setValue("attrAliasName", attrAliasNameCheckBox->isChecked());
|
||||
settings.setValue("attrFuncRead", attrFuncReadCheckBox->isChecked());
|
||||
settings.setValue("attrFuncWrite", attrFuncWriteCheckBox->isChecked());
|
||||
settings.setValue("attrBlocked", attrBlockedCheckBox->isChecked());
|
||||
settings.setValue("attrMeasureUnit", attrMeasureUnitCheckBox->isChecked());
|
||||
settings.setValue("attrMeasureEntity", attrMeasureEntityCheckBox->isChecked());
|
||||
settings.setValue("attrLimit", attrLimitCheckBox->isChecked());
|
||||
settings.setValue("attrForbidInput", attrForbidInputCheckBox->isChecked());
|
||||
settings.setValue("attrBaseClass", attrBaseClassCheckBox->isChecked());
|
||||
settings.setValue("attrPrecision", attrPrecisionCheckBox->isChecked());
|
||||
settings.setValue("attrGroup", attrGroupCheckBox->isChecked());
|
||||
settings.setValue("attrProp", attrPropCheckBox->isChecked());
|
||||
settings.setValue("attrPerms", attrPermsCheckBox->isChecked());
|
||||
settings.setValue("attrInherited", attrInheritedcheckBox->isChecked());
|
||||
settings.setValue("attrId",
|
||||
attrIdCheckBox->isChecked());
|
||||
settings.setValue("attrDataType",
|
||||
attrDataTypeCheckBox->isChecked());
|
||||
settings.setValue("attrType",
|
||||
attrTypeCheckBox->isChecked());
|
||||
settings.setValue("attrScreenName",
|
||||
attrScreenNameCheckBox->isChecked());
|
||||
settings.setValue("attrAliasName",
|
||||
attrAliasNameCheckBox->isChecked());
|
||||
settings.setValue("attrFuncRead",
|
||||
attrFuncReadCheckBox->isChecked());
|
||||
settings.setValue("attrFuncWrite",
|
||||
attrFuncWriteCheckBox->isChecked());
|
||||
settings.setValue("attrBlocked",
|
||||
attrBlockedCheckBox->isChecked());
|
||||
settings.setValue("attrMeasureUnit",
|
||||
attrMeasureUnitCheckBox->isChecked());
|
||||
settings.setValue("attrMeasureEntity",
|
||||
attrMeasureEntityCheckBox->isChecked());
|
||||
settings.setValue("attrLimit",
|
||||
attrLimitCheckBox->isChecked());
|
||||
settings.setValue("attrForbidInput",
|
||||
attrForbidInputCheckBox->isChecked());
|
||||
settings.setValue("attrBaseClass",
|
||||
attrBaseClassCheckBox->isChecked());
|
||||
settings.setValue("attrPrecision",
|
||||
attrPrecisionCheckBox->isChecked());
|
||||
settings.setValue("attrGroup",
|
||||
attrGroupCheckBox->isChecked());
|
||||
settings.setValue("attrProp",
|
||||
attrPropCheckBox->isChecked());
|
||||
settings.setValue("attrPerms",
|
||||
attrPermsCheckBox->isChecked());
|
||||
settings.setValue("attrInherited",
|
||||
attrInheritedcheckBox->isChecked());
|
||||
|
||||
settings.setValue("objId", objIdCheckBox->isChecked());
|
||||
settings.setValue("objOwnerId", objOwnerIdCheckBox->isChecked());
|
||||
settings.setValue("objWasChanged", objWasChangedCheckBox->isChecked());
|
||||
settings.setValue("objReadOnly", objReadOnlyCheckBox->isChecked());
|
||||
settings.setValue("objChilds", objChildsCheckBox->isChecked());
|
||||
settings.setValue("objId",
|
||||
objIdCheckBox->isChecked());
|
||||
settings.setValue("objOwnerId",
|
||||
objOwnerIdCheckBox->isChecked());
|
||||
settings.setValue("objWasChanged",
|
||||
objWasChangedCheckBox->isChecked());
|
||||
settings.setValue("objReadOnly",
|
||||
objReadOnlyCheckBox->isChecked());
|
||||
settings.setValue("objChilds",
|
||||
objChildsCheckBox->isChecked());
|
||||
|
||||
settings.setValue("objAttrName", objAttrNameCheckBox->isChecked());
|
||||
settings.setValue("objAttrValue", objAttrValueCheckBox->isChecked());
|
||||
settings.setValue("objAttrMeasureUnit", objAttrMeasureUnitCheckBox->isChecked());
|
||||
settings.setValue("objAttrPrecision", objAttrPrecisionCheckBox->isChecked());
|
||||
settings.setValue("objAttrOwnerId", objAttrOwnerIdCheckBox->isChecked());
|
||||
settings.setValue("objAttrName",
|
||||
objAttrNameCheckBox->isChecked());
|
||||
settings.setValue("objAttrValue",
|
||||
objAttrValueCheckBox->isChecked());
|
||||
settings.setValue("objAttrMeasureUnit",
|
||||
objAttrMeasureUnitCheckBox->isChecked());
|
||||
settings.setValue("objAttrPrecision",
|
||||
objAttrPrecisionCheckBox->isChecked());
|
||||
settings.setValue("objAttrOwnerId",
|
||||
objAttrOwnerIdCheckBox->isChecked());
|
||||
|
||||
settings.endGroup();
|
||||
event->accept();
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Reference in New Issue