Merge pull request #2 from Teddy-van-Jerry/dev

New Version - 5.1.8

Icon_resources.qrc

@@ -19,6 +19,7 @@
         <file>Menu Icon/Create Images in Range.svg</file>
         <file>Menu Icon/DeleteImage.svg</file>
         <file>Menu Icon/Check Images.svg</file>
+        <file>Menu Icon/GitHub.png</file>
     </qresource>
     <qresource prefix="/">
         <file>Menu Icon/Next.svg</file>

help.ui

@@ -75,7 +75,7 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">4. Use the sorting function well so you can add and remove rows easily.</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">5. You can use the </span><span style=" font-size:10pt; color:#0000ff;">Route Tool</span><span style=" font-size:10pt;"> (</span><img src=":/Menu Icon/Route_Tool.svg" /><span style=" font-size:10pt;">, </span><span style=" font-size:10pt; color:#aa00ff;">Ctrl + T</span><span style=" font-size:10pt;">) which has the icon of a hammer to assist you. You can drag the image to move, and use the wheel to change the size of the image (the centre point remains the same and this needs additional click of the </span><span style=" font-size:10pt; color:#0000ff;">View</span><span style=" font-size:10pt;"> button). Double click to set this point as the the centre point (this needs additional click of the </span><span style=" font-size:10pt; color:#0000ff;">View</span><span style=" font-size:10pt;"> button).</span></p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Please note that in this version (v 5.0), the v rate only supports angle.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Please note that in this version (v 5.1), the v rate only supports angle.</span></p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Fifth, define </span><span style=" font-size:10pt; color:#00aa00;">other information</span><span style=" font-size:10pt;"> related to the project.</span></p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"><br /></p>
@@ -111,11 +111,13 @@ p, li { white-space: pre-wrap; }
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">6.  New Features is also available to be checked in the Menu More of the Help window.</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">7.  Use the </span><span style=" font-size:10pt; color:#00aa00;">searching</span><span style=" font-size:10pt;"> function well and it supports Chinese searching.</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">8.  All the editings can call the Undo (</span><img src=":/icon/Menu Icon/Undo.svg" /><span style=" font-size:10pt;">, </span><span style=" font-size:10pt; color:#aa00ff;">Ctrl + X</span><span style=" font-size:10pt;">) and Redo (</span><img src=":/icon/Menu Icon/Redo.svg" /><span style=" font-size:10pt;">, </span><span style=" font-size:10pt; color:#aa00ff;">Ctrl + Y</span><span style=" font-size:10pt;">) and supports momories up to 50 actions. (except the Compatibility Module.)</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">9.  Be careful that finishing editing a line or a combo box (i.e. the focus is removed) can the information be recognized or saved.</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">10. To close a project (</span><img src=":/Menu Icon/Close.svg" /><span style=" font-size:10pt;">), </span><span style=" font-size:10pt; color:#aa00ff;">Ctrl + W</span><span style=" font-size:10pt;">. To exit the application (</span><img src=":/icon/Menu Icon/Exit.svg" /><span style=" font-size:10pt;">), </span><span style=" font-size:10pt; color:#aa00ff;">Crtl + E</span><span style=" font-size:10pt;">.</span></p>
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">11. Fractal Designer 5.0 is licenced under </span><span style=" font-size:10pt; font-style:italic; text-decoration: underline;">The MIT Licence</span><span style=" font-size:10pt;">. © 2021 Teddy van Jerry</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">9.  Check Images (</span><img src=":/icon/Menu Icon/Check Images.svg" /><span style=" font-size:10pt;">) can check if there are missed images and you can choose to recreate those.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">10. Delete Images (</span><img src=":/icon/Menu Icon/DeleteImage.svg" /><span style=" font-size:10pt;">) can delete images already created.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">11. Be careful that finishing editing a line or a combo box (i.e. the focus is removed) can the information be recognized or saved.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">12. To close a project (</span><img src=":/Menu Icon/Close.svg" /><span style=" font-size:10pt;">), </span><span style=" font-size:10pt; color:#aa00ff;">Ctrl + W</span><span style=" font-size:10pt;">. To exit the application (</span><img src=":/icon/Menu Icon/Exit.svg" /><span style=" font-size:10pt;">), </span><span style=" font-size:10pt; color:#aa00ff;">Crtl + E</span><span style=" font-size:10pt;">.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">13. Fractal Designer 5.0 is licenced under </span><span style=" font-size:10pt; font-style:italic; text-decoration: underline;">The MIT Licence</span><span style=" font-size:10pt;">. © 2021 Teddy van Jerry</span></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">  </p>
-&lt;p align=&quot;right&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#828282;&quot;&gt;Fractal Designer - Version 5.0.27 - 2021/03/01&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p align=&quot;right&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#828282;&quot;&gt;Fractal Designer - Version 5.1.8 - 2021/03/13&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
       </property>
      </widget>
     </item>

