Fix single candlestick bar visibility by using proper time scale

MarketSimulator/Include/Common/bars.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <cstdint>
+
+
+struct Bar
+{
+    int32_t t;      // epoch time open
+    int32_t T;      // epoch time close
+    float o;        // open price
+    float h;        // high price
+    float l;        // low price
+    float c;        // close price
+    float v;        // volume
+    int n;          // number of trades
+
+    Bar() = default;
+    ~Bar() = default;
+    constexpr Bar(const int32_t _t, int32_t _T, const float _o, const float _h, const float _l, const float _c, const float _v, const int _n)
+    : t(_t), T(_T), o(_o), h(_h), l(_l), c(_c), v(_v), n(_n)
+        {}
+};

MarketSimulator/Include/Ui/uiManager.h

@@ -13,14 +13,20 @@ struct Vector2
     float y;
 };
 
+struct Vector2Int
+{
+    int x;
+    int y;
+};
+
 
 class UiManager
 {
 private:
     static std::vector<Window*> windows_;
 
 public:
-    static Vector2 screenSize;
+    static Vector2Int screenSize;
     static std::string windowName;
     static GLFWwindow* mainWindow;
 

MarketSimulator/Include/Wrapper/implotWrapper.h

@@ -0,0 +1,51 @@
+#pragma once
+#include <span>
+
+#include "imgui/imgui.h"
+
+
+struct Bar;
+
+
+class ImplotWrapper
+{
+private:
+    template <typename T>
+    static int BinarySearch(const T* _arr, int _l, int _r, T _x)
+    {
+        if (_r >= _l)
+        {
+            int mid = _l + (_r - _l) / 2;
+            if (_arr[mid] == _x)
+                return mid;
+            if (_arr[mid] > _x)
+                return BinarySearch(_arr, _l, mid - 1, _x);
+            return BinarySearch(_arr, mid + 1, _r, _x);
+        }
+        return -1;
+    }
+
+public:
+    static void PlotCandlestickOld(
+        const char* _labelId, 
+        const double* _xs, 
+        const double* _opens, 
+        const double* _closes, 
+        const double* _lows, 
+        const double* _highs, 
+        int _count, 
+        bool _tooltip, 
+        float _widthPercent, 
+        ImVec4 _bullCol, 
+        ImVec4 _bearCol);
+
+    static void PlotCandlestickNew(
+        const char* _labelId, 
+        const std::span<Bar> _bars,
+        const double* _dates,
+        int _count, 
+        bool _tooltip, 
+        float _widthPercent, 
+        ImVec4 _bullCol, 
+        ImVec4 _bearCol);
+};

MarketSimulator/MarketSimulator.vcxproj

@@ -170,10 +170,15 @@
     <ClCompile Include="External\imgui\imgui_impl_opengl3.cpp" />
     <ClCompile Include="External\imgui\imgui_tables.cpp" />
     <ClCompile Include="External\imgui\imgui_widgets.cpp" />
+    <ClCompile Include="External\imgui\implot.cpp" />
+    <ClCompile Include="External\imgui\implot_demo.cpp" />
+    <ClCompile Include="External\imgui\implot_items.cpp" />
     <ClCompile Include="Source\app.cpp" />
     <ClCompile Include="Source\main.cpp" />
+    <ClCompile Include="Source\serializer.cpp" />
     <ClCompile Include="Source\Ui\uiManager.cpp" />
     <ClCompile Include="Source\Ui\Window\chartWindow.cpp" />
+    <ClCompile Include="Source\Wrapper\implotWrapper.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="External\glad\glad.h" />
@@ -185,15 +190,21 @@
     <ClInclude Include="External\imgui\imgui_impl_opengl3.h" />
     <ClInclude Include="External\imgui\imgui_impl_opengl3_loader.h" />
     <ClInclude Include="External\imgui\imgui_internal.h" />
+    <ClInclude Include="External\imgui\implot.h" />
+    <ClInclude Include="External\imgui\implot_internal.h" />
     <ClInclude Include="External\imgui\imstb_rectpack.h" />
     <ClInclude Include="External\imgui\imstb_textedit.h" />
     <ClInclude Include="External\imgui\imstb_truetype.h" />
     <ClInclude Include="External\KHR\khrplatform.h" />
     <ClInclude Include="Include\app.h" />
+    <ClInclude Include="Include\Common\bars.h" />
+    <ClInclude Include="Include\Common\utils.h" />
+    <ClInclude Include="Include\serializer.h" />
     <ClInclude Include="Include\Ui\uiManager.h" />
     <ClInclude Include="Include\Ui\window.h" />
     <ClInclude Include="Include\Ui\Window\chartWindow.h" />
     <ClInclude Include="Include\utils.h" />
+    <ClInclude Include="Include\Wrapper\implotWrapper.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

MarketSimulator/Source/Ui/Window/chartWindow.cpp

@@ -1,18 +1,45 @@
 #include "Ui/Window/chartWindow.h"
 
+#include "Common/bars.h"
 #include "imgui/imgui.h"
+#include "imgui/implot.h"
+#include "Wrapper/implotWrapper.h"
+
+
+double dates[]  = {1546300800,1546387200,1546473600,1546560000,1546819200,1546905600,1546992000,1547078400,1547164800,1547424000,1547510400,1547596800,1547683200,1547769600,1547942400,1548028800,1548115200,1548201600,1548288000,1548374400,1548633600,1548720000,1548806400,1548892800,1548979200,1549238400,1549324800,1549411200,1549497600,1549584000,1549843200,1549929600,1550016000,1550102400,1550188800,1550361600,1550448000,1550534400,1550620800,1550707200,1550793600,1551052800,1551139200,1551225600,1551312000,1551398400,1551657600,1551744000,1551830400,1551916800,1552003200,1552262400,1552348800,1552435200,1552521600,1552608000,1552867200,1552953600,1553040000,1553126400,1553212800,1553472000,1553558400,1553644800,1553731200,1553817600,1554076800,1554163200,1554249600,1554336000,1554422400,1554681600,1554768000,1554854400,1554940800,1555027200,1555286400,1555372800,1555459200,1555545600,1555632000,1555891200,1555977600,1556064000,1556150400,1556236800,1556496000,1556582400,1556668800,1556755200,1556841600,1557100800,1557187200,1557273600,1557360000,1557446400,1557705600,1557792000,1557878400,1557964800,1558051200,1558310400,1558396800,1558483200,1558569600,1558656000,1558828800,1558915200,1559001600,1559088000,1559174400,1559260800,1559520000,1559606400,1559692800,1559779200,1559865600,1560124800,1560211200,1560297600,1560384000,1560470400,1560729600,1560816000,1560902400,1560988800,1561075200,1561334400,1561420800,1561507200,1561593600,1561680000,1561939200,1562025600,1562112000,1562198400,1562284800,1562544000,1562630400,1562716800,1562803200,1562889600,1563148800,1563235200,1563321600,1563408000,1563494400,1563753600,1563840000,1563926400,1564012800,1564099200,1564358400,1564444800,1564531200,1564617600,1564704000,1564963200,1565049600,1565136000,1565222400,1565308800,1565568000,1565654400,1565740800,1565827200,1565913600,1566172800,1566259200,1566345600,1566432000,1566518400,1566777600,1566864000,1566950400,1567036800,1567123200,1567296000,1567382400,1567468800,1567555200,1567641600,1567728000,1567987200,1568073600,1568160000,1568246400,1568332800,1568592000,1568678400,1568764800,1568851200,1568937600,1569196800,1569283200,1569369600,1569456000,1569542400,1569801600,1569888000,1569974400,1570060800,1570147200,1570406400,1570492800,1570579200,1570665600,1570752000,1571011200,1571097600,1571184000,1571270400,1571356800,1571616000,1571702400,1571788800,1571875200,1571961600};
+double opens[]  = {1284.7,1319.9,1318.7,1328,1317.6,1321.6,1314.3,1325,1319.3,1323.1,1324.7,1321.3,1323.5,1322,1281.3,1281.95,1311.1,1315,1314,1313.1,1331.9,1334.2,1341.3,1350.6,1349.8,1346.4,1343.4,1344.9,1335.6,1337.9,1342.5,1337,1338.6,1337,1340.4,1324.65,1324.35,1349.5,1371.3,1367.9,1351.3,1357.8,1356.1,1356,1347.6,1339.1,1320.6,1311.8,1314,1312.4,1312.3,1323.5,1319.1,1327.2,1332.1,1320.3,1323.1,1328,1330.9,1338,1333,1335.3,1345.2,1341.1,1332.5,1314,1314.4,1310.7,1314,1313.1,1315,1313.7,1320,1326.5,1329.2,1314.2,1312.3,1309.5,1297.4,1293.7,1277.9,1295.8,1295.2,1290.3,1294.2,1298,1306.4,1299.8,1302.3,1297,1289.6,1302,1300.7,1303.5,1300.5,1303.2,1306,1318.7,1315,1314.5,1304.1,1294.7,1293.7,1291.2,1290.2,1300.4,1284.2,1284.25,1301.8,1295.9,1296.2,1304.4,1323.1,1340.9,1341,1348,1351.4,1351.4,1343.5,1342.3,1349,1357.6,1357.1,1354.7,1361.4,1375.2,1403.5,1414.7,1433.2,1438,1423.6,1424.4,1418,1399.5,1435.5,1421.25,1434.1,1412.4,1409.8,1412.2,1433.4,1418.4,1429,1428.8,1420.6,1441,1460.4,1441.7,1438.4,1431,1439.3,1427.4,1431.9,1439.5,1443.7,1425.6,1457.5,1451.2,1481.1,1486.7,1512.1,1515.9,1509.2,1522.3,1513,1526.6,1533.9,1523,1506.3,1518.4,1512.4,1508.8,1545.4,1537.3,1551.8,1549.4,1536.9,1535.25,1537.95,1535.2,1556,1561.4,1525.6,1516.4,1507,1493.9,1504.9,1506.5,1513.1,1506.5,1509.7,1502,1506.8,1521.5,1529.8,1539.8,1510.9,1511.8,1501.7,1478,1485.4,1505.6,1511.6,1518.6,1498.7,1510.9,1510.8,1498.3,1492,1497.7,1484.8,1494.2,1495.6,1495.6,1487.5,1491.1,1495.1,1506.4};
+double highs[]  = {1284.75,1320.6,1327,1330.8,1326.8,1321.6,1326,1328,1325.8,1327.1,1326,1326,1323.5,1322.1,1282.7,1282.95,1315.8,1316.3,1314,1333.2,1334.7,1341.7,1353.2,1354.6,1352.2,1346.4,1345.7,1344.9,1340.7,1344.2,1342.7,1342.1,1345.2,1342,1350,1324.95,1330.75,1369.6,1374.3,1368.4,1359.8,1359,1357,1356,1353.4,1340.6,1322.3,1314.1,1316.1,1312.9,1325.7,1323.5,1326.3,1336,1332.1,1330.1,1330.4,1334.7,1341.1,1344.2,1338.8,1348.4,1345.6,1342.8,1334.7,1322.3,1319.3,1314.7,1316.6,1316.4,1315,1325.4,1328.3,1332.2,1329.2,1316.9,1312.3,1309.5,1299.6,1296.9,1277.9,1299.5,1296.2,1298.4,1302.5,1308.7,1306.4,1305.9,1307,1297.2,1301.7,1305,1305.3,1310.2,1307,1308,1319.8,1321.7,1318.7,1316.2,1305.9,1295.8,1293.8,1293.7,1304.2,1302,1285.15,1286.85,1304,1302,1305.2,1323,1344.1,1345.2,1360.1,1355.3,1363.8,1353,1344.7,1353.6,1358,1373.6,1358.2,1369.6,1377.6,1408.9,1425.5,1435.9,1453.7,1438,1426,1439.1,1418,1435,1452.6,1426.65,1437.5,1421.5,1414.1,1433.3,1441.3,1431.4,1433.9,1432.4,1440.8,1462.3,1467,1443.5,1444,1442.9,1447,1437.6,1440.8,1445.7,1447.8,1458.2,1461.9,1481.8,1486.8,1522.7,1521.3,1521.1,1531.5,1546.1,1534.9,1537.7,1538.6,1523.6,1518.8,1518.4,1514.6,1540.3,1565,1554.5,1556.6,1559.8,1541.9,1542.9,1540.05,1558.9,1566.2,1561.9,1536.2,1523.8,1509.1,1506.2,1532.2,1516.6,1519.7,1515,1519.5,1512.1,1524.5,1534.4,1543.3,1543.3,1542.8,1519.5,1507.2,1493.5,1511.4,1525.8,1522.2,1518.8,1515.3,1518,1522.3,1508,1501.5,1503,1495.5,1501.1,1497.9,1498.7,1492.1,1499.4,1506.9,1520.9};
+double lows[]   = {1282.85,1315,1318.7,1309.6,1317.6,1312.9,1312.4,1319.1,1319,1321,1318.1,1321.3,1319.9,1312,1280.5,1276.15,1308,1309.9,1308.5,1312.3,1329.3,1333.1,1340.2,1347,1345.9,1338,1340.8,1335,1332,1337.9,1333,1336.8,1333.2,1329.9,1340.4,1323.85,1324.05,1349,1366.3,1351.2,1349.1,1352.4,1350.7,1344.3,1338.9,1316.3,1308.4,1306.9,1309.6,1306.7,1312.3,1315.4,1319,1327.2,1317.2,1320,1323,1328,1323,1327.8,1331.7,1335.3,1336.6,1331.8,1311.4,1310,1309.5,1308,1310.6,1302.8,1306.6,1313.7,1320,1322.8,1311,1312.1,1303.6,1293.9,1293.5,1291,1277.9,1294.1,1286,1289.1,1293.5,1296.9,1298,1299.6,1292.9,1285.1,1288.5,1296.3,1297.2,1298.4,1298.6,1302,1300.3,1312,1310.8,1301.9,1292,1291.1,1286.3,1289.2,1289.9,1297.4,1283.65,1283.25,1292.9,1295.9,1290.8,1304.2,1322.7,1336.1,1341,1343.5,1345.8,1340.3,1335.1,1341.5,1347.6,1352.8,1348.2,1353.7,1356.5,1373.3,1398,1414.7,1427,1416.4,1412.7,1420.1,1396.4,1398.8,1426.6,1412.85,1400.7,1406,1399.8,1404.4,1415.5,1417.2,1421.9,1415,1413.7,1428.1,1434,1435.7,1427.5,1429.4,1423.9,1425.6,1427.5,1434.8,1422.3,1412.1,1442.5,1448.8,1468.2,1484.3,1501.6,1506.2,1498.6,1488.9,1504.5,1518.3,1513.9,1503.3,1503,1506.5,1502.1,1503,1534.8,1535.3,1541.4,1528.6,1525.6,1535.25,1528.15,1528,1542.6,1514.3,1510.7,1505.5,1492.1,1492.9,1496.8,1493.1,1503.4,1500.9,1490.7,1496.3,1505.3,1505.3,1517.9,1507.4,1507.1,1493.3,1470.5,1465,1480.5,1501.7,1501.4,1493.3,1492.1,1505.1,1495.7,1478,1487.1,1480.8,1480.6,1487,1488.3,1484.8,1484,1490.7,1490.4,1503.1};
+double closes[] = {1283.35,1315.3,1326.1,1317.4,1321.5,1317.4,1323.5,1319.2,1321.3,1323.3,1319.7,1325.1,1323.6,1313.8,1282.05,1279.05,1314.2,1315.2,1310.8,1329.1,1334.5,1340.2,1340.5,1350,1347.1,1344.3,1344.6,1339.7,1339.4,1343.7,1337,1338.9,1340.1,1338.7,1346.8,1324.25,1329.55,1369.6,1372.5,1352.4,1357.6,1354.2,1353.4,1346,1341,1323.8,1311.9,1309.1,1312.2,1310.7,1324.3,1315.7,1322.4,1333.8,1319.4,1327.1,1325.8,1330.9,1325.8,1331.6,1336.5,1346.7,1339.2,1334.7,1313.3,1316.5,1312.4,1313.4,1313.3,1312.2,1313.7,1319.9,1326.3,1331.9,1311.3,1313.4,1309.4,1295.2,1294.7,1294.1,1277.9,1295.8,1291.2,1297.4,1297.7,1306.8,1299.4,1303.6,1302.2,1289.9,1299.2,1301.8,1303.6,1299.5,1303.2,1305.3,1319.5,1313.6,1315.1,1303.5,1293,1294.6,1290.4,1291.4,1302.7,1301,1284.15,1284.95,1294.3,1297.9,1304.1,1322.6,1339.3,1340.1,1344.9,1354,1357.4,1340.7,1342.7,1348.2,1355.1,1355.9,1354.2,1362.1,1360.1,1408.3,1411.2,1429.5,1430.1,1426.8,1423.4,1425.1,1400.8,1419.8,1432.9,1423.55,1412.1,1412.2,1412.8,1424.9,1419.3,1424.8,1426.1,1423.6,1435.9,1440.8,1439.4,1439.7,1434.5,1436.5,1427.5,1432.2,1433.3,1441.8,1437.8,1432.4,1457.5,1476.5,1484.2,1519.6,1509.5,1508.5,1517.2,1514.1,1527.8,1531.2,1523.6,1511.6,1515.7,1515.7,1508.5,1537.6,1537.2,1551.8,1549.1,1536.9,1529.4,1538.05,1535.15,1555.9,1560.4,1525.5,1515.5,1511.1,1499.2,1503.2,1507.4,1499.5,1511.5,1513.4,1515.8,1506.2,1515.1,1531.5,1540.2,1512.3,1515.2,1506.4,1472.9,1489,1507.9,1513.8,1512.9,1504.4,1503.9,1512.8,1500.9,1488.7,1497.6,1483.5,1494,1498.3,1494.1,1488.1,1487.5,1495.7,1504.7,1505.3};
+
+Bar bars[] = {{1546300800, 1, 1284.7f, 1284.75f, 1282.85f, 1283.35f, 1.0f, 1}, {1546387200, 1, 1319.9f, 1320.6f, 1315.0f, 1315.3f, 1.0f, 1}};
+double datesNew[] = {1546300800, 1546387200};
 
 
 ChartWindow::ChartWindow(const std::string& _name)
     : Window(_name)
 {}
 
-ChartWindow::~ChartWindow()
-{}
+ChartWindow::~ChartWindow() = default;
 
 void ChartWindow::Update()
 {
     ImGui::Begin(name.c_str());
+
     // Do stuff here
+    if (ImPlot::BeginPlot("Candlestick Chart", ImGui::GetContentRegionAvail(), ImPlotFlags_Crosshairs))
+    {
+        ImPlot::SetupAxes(nullptr, nullptr, 0, ImPlotAxisFlags_RangeFit);
+        ImPlot::SetupAxesLimits(1546300800, 1571961600, 1250, 1600);
+        ImPlot::SetupAxisScale(ImAxis_X1, ImPlotScale_Time);
+        ImPlot::SetupAxisLimitsConstraints(ImAxis_X1, 1546300800, 1571961600);
+        ImPlot::SetupAxisZoomConstraints(ImAxis_X1, 60*60*24*14, 1571961600-1546300800);
+        ImPlot::SetupAxisFormat(ImAxis_Y1, "$%.0f");
+        // ImplotWrapper::PlotCandlestickOld("TEST", dates, opens, closes, lows, highs, 218, true, 0.25f, ImVec4(0.000f, 1.000f, 0.441f, 1.000f), ImVec4(0.853f, 0.050f, 0.310f, 1.000f));
+        // TODO: put dates in bar
+        ImplotWrapper::PlotCandlestickNew("TEST", bars, datesNew, 2, true, 0.25f, ImVec4(0.000f, 1.000f, 0.441f, 1.000f), ImVec4(0.853f, 0.050f, 0.310f, 1.000f));
+        ImPlot::EndPlot();
+    }
+
     ImGui::End();
 }

MarketSimulator/Source/Ui/uiManager.cpp

@@ -9,29 +9,33 @@
 #include "imgui/imgui_impl_glfw.h"
 #include "imgui/imgui_impl_opengl3.h"
 #include "imgui/imgui_internal.h"
+#include "imgui/implot.h"
 #include "Ui/Window/chartWindow.h"
 
 
-Vector2 UiManager::screenSize = { 0.0f, 0.0f };
+Vector2Int UiManager::screenSize = { 0, 0 };
 std::string UiManager::windowName = "Market Simulator";
 GLFWwindow* UiManager::mainWindow = nullptr;
 std::vector<Window*> UiManager::windows_;
 
 
 void UiManager::InitWindow()
 {
-    // Get screen dimensions
-    RECT desktop;
-    const HWND hDesktop = GetDesktopWindow();
-    GetWindowRect(hDesktop, &desktop);
-
-    screenSize = { static_cast<float>(desktop.right), static_cast<float>(desktop.bottom) };
-
     // Init window
     glfwInit();
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
-    mainWindow = glfwCreateWindow(static_cast<int>(screenSize.x), static_cast<int>(screenSize.y), windowName.c_str(), nullptr, nullptr);
+    glfwWindowHint(GLFW_DECORATED, GLFW_TRUE);
+    glfwWindowHint(GLFW_MAXIMIZED, GLFW_TRUE);
+
+    // Get primary monitor
+    GLFWmonitor* monitor = glfwGetPrimaryMonitor();
+    const GLFWvidmode* mode = glfwGetVideoMode(monitor);
+
+    // monitor dimensions
+    screenSize = { mode->width, mode->height };
+
+    mainWindow = glfwCreateWindow(screenSize.x, screenSize.y, windowName.c_str(), nullptr, nullptr);
     if (mainWindow == nullptr)
     {
         std::cerr << Utils::messageTypeError << "Failed to create GLFW window: " << windowName << std::endl;
@@ -45,6 +49,7 @@ void UiManager::InitImGui()
     // Setup ImGui context
     IMGUI_CHECKVERSION();
     ImGui::CreateContext();
+    ImPlot::CreateContext();
     ImGuiIO& io = ImGui::GetIO(); (void)io;
     io.IniFilename = nullptr;    // Erase previous potentially saved configs
     io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
@@ -253,7 +258,7 @@ void UiManager::Init()
 void UiManager::Update()
 {
     const ImGuiIO& io = ImGui::GetIO();
-    glViewport(0, 0, static_cast<GLsizei>(screenSize.x), static_cast<GLsizei>(screenSize.y));
+    glViewport(0, 0, screenSize.x, screenSize.y);
 
     while (!glfwWindowShouldClose(mainWindow))
     {
@@ -286,6 +291,7 @@ void UiManager::Update()
 
     ImGui_ImplOpenGL3_Shutdown();
     ImGui_ImplGlfw_Shutdown();
+    ImPlot::DestroyContext();
     ImGui::DestroyContext();
     glfwTerminate();
 }
@@ -296,6 +302,6 @@ Window* UiManager::GetWindowByName(const std::string& _name)
         if (window->name == _name)
             return window;
 
-    std::cerr << Utils::messageTypeError << "No window with the name: " << _name.c_str() << " has been found"; 
+    std::cerr << Utils::messageTypeError << "No window with the name: " << _name.c_str() << " has been found" << std::endl; 
     return nullptr;
 }