v2.55.01-beta

- 新特性:为所有引擎加入显示当前多显卡设定的按钮. - 更新FFmpeg&FFprobe. - Anime4k引擎的[列出gpu]改为多线程执行,避免进入未响应状态.
AaronFeng753 · Jul 18, 2020 · 66ca5d5 · 66ca5d5
1 parent 8da4e31
commit 66ca5d5
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 16 deletions.
diff --git a/SRC/Waifu2x-Extension-QT/Waifu2x-Extension-QT.pro.user b/SRC/Waifu2x-Extension-QT/Waifu2x-Extension-QT.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.12.4, 2020-07-16T14:29:43. -->
+<!-- Written by QtCreator 4.12.4, 2020-07-17T16:35:05. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/SRC/Waifu2x-Extension-QT/language_Chinese.qm b/SRC/Waifu2x-Extension-QT/language_Chinese.qm
diff --git a/SRC/Waifu2x-Extension-QT/language_Chinese.ts b/SRC/Waifu2x-Extension-QT/language_Chinese.ts
@@ -696,15 +696,13 @@ same time, you need to change [Image style] settings at [Home] tab.
     </message>
     <message>
         <location filename="mainwindow.ui" line="2419"/>
-        <location filename="mainwindow.ui" line="2556"/>
         <location filename="mainwindow.ui" line="3344"/>
         <location filename="mainwindow.ui" line="4011"/>
         <source>Show current Multi-GPU settings.</source>
         <translation>显示当前多显卡设定.</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2452"/>
-        <location filename="mainwindow.ui" line="2589"/>
         <location filename="mainwindow.ui" line="3377"/>
         <location filename="mainwindow.ui" line="4044"/>
         <source>Show GPUs Settings</source>
@@ -723,6 +721,16 @@ same time, you need to change [Image style] settings at [Home] tab.
 
 - [ 速度:★☆  画质:★★☆ ]</translation>
     </message>
+    <message>
+        <location filename="mainwindow.ui" line="2556"/>
+        <source>Show current Multi-Processor settings.</source>
+        <translation>显示多处理器设定.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="2589"/>
+        <source>Show Processor Settings</source>
+        <translation>显示处理器设定</translation>
+    </message>
     <message>
         <location filename="mainwindow.ui" line="2638"/>
         <source>1.You need at least 2 available processors.
@@ -1495,6 +1503,7 @@ the number of threads must &gt;= the number of GPUs.</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2503"/>
+        <location filename="waifu2x_converter.cpp" line="1865"/>
         <source>Processor ID:</source>
         <translation>处理器 ID:</translation>
     </message>
@@ -4023,6 +4032,15 @@ Restart the software to take effect.</source>
         <source>Detecting available Processor, please wait.</source>
         <translation>检测可用处理器中,请稍等.</translation>
     </message>
+    <message>
+        <location filename="waifu2x_converter.cpp" line="1589"/>
+        <source>
+Waifu2x-converter processor list:
+</source>
+        <translation>
+Waifu2x-converter处理器列表:
+</translation>
+    </message>
     <message>
         <location filename="waifu2x_converter.cpp" line="1789"/>
         <source>Insufficient number of available Processors.</source>

diff --git a/SRC/Waifu2x-Extension-QT/language_English.ts b/SRC/Waifu2x-Extension-QT/language_English.ts
@@ -529,6 +529,7 @@ the number of threads must &gt;= the number of GPUs.</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2503"/>
+        <location filename="waifu2x_converter.cpp" line="1865"/>
         <source>Processor ID:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -567,20 +568,28 @@ utilize the capabilities of your PC.
     </message>
     <message>
         <location filename="mainwindow.ui" line="2419"/>
-        <location filename="mainwindow.ui" line="2556"/>
         <location filename="mainwindow.ui" line="3344"/>
         <location filename="mainwindow.ui" line="4011"/>
         <source>Show current Multi-GPU settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2452"/>
-        <location filename="mainwindow.ui" line="2589"/>
         <location filename="mainwindow.ui" line="3377"/>
         <location filename="mainwindow.ui" line="4044"/>
         <source>Show GPUs Settings</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="mainwindow.ui" line="2556"/>
+        <source>Show current Multi-Processor settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="2589"/>
+        <source>Show Processor Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="mainwindow.ui" line="2731"/>
         <source>Anime4K:
@@ -2848,6 +2857,13 @@ Restart the software to take effect.</source>
         <source>Detecting available Processor, please wait.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="waifu2x_converter.cpp" line="1589"/>
+        <source>
+Waifu2x-converter processor list:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="waifu2x_converter.cpp" line="1593"/>
         <source>Please wait while testing the processor.</source>

