GUI updates

Author: NavNTCMP

Compressonator/Applications/CompressonatorGUI/Components/acAboutDlg.cpp

@@ -38,7 +38,7 @@ void CHelpAboutDialog::Init(const QString & title, const QString & productName)
     QString helpAboutString = "Compressonator<br>";
     helpAboutString.append(version);
 
-    QString copyRightCaption = "<p> &copy; 2019 Advanced Micro Devices, Inc. All Rights Reserved.</p>";
+    QString copyRightCaption = "<p> &copy; 2020 Advanced Micro Devices, Inc. All Rights Reserved.</p>";
     // Create the QLabels from the strings:
     QLabel* pHelpAboutStringAsStaticText = new QLabel(helpAboutString);
     QLabel* pCopyRightCaptionAsStaticText = new QLabel(copyRightCaption);

Compressonator/Applications/CompressonatorGUI/Components/acImageView.cpp

@@ -1332,13 +1332,13 @@ void acImageView::centerImage()
     // so that is viewed in center
     QTransform translation;
     translation.translate(dx, dy);
-    m_imageItem_Processed->setTransform(translation, true);
+    m_imageItem_Processed->setTransform(translation,true);
 //#endif
 
     if (m_imageItem_Original)
     {
         m_imageItem_Original->setTransformOriginPoint(0, 0);
-        m_imageItem_Original->setTransform(translation, true);
+        m_imageItem_Original->setTransform(translation,true);
     }
 
 }

Compressonator/Applications/CompressonatorGUI/Components/acOGLWidget.cpp

@@ -50,7 +50,6 @@ GLenum  acOGLWidget::MIP2OLG_Format(MipSet *m_MipSet)
     return m_GLnum;
 }
 
