Skip to content

addresses SAM issue 1455#1498

Merged
sjanzou merged 18 commits into
developfrom
SAM_1455
Oct 17, 2023
Merged

addresses SAM issue 1455#1498
sjanzou merged 18 commits into
developfrom
SAM_1455

Conversation

@sjanzou

@sjanzou sjanzou commented Oct 13, 2023 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Goes with NatLabRockies/wex#165

Sort order for technology tree specified in startup.lk as (note that not all technologies have to be specified):
image

Which results in configuration window display as:
image

If no "TechnologyTreeOrder" configopt specified in startup.lk, the result is how items appear in startup.lk:
image

The financial tree and page order sorting has not yet been implemented.

Will proceed based on this pull request feedback

sjanzou added 15 commits October 4, 2023 02:59
@sjanzou
Start of wxMetriDataViewCtrl and model
e59f46f
@sjanzou
Merge branch 'develop' into SAM_1455
53a4c41
@sjanzou
Working on wxMetroDataViewCtrl
f3ac6a5
@sjanzou
Merge branch 'develop' into SAM_1455
6c76ff6
@sjanzou
implement wxMetroDataViewTreeCtrl and model based on wxWidgets source
cf514ed
@sjanzou
testing updated tree control expanding and collapsing
475e2c7
@sjanzou
reset tech tree selections
65bf8b2
@sjanzou
event testing for container selection
8e9d1b8
@sjanzou
Configuration tree working as desired on windows
32ed898
@sjanzou
Remove commented code with events no longer used
4dc3280
@sjanzou
Merge branch 'develop' into SAM_1455
2294bf6
@sjanzou
Fix financial market selection when switching technologies
bab9710
@sjanzou
Left side tree navigation updates - still need sorting.
7e5f7ec
@sjanzou
Merge branch 'develop' into SAM_1455
9dc381d
@sjanzou
Add sorting specification in startup.lk for technology tree
ff87e7e
@sjanzou sjanzou self-assigned this Oct 13, 2023
@sjanzou sjanzou linked an issue Oct 13, 2023 that may be closed by this pull request
MacOS Navigation tree issues #1455
Closed
@mjprilliman

mjprilliman commented Oct 13, 2023

Copy link
Copy Markdown
Collaborator

Is there a way to clear the input page selection from the tree when the Results button next to Simulate is pressed? If you do steps:

  1. Click Simulate
  2. From Results page click an input page to return to inputs.
  3. Click Results button to right of Simulate to return to Results
  4. Click on still highlighted input page in tree.

Nothing happens. The easy workaround is to select a different input page. There is also the question of the Results button being disabled, which has it's own issue #1485

cpaulgilman
cpaulgilman approved these changes Oct 14, 2023
View reviewed changes

@cpaulgilman cpaulgilman left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Configuration Tree sorting works as advertised in Linux (Mint 21.1).

With sorting in startup:

tech-tree-sorted

Without sorting, Hybrid is at bottom:

tech-tree-not-sorted

Note that in Linux, selected technology is white (invisible) when financing is selected (not a high priority to fix):

tech-tree-invisible-tech

@sjanzou

sjanzou commented Oct 15, 2023

Copy link
Copy Markdown
Collaborator Author

Is there a way to clear the input page selection from the tree when the Results button next to Simulate is pressed? If you do steps:

  1. Click Simulate
  2. From Results page click an input page to return to inputs.
  3. Click Results button to right of Simulate to return to Results
  4. Click on still highlighted input page in tree.

Nothing happens. The easy workaround is to select a different input page. There is also the question of the Results button being disabled, which has it's own issue #1485

Updated with latest commit - please retest.

@sjanzou

sjanzou commented Oct 17, 2023

Copy link
Copy Markdown
Collaborator Author

tested RHEL 8.6, MacOS 14.0 and Windows 11

image

@sjanzou sjanzou merged commit ed0b465 into develop Oct 17, 2023
@sjanzou sjanzou deleted the SAM_1455 branch October 17, 2023 08:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cpaulgilman cpaulgilman cpaulgilman approved these changes

@mjprilliman mjprilliman Awaiting requested review from mjprilliman

Assignees

@sjanzou sjanzou

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

MacOS Navigation tree issues

3 participants

@sjanzou @mjprilliman @cpaulgilman