Fixing issue with progress bar in console mode.

--HG--
branch : develop

src/app/valentina/mainwindowsnogui.cpp

@@ -215,8 +215,7 @@ bool MainWindowsNoGUI::GenerateLayout(VLayoutGenerator& lGenerator)
     QTimer *progressTimer = nullptr;
 #endif
 
-    QScopedPointer<DialogLayoutProgress> progress(new DialogLayoutProgress(timer, lGenerator.GetNestingTime()*60000,
+    QSharedPointer<DialogLayoutProgress> progress;
-                                                                           this));
     if (VApplication::IsGUIMode())
     {
 #if defined(Q_OS_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
@@ -230,23 +229,48 @@ bool MainWindowsNoGUI::GenerateLayout(VLayoutGenerator& lGenerator)
         });
         progressTimer->start(1000);
 #endif
+
+        progress = QSharedPointer<DialogLayoutProgress>(
+                    new DialogLayoutProgress(timer, lGenerator.GetNestingTimeMSecs(), this));
+
         connect(progress.data(), &DialogLayoutProgress::Abort, &lGenerator, &VLayoutGenerator::Abort);
         connect(progress.data(), &DialogLayoutProgress::Timeout, &lGenerator, &VLayoutGenerator::Timeout);
-    }
 
         progress->Start();
+    }
+    else
+    {
+        // Because the progress bar dialog will not terminate nesting we must create separate timer for this
+        auto *progressTimer = new QTimer(this);
+        connect(progressTimer, &QTimer::timeout, this, [timer, &lGenerator, progressTimer]()
+        {
+            const int timeout = static_cast<int>(lGenerator.GetNestingTimeMSecs() - timer.elapsed());
+
+            if (timeout <= 1000)
+            {
+                lGenerator.Timeout();
+                progressTimer->stop();
+                progressTimer->deleteLater();
+            }
+        });
+        progressTimer->start(1000);
+    }
 
     LayoutErrors nestingState = LayoutErrors::NoError;
 
     auto IsTimeout = [&progress, &lGenerator, timer, &nestingState]()
     {
-        if (timer.hasExpired(lGenerator.GetNestingTime() * 60000))
+        if (timer.hasExpired(lGenerator.GetNestingTimeMSecs()))
         {
             if (nestingState != LayoutErrors::EmptyPaperError)
             {
                 nestingState = LayoutErrors::Timeout;
             }
+
+            if (VApplication::IsGUIMode())
+            {
                 progress->Finished();
+            }
             return true;
         }
         return false;
@@ -268,7 +292,7 @@ bool MainWindowsNoGUI::GenerateLayout(VLayoutGenerator& lGenerator)
             break;
         }
 
-        lGenerator.Generate(timer, lGenerator.GetNestingTime()*60000);
+        lGenerator.Generate(timer, lGenerator.GetNestingTimeMSecs());
 
         if (IsTimeout())
         {
@@ -284,7 +308,10 @@ bool MainWindowsNoGUI::GenerateLayout(VLayoutGenerator& lGenerator)
                     if (efficiency < layoutEfficiency)
                     {
                         efficiency = layoutEfficiency;
+                        if (VApplication::IsGUIMode())
+                        {
                             progress->Efficiency(efficiency);
+                        }
 
                         CleanLayout();
                         papers = lGenerator.GetPapersItems();// Blank sheets
@@ -348,7 +375,10 @@ bool MainWindowsNoGUI::GenerateLayout(VLayoutGenerator& lGenerator)
         }
     }
 
+    if (VApplication::IsGUIMode())
+    {
         progress->Finished();
+    }
 
 #if defined(Q_OS_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
     if (VApplication::IsGUIMode())

src/libs/vlayout/vlayoutgenerator.cpp

@@ -732,6 +732,12 @@ int VLayoutGenerator::GetNestingTime() const
     return nestingTime;
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+int VLayoutGenerator::GetNestingTimeMSecs() const
+{
+    return nestingTime * 60000;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VLayoutGenerator::SetNestingTime(int value)
 {

src/libs/vlayout/vlayoutgenerator.h

@@ -73,6 +73,7 @@ public:
     void SetPaperWidth(qreal value);
 
     int  GetNestingTime() const;
+    int  GetNestingTimeMSecs() const;
     void SetNestingTime(int value);
 
     qreal GetEfficiencyCoefficient() const;