v1.0

- dualiso openmp reverted (not stable) - denoiser invisible (problems on Linux and maybe Windows)
ilia3101 · Aug 26, 2018 · 8303e29 · 8303e29
1 parent e38bd37
commit 8303e29
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 94 deletions.
diff --git a/platform/qt/Info.plist b/platform/qt/Info.plist
@@ -26,6 +26,6 @@
 	<key>CFBundleTypeRole</key>
         <string>Viewer</string>
 	<key>CFBundleShortVersionString</key>
-        <string>0.17 alpha</string>
+        <string>1.0</string>
 </dict>
 </plist>
diff --git a/platform/qt/MainWindow.cpp b/platform/qt/MainWindow.cpp
@@ -35,8 +35,8 @@
 #include <FcpxmlAssistantDialog.h>
 
 #define APPNAME "MLV App"
-#define VERSION "0.17 alpha"
-#define GITVERSION "QTv0.17alpha"
+#define VERSION "1.0"
+#define GITVERSION "QTv1.0"
 
 #define FACTOR_DS       22.5
 #define FACTOR_LS       11.2
@@ -1033,6 +1033,14 @@ void MainWindow::initGui( void )
 
     //set CPU Usage
     m_countTimeDown = -1;   //Time in seconds for CPU countdown
+
+    //Denoiser - hide it because there are still problems on Linux
+    ui->horizontalSliderDenoiseStrength->setVisible( false );
+    ui->comboBoxDenoiseWindow->setVisible( false );
+    ui->label_DenoiseStrength->setVisible( false );
+    ui->label_32->setVisible( false );
+    ui->line_19->setVisible( false );
+    ui->label_31->setVisible( false );
 }
 
 //Initialize the library

diff --git a/platform/qt/MainWindow.ui b/platform/qt/MainWindow.ui
@@ -394,9 +394,9 @@ QGroupBox::indicator:checked {
           <property name="geometry">
            <rect>
             <x>0</x>
-            <y>0</y>
-            <width>200</width>
-            <height>3542</height>
+            <y>-1510</y>
+            <width>199</width>
+            <height>3512</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayoutScrollArea">
@@ -3943,7 +3943,34 @@ QGroupBox::indicator:checked {
                    <property name="spacing">
                     <number>0</number>
                    </property>
-                   <item row="1" column="0" colspan="3">
+                   <item row="0" column="0">
+                    <widget class="QLabel" name="label_31">
+                     <property name="font">
+                      <font>
+                       <pointsize>10</pointsize>
+                      </font>
+                     </property>
+                     <property name="text">
+                      <string>Denoise Strength</string>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="0" column="1">
+                    <widget class="DoubleClickLabel" name="label_DenoiseStrength">
+                     <property name="font">
+                      <font>
+                       <pointsize>10</pointsize>
+                      </font>
+                     </property>
+                     <property name="text">
+                      <string>0</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="0" colspan="2">
                     <widget class="NoScrollSlider" name="horizontalSliderDenoiseStrength">
                      <property name="sizePolicy">
                       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -3971,49 +3998,6 @@ QGroupBox::indicator:checked {
                      </property>
                     </widget>
                    </item>
-                   <item row="0" column="2">
-                    <widget class="DoubleClickLabel" name="label_DenoiseStrength">
-                     <property name="font">
-                      <font>
-                       <pointsize>10</pointsize>
-                      </font>
-                     </property>
-                     <property name="text">
-                      <string>0</string>
-                     </property>
-                     <property name="alignment">
-                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="0" column="1">
-                    <spacer name="horizontalSpacer_31">
-                     <property name="orientation">
-                      <enum>Qt::Horizontal</enum>
-                     </property>
-                     <property name="sizeType">
-                      <enum>QSizePolicy::Maximum</enum>
-                     </property>
-                     <property name="sizeHint" stdset="0">
-                      <size>
-                       <width>40</width>
-                       <height>20</height>
-                      </size>
-                     </property>
-                    </spacer>
-                   </item>
-                   <item row="0" column="0">
-                    <widget class="QLabel" name="label_31">
-                     <property name="font">
-                      <font>
-                       <pointsize>10</pointsize>
-                      </font>
-                     </property>
-                     <property name="text">
-                      <string>Denoise Strength</string>
-                     </property>
-                    </widget>
-                   </item>
                   </layout>
                  </item>
                 </layout>