merge master back to 598 during work #740

caver456 · 2024-06-28T03:57:47Z

No description provided.

- set color and add brackets for hidden teams in tabs list, and update immediately as hidden or unhidden if popup is visible

- first steps at using a style element dict per status, since QTableWidgetItems can't be changed by styleSheet. Probably faster without styleSheet anyway. (This might be a good way to speed up the tab style settings in newEntryProcessTeam and maybe other places too)

- table cell colors including blinking and timeout (should be refactored / combined with code in updateTeamTimers)

same as last commit - forgot to commit radiolog.py

- sort allTeamsList according to extended team name of each entry, so that 'team 9' comes before 'team 10'; this mainly affects the popup, and combo box fields in NED and CCD

- summary table formatting cleanup - summary table 'Other' listing, so the Total value is equal to sum of other row values - remove 'STANDBY' and 'Await.Trans.' rows, to lump them in with 'Other'

- set minimum width of popup to one column - this is only relevant if the popup is shown before any teams exist - show the Other column and count in gray

- display popup teams list in the same sequence as tabbar; this took a surprising amount of shuffling, basically to keep self.allTeamsList in the same grouped sequence as the tabbar, which required some cleanup of the timing of removing unhidden tabs from self.hiddenTeamTabsList

- sidebar show/hide is working, but has issues with sizing (need to clip max height at parent height) and apparently with intercepting key presses (sometimes)

- clean up focus policies, selectability, and editability of both sidebar tables

- sidebar size and position WIP

- position clipping WIP - moved into resizeEvent (more refactor needed since not showEvent only happens once since the sidebar is always 'shown' just moved outside the main window therefore not visible; initially much of the code was put in showEvent since that happened on every show/hide with the previous method)

first commit - CID working well enough to raise a NED - but does not raise changeCallsignDialog

- add notes for sendText and pollGPS outgoing data formats, determined from radtext and realterm - allow string argument for getCallsign

- fsLookup flow is working enough to save and recognize callsigns from NEXEDGE ID - start work on enforcing strings (not integers) throughout for fleet, id, and uid

- filters not working yet, but, some initial refactoring done

filter table and team tab context menu are showing nexedge devices, but, fitlering a nexedge device doesn't prevent a NED

- correctly filter calls from NEXEDGE devices per filter settings - clean up context menu to show NEXEDGE devices as 'NX:#####'

more complete refactor in fsCheck and fsParse; untested

cleanup GPS location parsing code, to correctly check number of tokens for fleetsync vs nexedge, and to accept CID STX thru ETX as part of the first token (using 'in' rather than '==')

pollGPS edits (untested)

…idnt-use-operator-login-in-a-session-where-operator-login-is-enabled fix #637

- changes to make compatible with PyPDF2 3.0.1 - some function names were changed / deprecated / removed for PyPDF2 3.0.0

…prevents-clue-report-print fix #640

…ould-not-trigger-on-subject-located fix #642

…-cprogram-files-x86radiologiconsuser_icon_80pxpng fix #638

- entry saved with previous team - ready for testing for accuracy and clarity

- cleaned up wording for various cases - preserve default KW- callsigns in getNiceTeamName - finished testing

cleaned up some old commented code tests; cleaned up some comments

…-of-callsign 751 add automatic entry on change of callsign

don't reset lastModAge on radioLocField text change; fix some radioLocField update logic

…f-existing-entry-dialog fix #745

- two new columns added to self.fsLog, and corresponding arguments to self.fsLogUpdate: seq is a list of BOT/EOT/GPS events in the entry, and result is newEntry/filtered/continue/etc - full FS (and NXDN) activity is saved in self.fsFullLog on exit, and via backdoor by opening the options dialog - though, windows will prevent overwrite if it's currently being viewed in excel or such

seems to be working for fleetsync. - need to test more -- longer BOT-EOT delay -- NXDN -- use fsTester script to try more scenarios - EOT-only, GPS-only, BOT-following-BOT, EOT-without-any-preceding-BOT, etc - add fsLogUpdate sequence and result for bump

