Changeset 67921 in vbox

Timestamp:

Jul 12, 2017 10:04:35 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8400: Caching actual/logical numeric size values in UIMedium.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium

Files:

• UIMedium.cpp (modified) (3 diffs)
• UIMedium.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp

@@ -88 +88 @@
     m_strLocation = other.location();
 
+    m_uSize = other.sizeInBytes();
+    m_uLogicalSize = other.logicalSizeInBytes();
     m_strSize = other.size();
     m_strLogicalSize = other.logicalSize();
@@ -152 +154 @@
     m_strName = VBoxGlobal::tr("Empty", "medium");
     m_strLocation = m_strSize = m_strLogicalSize = QString("--");
+    m_uSize = m_uLogicalSize = 0;
 
     /* Reset medium type parameter: */
@@ -211 +214 @@
             if (m_state != KMediumState_Inaccessible && m_state != KMediumState_NotCreated)
             {
-                m_strSize = vboxGlobal().formatSize(m_medium.GetSize());
+                m_uSize = m_medium.GetSize();
+                m_strSize = vboxGlobal().formatSize(m_uSize);
                 if (m_type == UIMediumType_HardDisk)
-                    m_strLogicalSize = vboxGlobal().formatSize(m_medium.GetLogicalSize());
+                {
+                    m_uLogicalSize = m_medium.GetLogicalSize();
+                    m_strLogicalSize = vboxGlobal().formatSize(m_uLogicalSize);
+                }
                 else
+                {
+                    m_uLogicalSize = m_uSize;
                     m_strLogicalSize = m_strSize;
+                }
             }
         }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.h

@@ -178 +178 @@
     QString location(bool fNoDiffs = false) const { return fNoDiffs ? root().m_strLocation : m_strLocation; }
 
+    /** Returns the medium size in bytes.
+      * @param fNoDiffs @c true to enable user-friendly "don't show diffs" mode.
+      * @note  In "don't show diffs" mode, this method returns the size of root in the given hard drive chain. */
+    qulonglong sizeInBytes(bool fNoDiffs = false) const { return fNoDiffs ? root().m_uSize : m_uSize; }
+    /** Returns the logical medium size in bytes.
+      * @param fNoDiffs @c true to enable user-friendly "don't show diffs" mode.
+      * @note  In "don't show diffs" mode, this method returns the size of root in the given hard drive chain. */
+    qulonglong logicalSizeInBytes(bool fNoDiffs = false) const { return fNoDiffs ? root().m_uLogicalSize : m_uLogicalSize; }
     /** Returns the medium size.
       * @param fNoDiffs @c true to enable user-friendly "don't show diffs" mode.
@@ -343 +351 @@
     QString m_strLocation;
 
+    /** Holds the medium size in bytes. */
+    qulonglong m_uSize;
+    /** Holds the logical medium size in bytes. */
+    qulonglong m_uLogicalSize;
     /** Holds the medium size. */
     QString m_strSize;
-    /** Holds the medium logical size. */
+    /** Holds the logical medium size. */
     QString m_strLogicalSize;