Skip to content

Commit 8a38a89

Browse files
committed
-
1 parent 3dc96d5 commit 8a38a89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+6445
-22238
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,5 @@
4141
/bin/iagp.dll
4242
/bin/imguipack.dll
4343
/bin/luajit.dll
44+
/bin/plugins/luajit_debug.dll
45+
/bin/*.ltg

3rdparty/ezlibs

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ if(WIN32)
7575
add_definitions(-DWIN32)
7676
endif()
7777

78-
add_definitions(-DUSE_XML_CONFIG)
7978
add_definitions(-DUSE_STD_FILESYSTEM)
8079
add_definitions(-DIMGUI_ENABLE_FREETYPE)
8180
add_definitions(-DIMGUI_DEFINE_MATH_OPERATORS)
@@ -87,6 +86,7 @@ add_definitions(-DCUSTOM_IMWIDGETS_CONFIG="${CMAKE_SOURCE_DIR}/src/headers/Custo
8786
add_definitions(-DCUSTOM_IN_APP_GPU_PROFILER_CONFIG="${CMAKE_SOURCE_DIR}/src/headers/CustomInAppGpuProfiler.h")
8887
add_definitions(-DCUSTOM_IMGUIFILEDIALOG_CONFIG="${CMAKE_SOURCE_DIR}/src/headers/CustomImGuiFileDialogConfig.h")
8988
add_definitions(-DCUSTOM_LOG_TO_GRAPH_BACKEND_CONFIG="${CMAKE_SOURCE_DIR}/src/headers/CustomStrockerBackendConfig.h")
89+
add_definitions(-DCUSTOM_THEME_HELPER_CONFIG_HEADER="${CMAKE_SOURCE_DIR}/src/headers/CustomImGuiThemeHelperConfigHeader.h")
9090

9191
include(cmake/3rdparty.cmake)
9292

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
LogToGraph_Windows_Release_x64_v0.2.970
1+
LogToGraph_Windows_Debug_x64_v0.2.979

cmake/Maintained/ezlibs.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ else()
2727
endif()
2828

2929
file(GLOB_RECURSE EZ_LIBS_SOURCES ${EZLIBS_INCLUDE_DIR}/ezlibs/*.hpp)
30-
source_group(TREE ${EZLIBS_INCLUDE_DIR}/ezlibs PREFIX EzLibs FILES ${EZ_LIBS_SOURCES})
30+
source_group(TREE ${EZLIBS_INCLUDE_DIR}/ezlibs PREFIX ezlibs FILES ${EZ_LIBS_SOURCES})
3131

3232
set(EZ_LIBS_SOURCES ${EZ_LIBS_SOURCES})
3333

main.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ limitations under the License.
2121
#include <string>
2222
#include <iostream>
2323

24-
#define EZ_LOG_IMPLEMENTATION
2524
#include <ezlibs/ezLog.hpp>
2625
#include <ezlibs/ezTools.hpp>
2726

@@ -39,15 +38,14 @@ int main(int argc, char** argv) {
3938
try {
4039
App app(argc, argv);
4140
app.run();
41+
ez::Log::instance()->close();
4242
} catch (const std::exception& e) {
4343
LogVarLightInfo("Exception %s", e.what());
44-
ez::Log::Instance()->Close();
44+
ez::Log::instance()->close();
4545
EZ_TOOLS_DEBUG_BREAK;
4646
return EXIT_FAILURE;
4747
}
4848

49-
ez::Log::Instance()->Close();
50-
5149
#ifdef _MSC_VER
5250
#ifdef _DEBUG
5351
_CrtMemState sNew;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#define LuaScripting_Prefix "LuaScripting"
4-
#define LuaScripting_BuildNumber 53
4+
#define LuaScripting_BuildNumber 65
55
#define LuaScripting_MinorNumber 0
66
#define LuaScripting_MajorNumber 0
7-
#define LuaScripting_BuildId "0.0.53"
7+
#define LuaScripting_BuildId "0.0.65"

plugins/LuaScripting/src/LuaScripting.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ LuaScripting::LuaScripting() = default;
3030

3131
bool LuaScripting::init(ez::Log* vLoggerInstancePtr) {
3232
m_SettingsPtr = std::make_shared<Settings>();
33-
ez::Log::Instance(vLoggerInstancePtr); // get the instance from the host app
33+
ez::Log::instance(vLoggerInstancePtr); // get the instance from the host app
3434
return true;
3535
}
3636

plugins/LuaScripting/src/Modules/LuaDatasModel.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ double LuaDatasModel::stringToEpoch(const std::string& vDateTime, double vHourOf
6161
if (dateStream.fail()) {
6262
throw std::invalid_argument("Invalid date format");
6363
}
64-
timeStruct.tm_hour += vHourOffset;
64+
timeStruct.tm_hour += static_cast<int32_t>(vHourOffset);
65+
timeStruct.tm_isdst = 1;
6566
dateStream >> delimiter >> microseconds;
6667
std::time_t epochSeconds = std::mktime(&timeStruct);
6768
if (epochSeconds == -1) {
@@ -78,7 +79,8 @@ std::string LuaDatasModel::epochToString(double vEpochTime, double vHourOffset)
7879
if (!timeStruct) {
7980
throw std::runtime_error("Failed to convert epoch time to struct tm");
8081
}
81-
timeStruct->tm_hour += vHourOffset;
82+
timeStruct->tm_hour += static_cast<int32_t>(vHourOffset);
83+
timeStruct->tm_isdst = 1;
8284
std::ostringstream dateStream;
8385
dateStream << std::put_time(timeStruct, "%Y-%m-%d %H:%M:%S");
8486
dateStream << '.' << std::setfill('0') << std::setw(6) << microseconds;

0 commit comments

Comments
 (0)