diff --git a/SRC/Waifu2x-Extension-QT/language_Japanese.qm b/SRC/Waifu2x-Extension-QT/language_Japanese.qm
diff --git a/SRC/Waifu2x-Extension-QT/language_Japanese.ts b/SRC/Waifu2x-Extension-QT/language_Japanese.ts
@@ -631,15 +631,13 @@ the number of threads must &gt;= the number of GPUs.</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2419"/>
-        <location filename="mainwindow.ui" line="2556"/>
         <location filename="mainwindow.ui" line="3344"/>
         <location filename="mainwindow.ui" line="4011"/>
         <source>Show current Multi-GPU settings.</source>
         <translation>現在のマルチGPU設定を表示します。</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2452"/>
-        <location filename="mainwindow.ui" line="2589"/>
         <location filename="mainwindow.ui" line="3377"/>
         <location filename="mainwindow.ui" line="4044"/>
         <source>Show GPUs Settings</source>
@@ -665,6 +663,7 @@ the number of threads must &gt;= the number of GPUs.</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2503"/>
+        <location filename="waifu2x_converter.cpp" line="1865"/>
         <source>Processor ID:</source>
         <translation>プロセッサーID：</translation>
     </message>
@@ -2320,6 +2319,16 @@ Will improve image quality.</source>
         <source>Increase split size.</source>
         <translation>分割サイズを増やします。</translation>
     </message>
+    <message>
+        <location filename="mainwindow.ui" line="2556"/>
+        <source>Show current Multi-Processor settings.</source>
+        <translation>現在のマルチプロセッサ設定を表示します。</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="2589"/>
+        <source>Show Processor Settings</source>
+        <translation>プロセッサ設定を表示</translation>
+    </message>
     <message>
         <location filename="mainwindow.ui" line="2638"/>
         <source>1.You need at least 2 available processors.
@@ -3860,6 +3869,15 @@ If you like the software, please donate to support the developers to ensure the
         <source>Detecting available Processor, please wait.</source>
         <translation>使用可能なプロセッサを検出しています。お待ちください。</translation>
     </message>
+    <message>
+        <location filename="waifu2x_converter.cpp" line="1589"/>
+        <source>
+Waifu2x-converter processor list:
+</source>
+        <translation>
+Waifu2x-converterプロセッサリスト:
+</translation>
+    </message>
     <message>
         <location filename="waifu2x_converter.cpp" line="1593"/>
         <source>Please wait while testing the processor.</source>

diff --git a/SRC/Waifu2x-Extension-QT/language_TraditionalChinese.qm b/SRC/Waifu2x-Extension-QT/language_TraditionalChinese.qm
diff --git a/SRC/Waifu2x-Extension-QT/language_TraditionalChinese.ts b/SRC/Waifu2x-Extension-QT/language_TraditionalChinese.ts
@@ -130,6 +130,16 @@ automatically force the picture to be saved as PNG.
         <source>Compress JPG files.</source>
         <translation>壓縮 JPG 文件.</translation>
     </message>
+    <message>
+        <location filename="mainwindow.ui" line="2556"/>
+        <source>Show current Multi-Processor settings.</source>
+        <translation>顯示多處理器設定.</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.ui" line="2589"/>
+        <source>Show Processor Settings</source>
+        <translation>顯示處理器設定</translation>
+    </message>
     <message>
         <location filename="mainwindow.ui" line="5457"/>
         <source>Enable this will stop download anything from Communist China website Gitee.
@@ -1544,15 +1554,13 @@ the number of threads must &gt;= the number of GPUs.</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2419"/>
-        <location filename="mainwindow.ui" line="2556"/>
         <location filename="mainwindow.ui" line="3344"/>
         <location filename="mainwindow.ui" line="4011"/>
         <source>Show current Multi-GPU settings.</source>
         <translation>顯示當前多顯卡設定.</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2452"/>
-        <location filename="mainwindow.ui" line="2589"/>
         <location filename="mainwindow.ui" line="3377"/>
         <location filename="mainwindow.ui" line="4044"/>
         <source>Show GPUs Settings</source>
@@ -1578,6 +1586,7 @@ the number of threads must &gt;= the number of GPUs.</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2503"/>
+        <location filename="waifu2x_converter.cpp" line="1865"/>
         <source>Processor ID:</source>
         <translation>處理器ID：</translation>
     </message>
@@ -4005,6 +4014,15 @@ Restart the software to take effect.</source>
         <source>Detecting available Processor, please wait.</source>
         <translation>檢測可用處理器中,請稍等.</translation>
     </message>