-
 bool  acOGLWidget::loadMIPImage(MipSet *m_MipSet, CMIPS *cMips, int MIPLevel = 0)
 {
     // Get First <IP Level

Compressonator/Applications/CompressonatorGUI/Components/acOGLWidget.h

@@ -34,7 +34,6 @@ class acOGLWidget : public QOpenGLWidget, protected QOpenGLFunctions
 
     explicit acOGLWidget(QWidget *parent = 0);
     virtual ~acOGLWidget();
-
 #if 0
     GLenum  MIP2OLG_Format(MipSet *m_MipSet);
     bool loadMIPImage(MipSet *m_MipSet, CMIPS *cMips, int MIPLevel);

Compressonator/Applications/CompressonatorGUI/Components/cp3DModelView.cpp

@@ -626,18 +626,14 @@ cp3DModelView::cp3DModelView(const QString filePathName, const QString filePathN
         if (((strcmp(c_ext, "GLTF") == 0) || (strcmp(c_ext, "BIN") == 0)))
         {
             m_isviewingDX12 = true;
-//#ifdef USE_3DVIEWALLAPI
             if (g_Application_Options.getGLTFRender() == C_Application_Options::RenderModelsWith::glTF_OpenGL)
-//#endif
                 g_Application_Options.setGLTFRender(C_Application_Options::RenderModelsWith::glTF_DX12_EX);
         }
         else
         {
             m_isviewingDX12 = false;
-#ifdef USE_3DVIEWALLAPI
             if (g_Application_Options.getGLTFRender() == C_Application_Options::RenderModelsWith::glTF_DX12_EX ||
                 g_Application_Options.getGLTFRender() == C_Application_Options::RenderModelsWith::glTF_Vulkan)
-#endif
                 g_Application_Options.setGLTFRender(C_Application_Options::RenderModelsWith::glTF_OpenGL);
         }
 

Compressonator/Applications/CompressonatorGUI/Components/cpGenMips.cpp

@@ -63,7 +63,7 @@ m_parent(parent)
 }
 
 
-void CGenMips::setMipLevelDisplay(int Width, int Height)
+void CGenMips::setMipLevelDisplay(int Width, int Height, bool UsingGPU = false)
 {
     m_ImageSize_W = Width;
     m_ImageSize_H = Height;
@@ -84,14 +84,20 @@ void CGenMips::setMipLevelDisplay(int Width, int Height)
         Width = (Width>1) ? (Width >> 1) : 1;
         Height = (Height>1) ? (Height >> 1) : 1;
 
+        if (UsingGPU)
+        {
+            if ((Width % 4)||(Height%4))
+                break;
+        }
+
         QString level;
         level.append(QString::number(Width));
         level.append("x");
         level.append(QString::number(Height));
 
         m_MipLevelSizes << level;
-
         m_MipLevels++;
+
     } while (Width > 1 && Height > 1);
 
     QStringList reversedList = m_MipLevelSizes;
@@ -245,8 +251,6 @@ void CGenMips::SetDefaults()
 
 
     // Data 
-    //https://doc.qt.io/archives/qq/qq18-propertybrowser.html
-
     m_property = variantManager->addProperty(QtVariantPropertyManager::enumTypeId(), LOWEST_MIP_LEVELS);
     m_MipLevelSizes << "";
     m_property->setAttribute("enumNames", m_MipLevelSizes);

Compressonator/Applications/CompressonatorGUI/Components/cpGenMips.h

@@ -82,7 +82,7 @@ class CGenMips : public QWidget
     CGenMips(const QString title, QWidget *parent);
     ~CGenMips();
 
-    void setMipLevelDisplay(int Width, int Height);
+    void setMipLevelDisplay(int Width, int Height,bool UsingGPU);
 
     void SetDefaults();
     void evalProperties();

Compressonator/Applications/CompressonatorGUI/Components/cpImagePropertyView.cpp

@@ -544,7 +544,14 @@ void CImagePropertyView::compressionValueChanged(QVariant& value)
     if (m_propQuality)
     {
         m_propQuality->setHidden(!Quality_Settings);
-        m_propQuality->setEnabled(Quality_Settings);
+        if (m_C_Destination_Options->m_globalSetting_qualityEnabled)
+        {
+            m_propQuality->setEnabled(false);
+        }
+        else
+        {
+            m_propQuality->setEnabled(Quality_Settings);
+        }
     }
 
     if (m_propDXT1Alpha)

Compressonator/Applications/CompressonatorGUI/Components/cpProjectData.h

@@ -1440,7 +1440,10 @@ class C_Destination_Options : public C_Destination_Image
 
     double getQuality() const
     {
-        return m_Quality;
+        if (m_globalSetting_qualityEnabled)
+            return m_globalSetting_quality;
+        else
+            return m_Quality;
     }
 
     bool doSwizzle()
@@ -1493,6 +1496,11 @@ class C_Destination_Options : public C_Destination_Image
     // so dont delete its ref using this class. Parent class will clean it up
     CMipImages  *m_OriginalMipImages;
 
+    
+    // Global Setting overrides
+    bool  m_globalSetting_qualityEnabled = false; 
+    float m_globalSetting_quality = 0.0f;
+
 signals:
 
     void compressionChanged(QVariant &);
@@ -1531,6 +1539,8 @@ class C_Destination_Options : public C_Destination_Image
         ds.m_SourceIscompressedFormat = obj.m_SourceIscompressedFormat;
         ds.m_SourceIsFloatFormat      = obj.m_SourceIsFloatFormat;
         ds.m_data_has_been_changed    = obj.m_data_has_been_changed;
+        ds.m_globalSetting_qualityEnabled = obj.m_globalSetting_qualityEnabled;
+        ds.m_globalSetting_quality    = obj.m_globalSetting_quality;
         ds.m_SourceImageSize          = obj.m_SourceImageSize;
         ds.X_RED                      = obj.X_RED;
         ds.Y_GREEN                    = obj.Y_GREEN;
@@ -1539,6 +1549,7 @@ class C_Destination_Options : public C_Destination_Image
 
         return ds;
     }
+
 };
 
 // =======================================================
@@ -1617,6 +1628,43 @@ Q_OBJECT
     CMipImages *m_MipImages;
 };
 