- always call fsGetPrevSeq regardless of type of call (had been only calling it from within CID lines, so, wasn't called for a GPS-only line) - includes fsBypassSequenceChecks optional config file setting - still need to reduce the scope of what gets skipped, to still allow GPS location string updating, even if no NEW is attempted

- improve fsBypassSequenceChecks handling and config file validation - add seq and result to fsLogUpdate for mic bumps and CCD acceptance - reduce scope of what gets bypassed by sequence rules: only bypass the specific attempt to open a NEW; do not bypass attempts to update location strings in any matching dialogs

- final QA completed - slight rule improvement - set result to 'skipped' when matching entry was found but no NEW was attempted

fixed typo for NXDN attemptNEW handling

…uence-to-only-spawn-one-new-per-transmission 722 keep track of bot eot gps sequence to only spawn one new per transmission

possibly all fixed, but need to investigate missing FS/NX tab context menu entries before merging

restored the CCD-accept fsLog entries; enhance fsGetPrevSeq to skip CCD entries

…velopment-for-722 761 ccd fails to pop up during development for 722

…sequence-d-or-d-in-recent-python-versions fix #756

need to do QA for some tracebacks during a test case, to see if they are related

…am-101-back-up WIP

seems to have fixed the bug by adding the 'unhiding' argument and by adding a break in the back-to-back spacers checking loop to prevent recursion issues; but needs a cleanup commit

in rebuildGroupedTabDict, don't add a spacer after a group if all group members are hidden

in newEntry, force unhiding to True if extTeamName is in hiddenTeamTabsList Looks like all the scenarios listed so far are now fixed, but, more QA (and cleanup) is needed before merging.

fix #766

766 team tab hide issues

QA looks good

…ny-incoming-non-mic-bump-call-even-if-no-entry-is-saved fix #750

caver456 added 30 commits January 31, 2023 07:15

WIP

874ee1b

- set color and add brackets for hidden teams in tabs list, and update immediately as hidden or unhidden if popup is visible

WIP style

33f0ce3

- first steps at using a style element dict per status, since QTableWidgetItems can't be changed by styleSheet. Probably faster without styleSheet anyway. (This might be a good way to speed up the tab style settings in newEntryProcessTeam and maybe other places too)

WIP

45177f0

- table cell colors including blinking and timeout (should be refactored / combined with code in updateTeamTimers)

WIP

ba03099

same as last commit - forgot to commit radiolog.py

WIP

af44df6

- sort allTeamsList according to extended team name of each entry, so that 'team 9' comes before 'team 10'; this mainly affects the popup, and combo box fields in NED and CCD

WIP

7f57d2b

- summary table formatting cleanup - summary table 'Other' listing, so the Total value is equal to sum of other row values - remove 'STANDBY' and 'Await.Trans.' rows, to lump them in with 'Other'

WIP

6633840

- set minimum width of popup to one column - this is only relevant if the popup is shown before any teams exist - show the Other column and count in gray

WIP

b260804

- display popup teams list in the same sequence as tabbar; this took a surprising amount of shuffling, basically to keep self.allTeamsList in the same grouped sequence as the tabbar, which required some cleanup of the timing of removing unhidden tabs from self.hiddenTeamTabsList

WIP - sidebar show/hide

a0062de

- sidebar show/hide is working, but has issues with sizing (need to clip max height at parent height) and apparently with intercepting key presses (sometimes)

WIP

b36746b

- clean up focus policies, selectability, and editability of both sidebar tables

WIP

8adf14a

- sidebar size and position WIP

WIP

8047517

first commit - CID working well enough to raise a NED - but does not raise changeCallsignDialog

WIP

bdf619a

- add notes for sendText and pollGPS outgoing data formats, determined from radtext and realterm - allow string argument for getCallsign

WIP

0ba600a

- fsLookup flow is working enough to save and recognize callsigns from NEXEDGE ID - start work on enforcing strings (not integers) throughout for fleet, id, and uid

WIP

1d609f9

- filters not working yet, but, some initial refactoring done

WIP

ddfa5a3

filter table and team tab context menu are showing nexedge devices, but, fitlering a nexedge device doesn't prevent a NED

WIP

8660988

- correctly filter calls from NEXEDGE devices per filter settings - clean up context menu to show NEXEDGE devices as 'NX:#####'

WIP

a53ba04

more complete refactor in fsCheck and fsParse; untested

WIP

780ea0a

cleanup GPS location parsing code, to correctly check number of tokens for fleetsync vs nexedge, and to accept CID STX thru ETX as part of the first token (using 'in' rather than '==')

WIP

1efa881

pollGPS edits (untested)

fix #637

d5beb19

Merge pull request #639 from ncssar/637-deal-with-loaded-files-that-d…

757ca27

…idnt-use-operator-login-in-a-session-where-operator-login-is-enabled fix #637

fix #640

c862ef2

- changes to make compatible with PyPDF2 3.0.1 - some function names were changed / deprecated / removed for PyPDF2 3.0.0

Merge pull request #641 from ncssar/640-pypdf2errorsdeprecationerror-…

5c0bdb7

…prevents-clue-report-print fix #640

3.6.0

d6f6251

fix #642

0cb5d5c

Merge pull request #645 from ncssar/642-looks-like-a-clue-workflow-sh…

8e48cdc

…ould-not-trigger-on-subject-located fix #642

fix #638

2b41f3e

Merge pull request #646 from ncssar/638-operator-image-file-not-found…

8bd5919

…-cprogram-files-x86radiologiconsuser_icon_80pxpng fix #638

caver456 added 30 commits September 2, 2024 09:37

WIP

b2329bc

- entry saved with previous team - ready for testing for accuracy and clarity

WIP

450f93a

- cleaned up wording for various cases - preserve default KW- callsigns in getNiceTeamName - finished testing

cleanup and re-test

30ca72e

cleaned up some old commented code tests; cleaned up some comments

Merge pull request #757 from ncssar/751-add-automatic-entry-on-change…

73f0661

…-of-callsign 751 add automatic entry on change of callsign

fix #745

a3cdc92

don't reset lastModAge on radioLocField text change; fix some radioLocField update logic

Merge pull request #758 from ncssar/745-should-eot-reset-lastmodage-o…

b980847

…f-existing-entry-dialog fix #745

WIP

d07c56b

seems to be working for fleetsync. - need to test more -- longer BOT-EOT delay -- NXDN -- use fsTester script to try more scenarios - EOT-only, GPS-only, BOT-following-BOT, EOT-without-any-preceding-BOT, etc - add fsLogUpdate sequence and result for bump

fix #722

ac009e9

- final QA completed - slight rule improvement - set result to 'skipped' when matching entry was found but no NEW was attempted

NXDN QA fix

ce4009b

fixed typo for NXDN attemptNEW handling

Merge pull request #762 from ncssar/722-keep-track-of-bot-eot-gps-seq…

eba5cac

…uence-to-only-spawn-one-new-per-transmission 722 keep track of bot eot gps sequence to only spawn one new per transmission

WIP

113794b

possibly all fixed, but need to investigate missing FS/NX tab context menu entries before merging

fix #761

c00e3f0

restored the CCD-accept fsLog entries; enhance fsGetPrevSeq to skip CCD entries

Merge pull request #763 from ncssar/761-ccd-fails-to-pop-up-during-de…

0c45373

…velopment-for-722 761 ccd fails to pop up during development for 722

3.12.0

d60440b

fix #756

54df94a

Merge pull request #764 from ncssar/756-syntaxwarning-invalid-escape-…

67f3d70

…sequence-d-or-d-in-recent-python-versions fix #756

WIP

a4799eb

need to do QA for some tracebacks during a test case, to see if they are related

cleanup; fix #728

249034f

Merge pull request #765 from ncssar/728-failure-to-delete-team-tab-te…

3bab4de

…am-101-back-up WIP

WIP

b6fdb82

seems to have fixed the bug by adding the 'unhiding' argument and by adding a break in the back-to-back spacers checking loop to prevent recursion issues; but needs a cleanup commit

cleanup; fix #766

338e224

fix case 1A

857f1c4

in rebuildGroupedTabDict, don't add a spacer after a group if all group members are hidden

WIP

4b67f9b

in newEntry, force unhiding to True if extTeamName is in hiddenTeamTabsList Looks like all the scenarios listed so far are now fixed, but, more QA (and cleanup) is needed before merging.

cleanup and re-QA

ee9a30d

fix #766

Merge pull request #767 from ncssar/766-team-tab-hide-issues

45aee2e

766 team tab hide issues

fix #750

b00f7a7

QA looks good

Merge pull request #769 from ncssar/750-reset-team-timeout-timer-on-a…

58b043e

…ny-incoming-non-mic-bump-call-even-if-no-entry-is-saved fix #750

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

merge master back to 598 during work #740

merge master back to 598 during work #740

caver456 commented Jun 28, 2024

merge master back to 598 during work #740

Are you sure you want to change the base?

merge master back to 598 during work #740

Conversation

caver456 commented Jun 28, 2024