#3050 Add memory count to progress dialog.

Fwk/AppFwk/CommonCode/CMakeLists.txt

@@ -42,9 +42,6 @@ add_library( ${PROJECT_NAME}
     cafVecIjk.cpp
     cafVecIjk.h
 
-	cafMemoryInspector.cpp
-	cafMemoryInspector.h
-
     ${MOC_FILES_CPP}
 )
 

Fwk/AppFwk/cafUserInterface/CMakeLists.txt

@@ -136,6 +136,8 @@ set( PROJECT_FILES
     QMinimizePanel.h
     cafQTreeViewStateSerializer.h
     cafQTreeViewStateSerializer.cpp
+    cafMemoryInspector.h
+    cafMemoryInspector.cpp
 )
 
 add_library( ${PROJECT_NAME}

Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp

@@ -37,6 +37,7 @@
 
 #include "cafProgressInfo.h"
 #include "cafAssert.h"
+#include "cafMemoryInspector.h"
 #include "cafProgressState.h"
 
 #include <QPointer>
@@ -45,6 +46,8 @@
 #include <QApplication>
 #include <QThread>
 
+#include <algorithm>
+
 namespace caf {
 
     //==================================================================================================
@@ -181,6 +184,30 @@ namespace caf {
     /// 
     //==================================================================================================
 
+
+    //--------------------------------------------------------------------------------------------------
+    /// 
+    //--------------------------------------------------------------------------------------------------
+    QString createMemoryLabelText()
+    {
+        uint64_t    currentUsage = caf::MemoryInspector::getApplicationPhysicalMemoryUsageMiB();
+        uint64_t    totalPhysicalMemory = caf::MemoryInspector::getTotalPhysicalMemoryMiB();
+
+        float currentUsageFraction = 0.0f;
+        float availVirtualFraction = 1.0f;
+        if (currentUsage > 0u && totalPhysicalMemory > 0u)
+        {
+            currentUsageFraction = std::min(1.0f, static_cast<float>(currentUsage) / totalPhysicalMemory);
+        }
+
+        QString labelText("\n   ");
+        if (currentUsageFraction > 0.5)
+        {
+            labelText = QString("Memory Used: %1 MiB, Total Physical Memory: %2 MiB\n").arg(currentUsage).arg(totalPhysicalMemory);
+        }
+        return labelText;
+    }
+
     //--------------------------------------------------------------------------------------------------
     /// 
     //--------------------------------------------------------------------------------------------------
@@ -301,7 +328,7 @@ namespace caf {
             if (!descriptionStack()[i].isEmpty()) labelText += descriptionStack()[i];
             if (!(titleStack()[i].isEmpty() && descriptionStack()[i].isEmpty())) labelText += "\n";
         }
-        labelText += "\n                                                                                                                      ";
+        labelText += createMemoryLabelText();
         return labelText;
 
     }