Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop to main for 2024.12.12 #181

Merged
merged 58 commits into from
Dec 13, 2024
+410 −7,727
Merged

Develop to main for 2024.12.12 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
e6e65b6
change ci targets to patch
brtietz Dec 13, 2023
e5a6a9b
change a;; ci targets to patch
brtietz Dec 13, 2023
5fc67c8
Merge pull request #167 from NREL/update_ci_targets
brtietz Dec 13, 2023
d81c2b1
Merge in patch branch and re-target develop
brtietz Dec 13, 2023
65866a1
Merge pull request #168 from NREL/patch_to_develop_w_ci
brtietz Dec 13, 2023
9362430
Ci runners (#169)
dguittet Jun 18, 2024
fb8c1d6
Update to minimum MacOS version 12 per SAM #1745
sjanzou Jul 21, 2024
a19b65e
remove wex json implementation - do not commit until urdb in SAM updated
sjanzou Jul 22, 2024
813eedd
Merge pull request #172 from NREL/SAM_1745
sjanzou Jul 23, 2024
635fe0c
Merge branch 'patch' into SAM_486
sjanzou Jul 23, 2024
add07a8
Fix failing GitHub Actions for MacOS
sjanzou Jul 24, 2024
ed4875b
Try to fix default branch issue on Ubuntu and Windows
sjanzou Jul 24, 2024
13f043d
Ubuntu fix to ci.yml
sjanzou Jul 24, 2024
23c7b71
test ci.yml
sjanzou Jul 24, 2024
0e9afb6
GA issues
sjanzou Jul 24, 2024
f68366e
ci.yml update Ubuntu like macos
sjanzou Jul 24, 2024
a9b0620
Ubuntu lk dependencies working - update ssc dependencies
sjanzou Jul 24, 2024
86ceb3d
syntax error
sjanzou Jul 24, 2024
ceb77e7
Fixed Ubuntu sibling dependencies - updating for Windows
sjanzou Jul 24, 2024
29107a3
Windows workflow updates
sjanzou Jul 24, 2024
2ed5cc1
Windows workflow updates for different push/pull branches
sjanzou Jul 24, 2024
93e4448
syntax
sjanzou Jul 24, 2024
a303535
syntax line 178 not 11
sjanzou Jul 24, 2024
a23d56b
Syntax updates for Windows
sjanzou Jul 24, 2024
46e640f
Update shell for windows dependencies
sjanzou Jul 24, 2024
28cf7d0
Windows workflow update
sjanzou Jul 24, 2024
a5623de
Force patch branch for lk dependencies
sjanzou Jul 24, 2024
04daaab
Windows ssc dependencies workflow update
sjanzou Jul 24, 2024
8fd4673
Force patch branch for lk dependency for Windows runner
sjanzou Jul 24, 2024
1e92b89
Merge branch 'SAM_486' of https://github.com/NREL/wex into SAM_486
sjanzou Jul 24, 2024
ec28716
Update and test registration page with RapidJSON
sjanzou Jul 24, 2024
a5511f6
Merge pull request #173 from NREL/SAM_486
sjanzou Jul 28, 2024
4e90c93
force windows runner ssc dependency to patch branch for GitHub Actions
sjanzou Jul 28, 2024
a12d5c9
Testing failing comment in ci.yml
sjanzou Jul 28, 2024
dc10534
Remove failing comment
sjanzou Jul 28, 2024
b10beac
update syntax
sjanzou Jul 28, 2024
555e1a1
windows runner
sjanzou Jul 28, 2024
8eb3ba7
test Windows ssc dependency same as Linux
sjanzou Jul 28, 2024
4c32471
Merge pull request #174 from NREL/windows_runner_issue
sjanzou Jul 28, 2024
0fe6465
Update library calls to std:: namespace per SAM issue 1224
sjanzou Jul 29, 2024
3abf414
Merge pull request #175 from NREL/SAM_1224
sjanzou Jul 30, 2024
e38cb75
Develop merge (#171)
dguittet Jul 30, 2024
edc2573
Add trademark to readme
cpaulgilman Jul 30, 2024
ae68098
Merge branch 'patch' of https://github.com/NREL/wex into patch_to_dev…
brtietz Aug 25, 2024
15d3af0
Assume lk repository owner is always NREL for Windows build (aligns w…
brtietz Aug 25, 2024
62c7578
Merge pull request #177 from NREL/patch_to_develop_240825
brtietz Aug 25, 2024
ae673df
Update README.md
mjprilliman Oct 10, 2024
dadaba4
Merge pull request #178 from NREL/update-readme-licensescan
mjprilliman Oct 11, 2024
49c7b4a
Work on SAM issue 289 - update time series plot axis to ignore leap y…
sjanzou Nov 5, 2024
ed70db2
SAM issue 289 - not yet working
sjanzou Nov 5, 2024
7e24cc2
Rewrite void wxPLTimeAxis::RecalculateTicksAndLabel() to use non-leap…
sjanzou Nov 6, 2024
9dc2182
Remove test labels and unused variables
sjanzou Nov 6, 2024
72e162f
Address feedback for #179
sjanzou Nov 7, 2024
9f31b48
Remove TODO comments that are completed per request in #179
sjanzou Nov 8, 2024
a6795da
Merge pull request #179 from NREL/SAM_289
sjanzou Nov 8, 2024
d64a03f
Change mask color for nan/inf values to light grey; draw layers starting
mjprilliman Nov 18, 2024
f468a77
Assign masking color to wxCONTOUR_BG, apply masking color to heat map
mjprilliman Nov 19, 2024
824c11c
Merge pull request #180 from NREL/contour-nonfinite-masking
sjanzou Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
360 changes: 322 additions & 38 deletions .github/workflows/ci.yml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ option(SAM_SKIP_TOOLS "Skips the wex sandbox and Dview builds" OFF)
#

if (APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
set(CMAKE_OSX_DEPLOYMENT_TARGET "12" CACHE STRING "Minimum OS X deployment version")
endif ()

if (UNIX AND NOT CMAKE_C_COMPILER)
Expand Down
4 changes: 1 addition & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# WEX: Extensions Library for wxWidgets
[![TravisCI](https://travis-ci.org/NREL/wex.svg?branch=develop)](https://travis-ci.org/NREL/wex)
[![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgit.luolix.top%2FNREL%2Fwex.svg?type=shield)](https://app.fossa.io/projects/git%2Bgit.luolix.top%2FNREL%2Fwex?ref=badge_shield)

WEX is a library of extensions to the [wxWidgets](https://www.wxwidgets.org/) cross-platform user interface (UI) library. These extensions are for custom UI widgets developed for the National Renewable Energy Laboratory's [System Advisor Model (SAM)](https://sam.nrel.gov) and [DView](https://github.com/NREL/wex/wiki/DView) data visualization software.
WEX is a library of extensions to the [wxWidgets](https://www.wxwidgets.org/) cross-platform user interface (UI) library. These extensions are for custom UI widgets developed for the National Renewable Energy Laboratory's [System Advisor Model™ (SAM™)](https://sam.nrel.gov) and [DView](https://github.com/NREL/wex/wiki/DView) data visualization software.

WEX also includes two executable programs:

Expand Down
215 changes: 0 additions & 215 deletions include/wex/json_defs.h
View file
Open in desktop

This file was deleted.

Loading
Loading