diff --git a/ArchitectureColoredPainting/src/Editor/EditorWidget.cpp b/ArchitectureColoredPainting/src/Editor/EditorWidget.cpp index 00c3691..cacb1ae 100644 --- a/ArchitectureColoredPainting/src/Editor/EditorWidget.cpp +++ b/ArchitectureColoredPainting/src/Editor/EditorWidget.cpp @@ -122,7 +122,9 @@ void EditorWidget::initFileMenu() }); connect(actionMerge, &QAction::triggered, this, [this] { auto files = QFileDialog::getOpenFileNames(this, QStringLiteral("打开需要合并的项目文件"), "", QStringLiteral("JSON文件(*.json)")); + if (files.empty()) return; auto target = QFileDialog::getSaveFileName(this, QStringLiteral("保存至"), "", QStringLiteral("JSON文件(*.json)")); + if (target.isEmpty()) return; auto load = [&](QString path) { QFile file(path); file.open(QFile::ReadOnly); diff --git a/ArchitectureColoredPainting/src/Editor/EditorWidgetItem.cpp b/ArchitectureColoredPainting/src/Editor/EditorWidgetItem.cpp index 4e7220f..a50f89e 100644 --- a/ArchitectureColoredPainting/src/Editor/EditorWidgetItem.cpp +++ b/ArchitectureColoredPainting/src/Editor/EditorWidgetItem.cpp @@ -274,11 +274,6 @@ void EditorWidgetItem::handleCanvasMetallicChange(const float& metallic) previewWindow->canvasMetallic = metallic; } -void EditorWidgetItem::handleMaterialReplace(const Renderer::Material& origin, const Renderer::Material& target) -{ - -} - QSize EditorWidgetItem::getCanvasReferSize() const { return previewWindow->referSize; diff --git a/ArchitectureColoredPainting/src/Editor/EditorWidgetItem.h b/ArchitectureColoredPainting/src/Editor/EditorWidgetItem.h index 7a7c858..b95c0df 100644 --- a/ArchitectureColoredPainting/src/Editor/EditorWidgetItem.h +++ b/ArchitectureColoredPainting/src/Editor/EditorWidgetItem.h @@ -50,7 +50,6 @@ class EditorWidgetItem : public QWidget void handleCanvasSizeChange(const QSize& size); void handleCanvasRoughnessChange(const float& roughness); void handleCanvasMetallicChange(const float& metallic); - void handleMaterialReplace(const Renderer::Material& origin, const Renderer::Material& target); QSize getCanvasReferSize() const; float getCanvasRoughness() const; float getCanvasMetallic() const;