From 673a2cccc9e5e2bfe7168c21302bf5c9c201b13e Mon Sep 17 00:00:00 2001
From: Kim Wall <30846798+kimble4@users.noreply.github.com>
Date: Mon, 28 Nov 2022 20:52:00 +0000
Subject: [PATCH 11/53] Add field to existing database
---
CrossMgrVideo/Database.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/CrossMgrVideo/Database.py b/CrossMgrVideo/Database.py
index 5d70ce80e..f35648a68 100644
--- a/CrossMgrVideo/Database.py
+++ b/CrossMgrVideo/Database.py
@@ -122,6 +122,9 @@ def __init__( self, fname=None, initTables=True, fps=30 ):
cols = cur.fetchall()
if cols:
col_names = {col[1] for col in cols}
+ if 'machine' not in col_names:
+ print( "Adding machine column to database..." )
+ self.conn.execute( 'ALTER TABLE trigger ADD COLUMN machine TEXT DEFAULT ""' )
if 'note' not in col_names:
self.conn.execute( 'ALTER TABLE trigger ADD COLUMN note TEXT DEFAULT ""' )
if 'kmh' not in col_names:
From e5334c015ed9c1ee1ce7dc1b78e7f92e085b63db Mon Sep 17 00:00:00 2001
From: Kim Wall <30846798+kimble4@users.noreply.github.com>
Date: Mon, 28 Nov 2022 20:54:29 +0000
Subject: [PATCH 12/53] Remove debug statement
---
CrossMgrVideo/Database.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/CrossMgrVideo/Database.py b/CrossMgrVideo/Database.py
index f35648a68..08fa3040e 100644
--- a/CrossMgrVideo/Database.py
+++ b/CrossMgrVideo/Database.py
@@ -123,7 +123,6 @@ def __init__( self, fname=None, initTables=True, fps=30 ):
if cols:
col_names = {col[1] for col in cols}
if 'machine' not in col_names:
- print( "Adding machine column to database..." )
self.conn.execute( 'ALTER TABLE trigger ADD COLUMN machine TEXT DEFAULT ""' )
if 'note' not in col_names:
self.conn.execute( 'ALTER TABLE trigger ADD COLUMN note TEXT DEFAULT ""' )
From 66ae6970f38d9776fa72c8f9c284dda1a944dc97 Mon Sep 17 00:00:00 2001
From: Kim Wall <30846798+kimble4@users.noreply.github.com>
Date: Tue, 29 Nov 2022 00:24:10 +0000
Subject: [PATCH 13/53] Add menu to toggle columns in trigger list
---
CrossMgrVideo/MainWin.py | 38 +++++++++++++++++++++++++++++++++++---
1 file changed, 35 insertions(+), 3 deletions(-)
diff --git a/CrossMgrVideo/MainWin.py b/CrossMgrVideo/MainWin.py
index 781e46b17..49338a9f4 100644
--- a/CrossMgrVideo/MainWin.py
+++ b/CrossMgrVideo/MainWin.py
@@ -30,6 +30,7 @@
from time import sleep
import numpy as np
from queue import Queue, Empty
+import ast
from datetime import datetime, timedelta, time
@@ -626,10 +627,11 @@ def __init__( self, parent, id = wx.ID_ANY, title='', size=(1000,800) ):
self.triggerList.SetImageList(self.il, wx.IMAGE_LIST_SMALL)
self.fieldCol = {f:c for c, f in enumerate('ts bib name machine team wave race_name frames view kmh mph note'.split())}
- headers = ['Time', 'Bib', 'Name', 'Machine', 'Team', 'Wave', 'Race', 'Frames', 'View', 'km/h', 'mph', 'Note']
+ self.fieldHeaders = ['Time', 'Bib', 'Name', 'Machine', 'Team', 'Wave', 'Race', 'Frames', 'View', 'km/h', 'mph', 'Note']
formatRightHeaders = {'Bib','Frames','km/h','mph'}
formatMiddleHeaders = {'View',}
- for i, h in enumerate(headers):
+ self.hiddenTriggerCols = []
+ for i, h in enumerate(self.fieldHeaders):
if h in formatRightHeaders:
align = wx.LIST_FORMAT_RIGHT
elif h in formatMiddleHeaders:
@@ -644,6 +646,7 @@ def __init__( self, parent, id = wx.ID_ANY, title='', size=(1000,800) ):
self.triggerList.Bind( wx.EVT_LIST_ITEM_RIGHT_CLICK, self.onTriggerRightClick )
self.triggerList.Bind( wx.EVT_LIST_KEY_DOWN, self.onTriggerKey )
#self.triggerList.Bind( wx.EVT_LIST_DELETE_ITEM, self.onTriggerDelete )
+ self.triggerList.Bind( wx.EVT_LIST_COL_RIGHT_CLICK, self.onTriggerColumnRightClick )
vsTriggers = wx.BoxSizer( wx.VERTICAL )
vsTriggers.Add( hsDate )
@@ -1183,7 +1186,11 @@ def getTriggerRowFromID( self, id ):
def updateTriggerColumnWidths( self ):
for c in range(self.triggerList.GetColumnCount()):
- self.triggerList.SetColumnWidth(c, wx.LIST_AUTOSIZE_USEHEADER if c != self.iNoteCol else 100 )
+ if not c in self.hiddenTriggerCols:
+ self.triggerList.SetColumnWidth(c, wx.LIST_AUTOSIZE_USEHEADER if c != self.iNoteCol else 100 )
+ else:
+ #if column is hidden, just set the width to zero
+ self.triggerList.SetColumnWidth( c, 0 )
def updateTriggerRow( self, row, fields ):
''' Update the row in the UI only. '''
@@ -1580,6 +1587,29 @@ def onTriggerEdit( self, event ):
self.iTriggerSelect = event.Index
self.doTriggerEdit()
+ def onTriggerColumnRightClick( self, event ):
+ # Create and display a popup menu of columns on right-click event
+ menu = wx.Menu()
+ menu.SetTitle( 'Show/Hide columns' )
+ for c in range(self.triggerList.GetColumnCount()):
+ menuItem = menu.AppendCheckItem( wx.ID_ANY, self.fieldHeaders[c] )
+ self.Bind(wx.EVT_MENU, self.onToggleTriggerColumn)
+ if not c in self.hiddenTriggerCols:
+ menu.Check( menuItem.GetId(), True )
+ self.PopupMenu(menu)
+ menu.Destroy()
+
+ def onToggleTriggerColumn( self, event ):
+ #find the column number
+ label = event.GetEventObject().FindItemById(event.GetId()).GetItemLabel()
+ c = self.fieldHeaders.index(label)
+ #add or remove from hidden columns and update width
+ if c in self.hiddenTriggerCols:
+ self.hiddenTriggerCols.remove( c )
+ else:
+ self.hiddenTriggerCols.append( c )
+ self.updateTriggerColumnWidths()
+
def showMessages( self ):
while True:
message = self.messageQ.get()
@@ -1858,6 +1888,7 @@ def writeOptions( self ):
self.config.Write( 'SecondsAfter', '{:.3f}'.format(self.tdCaptureAfter.total_seconds()) )
self.config.WriteFloat( 'ZoomMagnification', self.finishStrip.GetZoomMagnification() )
self.config.WriteInt( 'ClosestFrames', self.closestFrames )
+ self.config.Write( 'HiddenTriggerCols', repr(self.hiddenTriggerCols) )
self.config.Flush()
def readOptions( self ):
@@ -1878,6 +1909,7 @@ def readOptions( self ):
pass
self.finishStrip.SetZoomMagnification( self.config.ReadFloat('ZoomMagnification', 0.5) )
self.closestFrames = self.config.ReadInt( 'ClosestFrames', 0 )
+ self.hiddenTriggerCols = ast.literal_eval( self.config.Read( 'HiddenTriggerCols', '[]' ) )
def getCameraInfo( self ):
width, height = self.getCameraResolution()
From ad0a7bef11194128771f3e4cb2a0d79f1d0dcac1 Mon Sep 17 00:00:00 2001
From: Kim Wall <30846798+kimble4@users.noreply.github.com>
Date: Tue, 29 Nov 2022 17:27:31 +0000
Subject: [PATCH 14/53] Hiding of columns in SeriesMgr Results grid
---
SprintMgr/Results.py | 1385 ++++++++++++++++++++++++++++++++++--------
1 file changed, 1145 insertions(+), 240 deletions(-)
diff --git a/SprintMgr/Results.py b/SprintMgr/Results.py
index e2966a8cf..3c4252f04 100644
--- a/SprintMgr/Results.py
+++ b/SprintMgr/Results.py
@@ -1,300 +1,1200 @@
-import os
-import sys
import wx
import wx.grid as gridlib
-from operator import attrgetter
-import TestData
-import Model
+import os
+import io
+from html import escape
+from urllib.parse import quote
+import sys
+import base64
+import datetime
+
import Utils
+import SeriesModel
+import GetModelInfo
from ReorderableGrid import ReorderableGrid
-from Competitions import SetDefaultData
-from Utils import WriteCell
-from Events import FontSize
+from FitSheetWrapper import FitSheetWrapper
+import FtpWriteFile
+from ExportGrid import tag
+
+import xlwt
+import io
+import re
+import webbrowser
+import subprocess
+import platform
+
+reNoDigits = re.compile( '[^0-9]' )
+
+HeaderNamesTemplate = ['Pos', 'Name', 'License', 'Machine', 'Team']
+def getHeaderNames():
+ return HeaderNamesTemplate + ['Total Time' if SeriesModel.model.scoreByTime else 'Points', 'Gap']
+
+#----------------------------------------------------------------------------------
+
+def toFloat( n ):
+ try:
+ return float(n)
+ except Exception:
+ pass
+ try:
+ return float(n.split()[0])
+ except Exception:
+ pass
+ try:
+ return float(n.split(',')[0])
+ except Exception:
+ pass
+
+ if ':' in n:
+ t = 0.0
+ for v in n.split(':'):
+ try:
+ t = t * 60.0 + float(v)
+ except Exception:
+ return -1
+ return t
+
+ return -1.0
+
+def getHeaderGraphicBase64():
+ if Utils.mainWin:
+ b64 = Utils.mainWin.getGraphicBase64()
+ if b64:
+ return b64
+ graphicFName = os.path.join(Utils.getImageFolder(), 'SeriesMgr128.png')
+ with open(graphicFName, 'rb') as f:
+ s64 = base64.standard_b64encode(f.read())
+ return 'data:image/png;base64,{}'.format(s64)
+
+def getHtmlFileName():
+ modelFileName = Utils.getFileName() if Utils.getFileName() else 'Test.smn'
+ fileName = os.path.basename( os.path.splitext(modelFileName)[0] + '.html' )
+ defaultPath = os.path.dirname( modelFileName )
+ return os.path.join( defaultPath, fileName )
+
+def getHtml( htmlfileName=None, seriesFileName=None ):
+ model = SeriesModel.model
+ scoreByTime = model.scoreByTime
+ scoreByPercent = model.scoreByPercent
+ scoreByTrueSkill = model.scoreByTrueSkill
+ bestResultsToConsider = model.bestResultsToConsider
+ mustHaveCompleted = model.mustHaveCompleted
+ hasUpgrades = model.upgradePaths
+ considerPrimePointsOrTimeBonus = model.considerPrimePointsOrTimeBonus
+ raceResults = model.extractAllRaceResults()
+
+ categoryNames = model.getCategoryNamesSortedPublish()
+ if not categoryNames:
+ return 'SeriesMgr: No Categories.'
+
+ HeaderNames = getHeaderNames()
+ pointsForRank = { r.getFileName(): r.pointStructure for r in model.races }
+
+ if not seriesFileName:
+ seriesFileName = (os.path.splitext(Utils.mainWin.fileName)[0] if Utils.mainWin and Utils.mainWin.fileName else 'Series Results')
+ title = os.path.basename( seriesFileName )
+
+ licenseLinkTemplate = model.licenseLinkTemplate
+
+ pointsStructures = {}
+ pointsStructuresList = []
+ for race in model.races:
+ if race.pointStructure not in pointsStructures:
+ pointsStructures[race.pointStructure] = []
+ pointsStructuresList.append( race.pointStructure )
+ pointsStructures[race.pointStructure].append( race )
+
+ html = io.open( htmlfileName, 'w', encoding='utf-8', newline='' )
+
+ def write( s ):
+ html.write( '{}'.format(s) )
+
+ with tag(html, 'html'):
+ with tag(html, 'head'):
+ with tag(html, 'title'):
+ write( title.replace('\n', ' ') )
+ with tag(html, 'meta', {'charset':'UTF-8'}):
+ pass
+ for k, v in model.getMetaTags():
+ with tag(html, 'meta', {'name':k, 'content':v}):
+ pass
+ with tag(html, 'style', dict( type="text/css")):
+ write( '''
+body{ font-family: sans-serif; }
+
+h1{ font-size: 250%; }
+h2{ font-size: 200%; }
+
+#idRaceName {
+ font-size: 200%;
+ font-weight: bold;
+}
+#idImgHeader { box-shadow: 4px 4px 4px #888888; }
+.smallfont { font-size: 80%; }
+.bigfont { font-size: 120%; }
+.hidden { display: none; }
+
+#buttongroup {
+ margin:4px;
+ float:left;
+}
+
+#buttongroup label {
+ float:left;
+ margin:4px;
+ background-color:#EFEFEF;
+ border-radius:4px;
+ border:1px solid #D0D0D0;
+ overflow:auto;
+ cursor: pointer;
+}
+
+#buttongroup label span {
+ text-align:center;
+ padding:8px 8px;
+ display:block;
+}
+
+#buttongroup label input {
+ position:absolute;
+ top:-20px;
+}
+
+#buttongroup input:checked + span {
+ background-color:#404040;
+ color:#F7F7F7;
+}
+
+#buttongroup .yellow {
+ background-color:#FFCC00;
+ color:#333;
+}
+
+#buttongroup .blue {
+ background-color:#00BFFF;
+ color:#333;
+}
+
+#buttongroup .pink {
+ background-color:#FF99FF;
+ color:#333;
+}
+
+#buttongroup .green {
+ background-color:#7FE57F;
+ color:#333;
+}
+#buttongroup .purple {
+ background-color:#B399FF;
+ color:#333;
+}
+
+table.results {
+ font-family:"Trebuchet MS", Arial, Helvetica, sans-serif;
+ border-collapse:collapse;
+}
+table.results td, table.results th {
+ font-size:1em;
+ padding:3px 7px 2px 7px;
+ text-align: left;
+}
+table.results th {
+ font-size:1.1em;
+ text-align:left;
+ padding-top:5px;
+ padding-bottom:4px;
+ background-color:#7FE57F;
+ color:#000000;
+ vertical-align:bottom;
+}
+table.results tr.odd {
+ color:#000000;
+ background-color:#EAF2D3;
+}
+
+.smallFont {
+ font-size: 75%;
+}
+
+table.results td.leftBorder, table.results th.leftBorder
+{
+ border-left:1px solid #98bf21;
+}
+
+table.results tr:hover
+{
+ color:#000000;
+ background-color:#FFFFCC;
+}
+table.results tr.odd:hover
+{
+ color:#000000;
+ background-color:#FFFFCC;
+}
+
+table.results td.colSelect
+{
+ color:#000000;
+ background-color:#FFFFCC;
+}}
+
+table.results td {
+ border-top:1px solid #98bf21;
+}
+
+table.results td.noborder {
+ border-top:0px solid #98bf21;
+}
+
+table.results td.rightAlign, table.results th.rightAlign {
+ text-align:right;
+}
+
+table.results td.leftAlign, table.results th.leftAlign {
+ text-align:left;
+}
+
+.topAlign {
+ vertical-align:top;
+}
+
+table.results th.centerAlign, table.results td.centerAlign {
+ text-align:center;
+}
-Arrow = '\u2192'
+.ignored {
+ color: #999;
+ font-style: italic;
+}
+
+table.points tr.odd {
+ color:#000000;
+ background-color:#EAF2D3;
+}
+
+.rank {
+ color: #999;
+ font-style: italic;
+}
+
+.points-cell {
+ text-align: right;
+ padding:3px 7px 2px 7px;
+}
+
+select {
+ font: inherit;
+}
+
+hr { clear: both; }
+
+@media print {
+ .noprint { display: none; }
+ .title { page-break-after: avoid; }
+}
+''')
+
+ with tag(html, 'script', dict( type="text/javascript")):
+ write( '\nvar catMax={};\n'.format( len(categoryNames) ) )
+ write( '''
+function removeClass( classStr, oldClass ) {
+ var classes = classStr.split( ' ' );
+ var ret = [];
+ for( var i = 0; i < classes.length; ++i ) {
+ if( classes[i] != oldClass )
+ ret.push( classes[i] );
+ }
+ return ret.join(' ');
+}
+
+function addClass( classStr, newClass ) {
+ return removeClass( classStr, newClass ) + ' ' + newClass;
+}
+
+function selectCategory( iCat ) {
+ for( var i = 0; i < catMax; ++i ) {
+ var e = document.getElementById('catContent' + i);
+ if( i == iCat || iCat < 0 )
+ e.className = removeClass(e.className, 'hidden');
+ else
+ e.className = addClass(e.className, 'hidden');
+ }
+}
+
+function sortTable( table, col, reverse ) {
+ var tb = table.tBodies[0];
+ var tr = Array.prototype.slice.call(tb.rows, 0);
+
+ var parseRank = function( s ) {
+ if( !s )
+ return 999999;
+ var fields = s.split( '(' );
+ return parseInt( fields[1] );
+ }
+
+ var cmpPos = function( a, b ) {
+ return parseInt( a.cells[0].textContent.trim() ) - parseInt( b.cells[0].textContent.trim() );
+ };
+
+ var MakeCmpStable = function( a, b, res ) {
+ if( res != 0 )
+ return res;
+ return cmpPos( a, b );
+ };
+
+ var cmpFunc;
+ if( col == 0 || col == 4 || col == 5 ) { // Pos, Points or Gap
+ cmpFunc = cmpPos;
+ }
+ else if( col >= 6 ) { // Race Points/Time and Rank
+ cmpFunc = function( a, b ) {
+ var x = parseRank( a.cells[6+(col-6)*2+1].textContent.trim() );
+ var y = parseRank( b.cells[6+(col-6)*2+1].textContent.trim() );
+ return MakeCmpStable( a, b, x - y );
+ };
+ }
+ else { // Rider data field.
+ cmpFunc = function( a, b ) {
+ return MakeCmpStable( a, b, a.cells[col].textContent.trim().localeCompare(b.cells[col].textContent.trim()) );
+ };
+ }
+ tr = tr.sort( function (a, b) { return reverse * cmpFunc(a, b); } );
+
+ for( var i = 0; i < tr.length; ++i) {
+ tr[i].className = (i % 2 == 1) ? addClass(tr[i].className,'odd') : removeClass(tr[i].className,'odd');
+ tb.appendChild( tr[i] );
+ }
+}
+
+var ssPersist = {};
+function sortTableId( iTable, iCol ) {
+ var upChar = ' ▲', dnChar = ' ▼';
+ var isNone = 0, isDn = 1, isUp = 2;
+ var id = 'idUpDn' + iTable + '_' + iCol;
+ var upDn = document.getElementById(id);
+ var sortState = ssPersist[id] ? ssPersist[id] : isNone;
+ var table = document.getElementById('idTable' + iTable);
+
+ // Clear all sort states.
+ var row0Len = table.tBodies[0].rows[0].cells.length;
+ for( var i = 0; i < row0Len; ++i ) {
+ var idCur = 'idUpDn' + iTable + '_' + i;
+ var ele = document.getElementById(idCur);
+ if( ele ) {
+ ele.innerHTML = '';
+ ssPersist[idCur] = isNone;
+ }
+ }
+
+ if( iCol == 0 ) {
+ sortTable( table, 0, 1 );
+ return;
+ }
+
+ ++sortState;
+ switch( sortState ) {
+ case isDn:
+ upDn.innerHTML = dnChar;
+ sortTable( table, iCol, 1 );
+ break;
+ case isUp:
+ upDn.innerHTML = upChar;
+ sortTable( table, iCol, -1 );
+ break;
+ default:
+ sortState = isNone;
+ sortTable( table, 0, 1 );
+ break;
+ }
+ ssPersist[id] = sortState;
+}
+''' )
+
+ with tag(html, 'body'):
+ with tag(html, 'table'):
+ with tag(html, 'tr'):
+ with tag(html, 'td', dict(valign='top')):
+ write( ''.format(getHeaderGraphicBase64()) )
+ with tag(html, 'td'):
+ with tag(html, 'h1', {'style': 'margin-left: 1cm;'}):
+ write( escape(model.name) )
+ with tag(html, 'h2', {'style': 'margin-left: 1cm;'}):
+ if model.organizer:
+ write( 'by {}'.format(escape(model.organizer)) )
+ with tag(html, 'span', {'style': 'font-size: 60%'}):
+ write( ' ' * 5 )
+ write( ' Updated: {}'.format(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')) )
+
+ with tag(html, 'h3' ):
+ with tag(html, 'label', {'for':'categoryselect'} ):
+ write( 'Category' + ':' )
+ with tag(html, 'select', {'name': 'categoryselect', 'onchange':'selectCategory(parseInt(this.value,10))'} ):
+ with tag(html, 'option', {'value':-1} ):
+ with tag(html, 'span'):
+ write( 'All' )
+ for iTable, categoryName in enumerate(categoryNames):
+ with tag(html, 'option', {'value':iTable} ):
+ with tag(html, 'span'):
+ write( '{}'.format(escape(categoryName)) )
+
+ for iTable, categoryName in enumerate(categoryNames):
+ results, races, potentialDuplicates = GetModelInfo.GetCategoryResults(
+ categoryName,
+ raceResults,
+ pointsForRank,
+ useMostEventsCompleted=model.useMostEventsCompleted,
+ numPlacesTieBreaker=model.numPlacesTieBreaker )
+ results = [rr for rr in results if toFloat(rr[4]) > 0.0]
+
+ headerNames = HeaderNames + ['{}'.format(r[1]) for r in races]
+
+ with tag(html, 'div', {'id':'catContent{}'.format(iTable)} ):
+ write( '
CrossMgr
-
+
Click and Drag in Photo to Zoom.