mainwindow.cpp

@@ -293,7 +293,7 @@ void MainWindow::on_actionExit_E_triggered()
 
 void MainWindow::on_actionChinese_triggered()
 {
-    QDesktopServices::openUrl(QUrl("https://blog.csdn.net/weixin_50012998/article/details/114097695"));
+    QDesktopServices::openUrl(QUrl("https://blog.csdn.net/weixin_50012998/article/details/114767519"));
 }
 
 void MainWindow::on_MainWindow_AboutTVJ_clicked()
@@ -834,6 +834,7 @@ void MainWindow::on_actionCreate_Images_triggered()
     ui->actionStop->setDisabled(false);
     ui->actionCreate_Images->setDisabled(true);
     ui->actionCreate_Images_in_Range->setDisabled(true);
+    ui->actionCheck_Images->setDisabled(true);
     on_actionPreview_Refresh_triggered();
     work_thread->start();
     qDebug() << ui->timeEdit->time().second() + 60 * ui->timeEdit->time().minute();
@@ -961,13 +962,15 @@ void MainWindow::on_actionStop_triggered()
     qDebug() << "Build Thread quit";
     ui->actionCreate_Images->setDisabled(false);
     ui->actionCreate_Images_in_Range->setDisabled(false);
+    ui->actionCheck_Images->setDisabled(false);
     ui->actionStop->setDisabled(true);
 }
 
 void MainWindow::build_image_finished_deal()
 {
     ui->actionCreate_Images->setDisabled(false);
     ui->actionCreate_Images_in_Range->setDisabled(false);
+    ui->actionCheck_Images->setDisabled(false);
     ui->actionStop->setDisabled(true);
     emit build_image_updateInfo_signal();
 }
@@ -2464,7 +2467,7 @@ void MainWindow::on_actionVersion_2_triggered()
 
 void MainWindow::on_actionBug_Report_triggered()
 {
-    QDesktopServices::openUrl(QUrl("https://blog.csdn.net/weixin_50012998/article/details/114097618"));
+    QDesktopServices::openUrl(QUrl("https://blog.csdn.net/weixin_50012998/article/details/114767480"));
 }
 
 void MainWindow::on_actionVersion_triggered()
@@ -2658,6 +2661,7 @@ void MainWindow::on_actionCreate_Images_in_Range_triggered()
     ui->actionStop->setDisabled(false);
     ui->actionCreate_Images->setDisabled(true);
     ui->actionCreate_Images_in_Range->setDisabled(true);
+    ui->actionCheck_Images->setDisabled(true);
     on_actionPreview_Refresh_triggered();
     work_thread->start();
 
@@ -2818,6 +2822,8 @@ void MainWindow::on_actionGitHub_Repository_triggered()
 
 void MainWindow::on_actionCheck_Images_triggered()
 {
+    if(!ui->actionCheck_Images->isEnabled()) return;
+
     int total_image = ui->comboBox_fps->currentText().toInt() * (ui->timeEdit->time().second() + 60 * ui->timeEdit->time().minute());
     QList<int> Missed_Images;
     for(int i = 0; i != total_image; i++)
@@ -2911,13 +2917,35 @@ void MainWindow::on_actionCheck_Images_triggered()
     }
 }
 
+bool MainWindow::existImage(int i) const
+{
+    QFile image_file(ui->lineEdit_imagePath->text() + "/" + ui->lineEdit_imagePrefix->text() + QString::number(i) + ".png");
+    if(image_file.exists()) return true;
+    else return false;
+}
+
 void MainWindow::deleteImage(int i)
 {
-    QFile image_file(ui->lineEdit_videoPath->text() + "/" + ui->lineEdit_imagePrefix->text() + QString::number(i) + ".png");
+    QFile image_file(ui->lineEdit_imagePath->text() + "/" + ui->lineEdit_imagePrefix->text() + QString::number(i) + ".png");
     image_file.remove();
 }
 
 void MainWindow::on_actionDelete_Images_triggered()
 {
-
+    int total_image = ui->comboBox_fps->currentText().toInt() * (ui->timeEdit->time().second() + 60 * ui->timeEdit->time().minute());
+    for(int i = 0; i != total_image; i++)
+    {
+        deleteImage(i);
+    }
+    int skip_number = 0;
+    int check_till = total_image - 1;
+    while(skip_number++ < 10000)
+    {
+        if(existImage(++check_till))
+        {
+            deleteImage(check_till);
+            skip_number = 0;
+        }
+    }
+    QMessageBox::information(this, "Information", "Deleting Images Finished!");
 }

mainwindow.h

@@ -160,6 +160,8 @@ class MainWindow : public QMainWindow
 
     void createImagesInRange(int From_I, int To_I);
 
+    bool existImage(int) const;
+
     void deleteImage(int);
 
 private slots: