diff --git a/src/app/dialogs/dialoglayoutprogress.cpp b/src/app/dialogs/dialoglayoutprogress.cpp index 68b6937e1..a0c711bc7 100644 --- a/src/app/dialogs/dialoglayoutprogress.cpp +++ b/src/app/dialogs/dialoglayoutprogress.cpp @@ -96,10 +96,6 @@ void DialogLayoutProgress::Error(const LayoutErrors &state) text = tr("Couldn't prepare data for creation layout"); QMessageBox::critical(this, tr("Critical error"), text, QMessageBox::Ok, QMessageBox::Ok); break; - case LayoutErrors::PaperSizeError: - text = tr("Wrong paper size"); - QMessageBox::critical(this, tr("Critical error"), text, QMessageBox::Ok, QMessageBox::Ok); - break; case LayoutErrors::ProcessStoped: break; case LayoutErrors::EmptyPaperError: diff --git a/src/app/mainwindowsnogui.cpp b/src/app/mainwindowsnogui.cpp index e9ed3107a..6f94254dc 100644 --- a/src/app/mainwindowsnogui.cpp +++ b/src/app/mainwindowsnogui.cpp @@ -118,7 +118,6 @@ void MainWindowsNoGUI::ToolLayoutSettings(bool checked) case LayoutErrors::ProcessStoped: break; case LayoutErrors::PrepareLayoutError: - case LayoutErrors::PaperSizeError: case LayoutErrors::EmptyPaperError: break; default: diff --git a/src/libs/vlayout/vlayoutdef.h b/src/libs/vlayout/vlayoutdef.h index bb30141d2..3c58dbdde 100644 --- a/src/libs/vlayout/vlayoutdef.h +++ b/src/libs/vlayout/vlayoutdef.h @@ -35,7 +35,6 @@ enum class LayoutErrors : char { NoError, PrepareLayoutError, - PaperSizeError, ProcessStoped, EmptyPaperError }; diff --git a/src/libs/vlayout/vlayoutgenerator.cpp b/src/libs/vlayout/vlayoutgenerator.cpp index 894498570..a070596df 100644 --- a/src/libs/vlayout/vlayoutgenerator.cpp +++ b/src/libs/vlayout/vlayoutgenerator.cpp @@ -92,7 +92,6 @@ void VLayoutGenerator::Generate() if (bank->Prepare()) { - CheckDetailsSize(); while (bank->AllDetailsCount() > 0) { if (stopGeneration) @@ -256,18 +255,6 @@ void VLayoutGenerator::SetRotate(bool value) rotate = value; } -//--------------------------------------------------------------------------------------------------------------------- -void VLayoutGenerator::CheckDetailsSize() -{ - const QRectF rec = bank->GetBiggestBoundingRect(); - if (rec.width() > paperWidth || rec.height() > paperHeight) - { - state = LayoutErrors::PaperSizeError; - emit Error(state); - stopGeneration = true; - } -} - //--------------------------------------------------------------------------------------------------------------------- int VLayoutGenerator::GetPaperWidth() const { diff --git a/src/libs/vlayout/vlayoutgenerator.h b/src/libs/vlayout/vlayoutgenerator.h index eea20bd39..5f1846d3f 100644 --- a/src/libs/vlayout/vlayoutgenerator.h +++ b/src/libs/vlayout/vlayoutgenerator.h @@ -105,8 +105,6 @@ private: bool autoCrop; bool saveLength; bool unitePages; - - void CheckDetailsSize(); }; #endif // VLAYOUTGENERATOR_H