+    <message>
+        <location filename="waifu2x_converter.cpp" line="1589"/>
+        <source>
+Waifu2x-converter processor list:
+</source>
+        <translation>
+Waifu2x-converter處理器列表:
+</translation>
+    </message>
     <message>
         <location filename="waifu2x_converter.cpp" line="1789"/>
         <source>Insufficient number of available Processors.</source>

diff --git a/SRC/Waifu2x-Extension-QT/main.cpp b/SRC/Waifu2x-Extension-QT/main.cpp
@@ -33,8 +33,10 @@ int main(int argc, char *argv[])
 
 /*
 Brief change log:
+- 新特性:为所有引擎加入显示当前多显卡设定的按钮.
 - 更新FFmpeg&FFprobe.
 - 性能优化.
+- 修复bug.
 ----------------------------
 Detailed change log:
 v2.55.01-beta:
@@ -43,6 +45,9 @@ v2.55.01-beta:
 - Anime4k引擎的[列出gpu]改为多线程执行,避免进入未响应状态.
 --------------------------------------------------------------------------
 To do:
+- 把download2单独写成个函数.
+- 加入一个tools标签页
+- 借助ImageMagick convert,实现拆分大图片,导入文件列表,放大,然后组装.
 - 移植到Linux.
 ---------------------------------------------------------------------------
 Integrated component:
@@ -55,7 +60,7 @@ Integrated component:
 - realsr-ncnn-vulkan fcaae13be5a9edf1f7e49035074c89eb75ec242b
 - ImageMagick 7.0.10-23 Q16 x64 2020-07-04
 - Anime4KCPP v2.2.1
-- FFmpeg&FFprobe 20200715-a54b367-win64-static
+- FFmpeg&FFprobe 20200716-d11cc74-win64-static
 ---
 Icons made by : Freepik (https://www.flaticon.com/authors/freepik) From Flaticon : https://www.flaticon.com/
 */
diff --git a/SRC/Waifu2x-Extension-QT/mainwindow.ui b/SRC/Waifu2x-Extension-QT/mainwindow.ui
@@ -82,7 +82,7 @@ height:35
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>1</number>
+       <number>2</number>
       </property>
       <property name="iconSize">
        <size>
@@ -2135,7 +2135,7 @@ Realsr-ncnn-vulkan [ Speed:☆  Image Quality:★★★ ]</string>
               <string/>
              </property>
              <property name="currentIndex">
-              <number>0</number>
+              <number>1</number>
              </property>
              <widget class="QWidget" name="tab_4">
               <attribute name="title">
@@ -2553,7 +2553,7 @@ Smaller Block size means waifu2x will use less GPU memory and run slower.</strin
                   <item row="0" column="5">
                    <widget class="QPushButton" name="pushButton_ShowMultiGPUSettings_Waifu2xConverter">
                     <property name="toolTip">
-                     <string>Show current Multi-GPU settings.</string>
+                     <string>Show current Multi-Processor settings.</string>
                     </property>
                     <property name="styleSheet">
                      <string notr="true">QPushButton{
@@ -2586,7 +2586,7 @@ padding:10px;
 }</string>
                     </property>
                     <property name="text">
-                     <string>Show GPUs Settings</string>
+                     <string>Show Processor Settings</string>
                     </property>
                    </widget>
                   </item>

diff --git a/SRC/Waifu2x-Extension-QT/waifu2x_converter.cpp b/SRC/Waifu2x-Extension-QT/waifu2x_converter.cpp
@@ -1586,7 +1586,7 @@ int MainWindow::Waifu2x_DumpProcessorList_converter()
     while(!Waifu2x->waitForFinished(100)&&!QProcess_stop) {}
     QString waifu2x_stdOut = Waifu2x->readAllStandardOutput();
     Core_num = waifu2x_stdOut.count("num_core");
-    emit Send_TextBrowser_NewMessage("\n-------------\n"+waifu2x_stdOut.trimmed()+"\n-------------");
+    emit Send_TextBrowser_NewMessage(tr("\nWaifu2x-converter processor list:\n")+waifu2x_stdOut.trimmed());
     //====================================================================
     //               获取到列表后, 对列表内处理器执行测试确认是否真的可用
     //====================================================================
@@ -1862,7 +1862,7 @@ void MainWindow::on_pushButton_ShowMultiGPUSettings_Waifu2xConverter_clicked()
         }
         else
         {
-            MultiGPUSettings_str.append("GPU ID:["+GPUInfo["ID"]+"] | "+tr("Block size:")+"["+GPUInfo["TileSize"]+"]\n\n");
+            MultiGPUSettings_str.append(tr("Processor ID:")+"["+GPUInfo["ID"]+"] | "+tr("Block size:")+"["+GPUInfo["TileSize"]+"]\n\n");
         }
     }
     //=========