early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,24 @@
diff --git a/gpPanel/gpPanel.cpp b/gpPanel/gpPanel.cpp
index 7af20b5..908523c 100644
--- a/gpPanel/gpPanel.cpp
+++ b/gpPanel/gpPanel.cpp
@@ -720,8 +720,8 @@ void gpPanel::OnMenuItemPrintPreview(wxCommandEvent& event)
gpLayer_s *gp = GetLayerByMenuId(event.GetId() );
if(gp==NULL)return;
- mpPrintout *plotPrint = new mpPrintout(gp->m_plot, gp->layer->GetName());
- mpPrintout *plotPrintPreview = new mpPrintout(gp->m_plot, gp->layer->GetName());
+ mpPrintout *plotPrint = new mpPrintout(gp->m_plot, gp->layer->GetName().c_str());
+ mpPrintout *plotPrintPreview = new mpPrintout(gp->m_plot, gp->layer->GetName().c_str());
wxPrintPreview *preview = new wxPrintPreview(plotPrintPreview, plotPrint);
@@ -765,7 +765,7 @@ void gpPanel::OnMenuItemSaveScreenshot(wxCommandEvent& event)
if(index!=-1)
{
wxString reso = aChoices.Item(index);
- if( reso.CompareTo(_("custom")) == 0 ){
+ if( reso.CompareTo(_("custom").c_str()) == 0 ){
reso = wxGetTextFromUser(_("Write image resolution (format: [width]x[height]"), _("Custom resolution for image"), _("640x480"), this);
}
if(reso.Find('x') != -1)

32
externals/vcpkg/ports/gppanel/CMakeLists.txt vendored Executable file
View File

@@ -0,0 +1,32 @@
cmake_minimum_required(VERSION 3.13)
project(gpPanel CXX)
set(wxWidgets_EXCLUDE_COMMON_LIBRARIES TRUE)
find_package(wxWidgets REQUIRED COMPONENTS core base)
include(${wxWidgets_USE_FILE})
file(GLOB_RECURSE SOURCES "gpPanel/*.cpp")
file(GLOB HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/include" "include/*.h")
add_library(gpPanel STATIC ${SOURCES})
target_compile_definitions(gpPanel PRIVATE _CRT_SECURE_NO_WARNINGS)
target_include_directories(gpPanel PUBLIC
$<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
)
target_link_libraries(gpPanel PRIVATE ${wxWidgets_LIBRARIES})
install(TARGETS gpPanel EXPORT gpPanel-config
RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
)
install(EXPORT gpPanel-config DESTINATION share/cmake/gpPanel)
foreach(HEADER ${HEADERS})
get_filename_component(HEADER_DIR ${HEADER} DIRECTORY)
install(FILES include/${HEADER} DESTINATION include/gpPanel/${HEADER_DIR})
endforeach()

26
externals/vcpkg/ports/gppanel/portfile.cmake vendored Executable file
View File

@@ -0,0 +1,26 @@
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO woollybah/gppanel
REF f58a9028f7c9a8e9b4324ff2165951f558365f90
SHA512 4ec5fbef4c487d351c60f48b0c0e41c5d077989ab96f827b9fd5ef01c167d50f39a313bd82db1b5df19d14025983e83db4d19cc4048c1c50fc8ef9128de15575
HEAD_REF master
PATCHES 00001-fix-build.patch
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/gpPanel)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/gppanel/copyright COPYONLY)

10
externals/vcpkg/ports/gppanel/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,10 @@
{
"name": "gppanel",
"version-date": "2020-05-20",
"port-version": 1,
"description": "gpPanel is chart library for wxWidget. It inheritance from wxPanel and use modified wxMathPlot library at chart engine.",
"homepage": "https://github.com/woollybah/gppanel",
"dependencies": [
"wxwidgets"
]
}