+class C_Global_Process_Settings: public QObject
+{
+        Q_OBJECT
+        Q_PROPERTY(double Set_Quality      READ getQuality   WRITE setQuality)
+
+public:
+    C_Global_Process_Settings()
+    {
+        m_Quality = 0.00;
+    }
+
+    double m_Quality;
+    int    m_enabled;
+
+    void setQuality(double quality)
+    {
+         m_enabled = 1;
+        if (quality > 1.0) quality = 1.0;
+        else
+        if (quality <= 0) 
+        {
+            quality = 0.0;
+            m_enabled = 0;
+        }
+        m_Quality = quality;
+        emit globalPropertyChanged(m_enabled);
+    }
+
+    float getQuality() const
+    {
+        return m_Quality;
+    }
+
+signals:
+    void globalPropertyChanged(int &);
+};
+
 class C_Mesh_Buffer_Info : public QObject
 {
         Q_OBJECT
@@ -1765,12 +1813,8 @@ class C_3DModel_Info : public QObject
 // =======================================================
 // APPLICATION DATA
 // =======================================================
-//#ifdef USE_CMP_SDK 
 #define APP_compress_image_using                        "Encode with"
-//#endif
-//#ifdef USE_3DVIEWALLAPI
 #define APP_Render_Models_with                          "Render Models with"
-//#endif
 #define APP_Decompress_image_views_using                "Decode with"
 #define APP_Reload_image_views_on_selection             "Reload image views on selection"
 #define APP_Load_recent_project_on_startup              "Load recent project on startup"
@@ -1786,10 +1830,8 @@ class C_Application_Options :public QObject
     Q_OBJECT
         Q_ENUMS(ImageDecodeWith)
         Q_ENUMS(RenderModelsWith)
-//#ifdef USE_CMP_SDK
         Q_ENUMS(ImageEncodeWith)
         Q_PROPERTY(ImageEncodeWith  Encode_with                             READ getImageEncode             WRITE setImageEncode NOTIFY ImageEncodeChanged)
-//#endif
         Q_PROPERTY(ImageDecodeWith  Decode_with                             READ getImageViewDecode         WRITE setImageViewDecode NOTIFY ImageViewDecodeChanged)
         Q_PROPERTY(bool             Reload_image_views_on_selection         READ getUseNewImageViews        WRITE setUseNewImageViews)
         Q_PROPERTY(bool             Close_all_image_views_prior_to_process  READ getCloseAllImageViews      WRITE setCloseAllImageViews)
@@ -1800,9 +1842,7 @@ class C_Application_Options :public QObject
 #ifdef USE_ASSIMP
         Q_PROPERTY(bool             Use_assimp                              READ getUseAssimp               WRITE setUseAssimp)
 #endif
-//#ifdef USE_3DVIEWALLAPI
         Q_PROPERTY(RenderModelsWith Render_Models_with                      READ getGLTFRender              WRITE setGLTFRender)
-//#endif
         Q_PROPERTY(bool             Show_MSE_PSNR_SSIM_Results              READ getLogResults              WRITE setLogResults NOTIFY LogResultsChanged)
         Q_PROPERTY(bool             Show_Analysis_Results_Table             READ getAnalysisResultTable     WRITE setAnalysisResultTable)
 public:
@@ -1811,9 +1851,9 @@ class C_Application_Options :public QObject
     enum class ImageEncodeWith {
         CPU,
         HPC,
-#ifdef USE_GPUEncoders
         GPU_DirectX,
         GPU_OpenCL,
+#ifdef USE_GPU_PIPELINE_VULKAN
         GPU_Vulkan,
 #endif
     };
@@ -1841,10 +1881,8 @@ class C_Application_Options :public QObject
 
     C_Application_Options()
     {
-        m_ImageViewDecode    = ImageDecodeWith::CPU;
-//#ifdef USE_CMP_SDK
-        m_ImageEncode        = ImageEncodeWith::CPU;
-//#endif
+        m_ImageViewDecode       = ImageDecodeWith::CPU;
+        m_ImageEncode           = ImageEncodeWith::CPU;
         m_loadRecentFile        = false;
         m_useNewImageViews      = false;
         m_refreshCurrentView    = false;
@@ -1874,7 +1912,7 @@ class C_Application_Options :public QObject
     {
         return m_ImageViewDecode;
     }
-//#ifdef USE_CMP_SDK
+
     void setImageEncode(ImageEncodeWith encodewith)
     {
         m_ImageEncode = encodewith;
@@ -1885,7 +1923,11 @@ class C_Application_Options :public QObject
     {
         return m_ImageEncode;
     }
-//#endif
+
+    bool isGPUEncode()
+    {
+        return ((m_ImageEncode == ImageEncodeWith::GPU_DirectX)||(m_ImageEncode == ImageEncodeWith::GPU_OpenCL));
+    }
 
     void setImagediffContrast(double contrast)
     {
@@ -1995,9 +2037,7 @@ class C_Application_Options :public QObject
     }
 
     ImageDecodeWith m_ImageViewDecode;
-//#ifdef USE_CMP_SDK
     ImageEncodeWith m_ImageEncode;
-//#endif
     bool            m_clickIconToViewImage;
     bool            m_closeAllDocuments;
     bool            m_loadRecentFile;
@@ -2012,10 +2052,7 @@ class C_Application_Options :public QObject
 signals:
     void ImageViewDecodeChanged(QVariant &);
     void LogResultsChanged(QVariant &);
-//#ifdef USE_CMP_SDK
     void ImageEncodeChanged(QVariant &);
-//#endif
-
 };
 
 #define STR_QUALITY_SETTING_HINT        "Quality Setting Range 0 (Poor)to 1 (High)Default is 0.05"