GUI Redesign Incorporation into Master#696
Open
masonwillman wants to merge 505 commits intomasterfrom
Open
Conversation
GUI Redesign Point Initialization Page
GUI Redesign Weather Model Page Refactor
GUI Redesign Initial Ninja Com Integration
…anding and shrinking mainwindow
…nings. seems the duplicate "aboutQtAction" and "exportSolutionAction" were introduced in commit/merge 787ef5e, one of the extra "verticalLayout_26" was added in commit/merge 5f5cc8e, and the additional "verticalLayout_" "_26", "_29", and "_31" were added in commit/merge 006911f. It is confusing though, because some of the later commits/merges make it look like these same changes were added then as well, but I double checked and these commits seem to be the earliest that such additions were found in the raw files of the mainwindow.ui file code. Not detecting any differences in code behavior, so I think that these should be the only quirky changes accidentally introduced during the last few merges.
…nd point radius should update alongside bounding box coordinates, for #648
GUI Redesigns Surface Input Improvements for DEM dowloading and reading
GUI redesign weather model initial work
it technically works, but there's some weird final extra flush-like emit that is occurring after the process is done, leading to the final message and close being replaced with another message
…and numRuns counting methods, it definitely follows the exact method as the old code now. That being said, the method definitely needs refactored to be less confusing. I wrote the old code methods 2 years ago, but apparently I did it too cleverly, because even I am having a rough time reading exactly how it works as it is now. Apparently I was too clever for myself lol. For issue #687
…sured tree properly updates when new dem file is specified
…ector<> of the specific QWidget types. For issue #687
GUI Redesign Map Layer Tree Button
…function, also an improvement to the organization of the domainAvgTable checkRows() app state checking methods. Should be a lot clearer now. For issue #687
…d, moved the state checking to appState, now the icons and tooltips are getting updated accordingly. For issue #687
…, to greying/ungreying. For issue #687
GUI Redesign Domain Avg Table
…from commit 7d8c075, if there are differences between qt4 and qt6 GUI results, it is something else
…to improve inputWindHeight combo boxes while I was at it.
… a bit better, and make it so you don't have to click into the first text box to edit it.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| <link rel="stylesheet" href="leaflet/L.Control.Layers.Tree.css" /> | ||
|
|
||
| <!-- Leaflet and Draw dependencies --> | ||
| <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script> |
Check warning
Code scanning / CodeQL
Inclusion of functionality from an untrusted source Medium
| <!-- Leaflet and Draw dependencies --> | ||
| <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script> | ||
|
|
||
| <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.10.1/jszip.min.js"></script> |
Check warning
Code scanning / CodeQL
Inclusion of functionality from an untrusted source Medium
Collaborator
|
As far as I can tell, it definitely looks good. Not sure if we should try to address the two security things in map.html before the merge, or after the merge. But the overall merge appears to have everything correct. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The GUI Redesign is at an appropriate stage where we need to merge with the master branch. This will allow users to use the updated GUI as needed and provide us developers with up to date ninja code.