Show line labels for CGraphStats

multitheftauto · Dec 18, 2017 · fc8b1e5 · 4O4 · Dec 28, 2017 · Necktrox
1 parent b76d05f
commit fc8b1e5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Client/core/CCore.h b/Client/core/CCore.h
@@ -52,7 +52,7 @@ class CCore;
 #include <dinput.h>
 
 #define BLUE_VERSION_STRING     "Multi Theft Auto v" MTA_DM_BUILDTAG_LONG
-#define BLUE_COPYRIGHT_STRING    _td("Copyright (C) 2003 - 2016 Multi Theft Auto")
+#define BLUE_COPYRIGHT_STRING    _td("Copyright (C) 2003 - 2017 Multi Theft Auto")
 
 // Configuration file path (relative to MTA install directory)
 #define MTA_CONFIG_PATH             "mta/config/coreconfig.xml"

diff --git a/Client/core/CGraphStats.cpp b/Client/core/CGraphStats.cpp
@@ -20,6 +20,7 @@ namespace
 	    std::vector < TIMEUS >          dataHistory;
 	    int								iDataPos;
 	    SColor							color;
+        const char*                     szName;
     };
 }
 
@@ -162,6 +163,7 @@ void CGraphStats::AddTimingPoint( const char* szName )
         memset( &pLine->dataHistory[ 0 ], 0, pLine->dataHistory.size() );
 	    pLine->iDataPos = 0;
 	    pLine->prevData = 0;
+        pLine->szName   = szName;
 
         // Random color based on line name
         MD5 md5;
@@ -212,19 +214,17 @@ void CGraphStats::Draw ( void )
     uint uiSizeY = 150;
     uint uiRangeY = 100;    // 100ms
     float fLineScale = 1/1000.f / uiRangeY * uiSizeY;
+    float fHalfLineHeight = pGraphics->GetDXFontHeight() / 2;
 
-    // Backgrounf box
+    // Backgroung box
 	pGraphics->DrawRectQueued( uiOriginX,  uiOriginY - uiSizeY,  uiSizeX, uiSizeY, SColorRGBA( 0, 0, 0, 128 ), true );
 
 	// Draw data line.
-    for ( std::map < SString, SGraphStatLine >::iterator iter = m_LineList.begin() ; iter != m_LineList.end() ; ++iter )
+    for ( const auto& dataLine : m_LineList )
 	{
-	    SGraphStatLine& line = iter->second;
-
-		int iDataPos = line.iDataPos;
-		int iDataPosPrev = iDataPos;
-		if ( iDataPos == -1 )
-			iDataPos = GRAPHSTAT_HISTORY_SIZE - 1;
+	    const SGraphStatLine& line = dataLine.second;
+        int iDataPos = line.iDataPos;
+        int iDataPosPrev = iDataPos;
 
         for ( int i = uiSizeX - 1 ; i > 0 ; i-- )
         {
@@ -238,5 +238,9 @@ void CGraphStats::Draw ( void )
 
 			pGraphics->DrawLineQueued( uiOriginX + i - 1,  uiOriginY - fY0,  uiOriginX + i,  uiOriginY - fY1, 1, line.color, true );
         }
+
+        float fX = uiOriginX + uiSizeX + 2;
+        float fY = uiOriginY - line.dataHistory[ line.iDataPos ] * fLineScale - fHalfLineHeight;
+        pGraphics->DrawStringQueued( fX, fY, fX, fY, line.color, line.szName, 1.0f, 1.0f, DT_NOCLIP, nullptr, true );
 	}
 }