diff --git a/CrossMgrVideo/CrossMgrVideoHtml/main.html b/CrossMgrVideo/CrossMgrVideoHtml/main.html
index 5fb3f8010..09481d01b 100644
--- a/CrossMgrVideo/CrossMgrVideoHtml/main.html
+++ b/CrossMgrVideo/CrossMgrVideoHtml/main.html
@@ -533,9 +533,9 @@
trigger_div.scrollTop = trigger_div.scrollHeight;
}
-const headers = ['', 'Time', 'Bib', 'Last', 'First', 'Team', 'Wave', 'Race', 'Frames', 'View', 'Note'];
-const fields = ['close', 'ts', 'bib', 'last_name', 'first_name', 'team', 'wave', 'race_name', 'frames', 'view', 'note'];
-const numeric = [false, false, true, false, false, false, false, false, true, true, false];
+const headers = ['', 'Time', 'Bib', 'Last', 'First', 'Machine', 'Team', 'Wave', 'Race', 'Frames', 'View', 'Note'];
+const fields = ['close', 'ts', 'bib', 'last_name', 'first_name', 'machine', 'team', 'wave', 'race_name', 'frames', 'view', 'note'];
+const numeric = [false, false, true, false, false, false, false, false, false, true, true, false];
function showTriggers( triggers ) {
playStop();
diff --git a/CrossMgrVideo/Database.py b/CrossMgrVideo/Database.py
index 9f7a76eb2..ec1bc280b 100644
--- a/CrossMgrVideo/Database.py
+++ b/CrossMgrVideo/Database.py
@@ -60,7 +60,7 @@ def default_str( d ):
class Database:
triggerFieldsAll = (
- 'id','ts','s_before','s_after','ts_start','closest_frames','bib','first_name','last_name','team','wave','race_name',
+ 'id','ts','s_before','s_after','ts_start','closest_frames','bib','first_name','last_name','machine','team','wave','race_name',
'note','kmh','frames',
'finish_direction',
'zoom_frame', 'zoom_x', 'zoom_y', 'zoom_width', 'zoom_height',
@@ -71,7 +71,7 @@ class Database:
triggerFieldsInput = tuple( triggerFieldsAllSet
- {'id', 'note', 'kmh', 'frames', 'finish_direction', 'zoom_frame', 'zoom_x', 'zoom_y', 'zoom_width', 'zoom_height',}) # Fields to compare for equality of triggers.
triggerFieldsUpdate = ('wave','race_name',)
- triggerEditFields = ('bib', 'first_name', 'last_name', 'team', 'wave', 'race_name', 'note',)
+ triggerEditFields = ('bib', 'first_name', 'last_name', 'machine', 'team', 'wave', 'race_name', 'note',)
@staticmethod
def isValidDatabase( fname ):
@@ -126,6 +126,8 @@ 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:
+ 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:
@@ -169,6 +171,7 @@ def __init__( self, fname=None, initTables=True, fps=30 ):
('bib', 'INTEGER', 'ASC', None),
('first_name', 'TEXT', 'ASC', None),
('last_name', 'TEXT', 'ASC', None),
+ ('machine', 'TEXT', 'ASC', None),
('team', 'TEXT', 'ASC', None),
('wave', 'TEXT', 'ASC', None),
('race_name', 'TEXT', 'ASC', None),
diff --git a/CrossMgrVideo/MainWin.py b/CrossMgrVideo/MainWin.py
index 1900a8c90..0a86586a8 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
@@ -630,11 +631,12 @@ def __init__( self, parent, id = wx.ID_ANY, title='', size=(1000,800) ):
images.extend( [self.sm_up, self.sm_dn] )
self.triggerList.SetSmallImages( images )
- self.fieldCol = {f:c for c, f in enumerate('ts bib name team wave race_name frames view kmh mph note'.split())}
- headers = ['Time', 'Bib', 'Name', 'Team', 'Wave', 'Race', 'Frames', 'View', 'km/h', 'mph', 'Note']
+ self.fieldCol = {f:c for c, f in enumerate('ts bib name machine team wave race_name frames view kmh mph note'.split())}
+ 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:
@@ -649,6 +651,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 )
@@ -1043,7 +1046,7 @@ def write_photos( dirname, infoList ):
tsBest, jpgBest = GlobalDatabase().getBestTriggerPhoto( info['id'] )
if jpgBest is None:
continue
- args = {k:info[k] for k in ('ts', 'bib', 'first_name', 'last_name', 'team', 'race_name', 'kmh')}
+ args = {k:info[k] for k in ('ts', 'bib', 'first_name', 'last_name', 'machine', 'team', 'race_name', 'kmh')}
try:
args['raceSeconds'] = (info['ts'] - info['ts_start']).total_seconds()
except Exception:
@@ -1059,7 +1062,7 @@ def write_photos( dirname, infoList ):
info['first_name'],
)
)
- comment = json.dumps( {k:info[k] for k in ('bib', 'first_name', 'last_name', 'team', 'race_name')} )
+ comment = json.dumps( {k:info[k] for k in ('bib', 'first_name', 'last_name', 'machine', 'team', 'race_name')} )
try:
with open(os.path.join(dirname, fname), 'wb') as f:
f.write( AddExifToJpeg(jpg, info['ts'], comment) )
@@ -1132,7 +1135,7 @@ def publish_web_photos( dirname, infoList, singleFile ):
if jpgBest is None:
continue
- args = {k:info[k] for k in ('ts', 'bib', 'first_name', 'last_name', 'team', 'race_name', 'kmh')}
+ args = {k:info[k] for k in ('ts', 'bib', 'first_name', 'last_name', 'machine', 'team', 'race_name', 'kmh')}
try:
args['raceSeconds'] = (info['ts'] - info['ts_start']).total_seconds()
except Exception:
@@ -1140,7 +1143,7 @@ def publish_web_photos( dirname, infoList, singleFile ):
if isinstance(args['kmh'], str):
args['kmh'] = float( '0' + re.sub( '[^0-9.]', '', args['kmh'] ) )
- comment = json.dumps( {k:info[k] for k in ('bib', 'first_name', 'last_name', 'team', 'race_name')} )
+ comment = json.dumps( {k:info[k] for k in ('bib', 'first_name', 'last_name', 'machine', 'team', 'race_name')} )
jpg = CVUtil.bitmapToJPeg( AddPhotoHeader(CVUtil.jpegToBitmap(jpgBest), **args) )
jpg = AddExifToJpeg( jpg, info['ts'], comment )
@@ -1184,7 +1187,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. '''
@@ -1307,6 +1314,7 @@ def updateSnapshot( self, t, f ):
'bib': self.snapshotCount,
'first_name': '',
'last_name': 'Snapshot',
+ 'machine': '',
'team': '',
'wave': '',
'race_name': '',
@@ -1602,6 +1610,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()
@@ -1750,6 +1781,7 @@ def processRequests( self ):
'bib': msg.get('bib', 99999),
'first_name': msg.get('first_name','') or msg.get('firstName',''),
'last_name': msg.get('last_name','') or msg.get('lastName',''),
+ 'machine': msg.get('machine',''),
'team': msg.get('team',''),
'wave': msg.get('wave',''),
'race_name': msg.get('race_name','') or msg.get('raceName',''),
@@ -1880,6 +1912,7 @@ def writeOptions( self ):
self.config.Write( 'SecondsBefore', '{:.3f}'.format(self.tdCaptureBefore.total_seconds()) )
self.config.Write( 'SecondsAfter', '{:.3f}'.format(self.tdCaptureAfter.total_seconds()) )
self.config.WriteFloat( 'ZoomMagnification', self.finishStrip.GetZoomMagnification() )
+ self.config.Write( 'HiddenTriggerCols', repr(self.hiddenTriggerCols) )
self.config.WriteInt( 'ClosestFrames', self.autoCaptureClosestFrames )
self.config.Flush()
@@ -1900,6 +1933,7 @@ def readOptions( self ):
except Exception:
pass
self.finishStrip.SetZoomMagnification( self.config.ReadFloat('ZoomMagnification', 0.5) )
+ self.hiddenTriggerCols = ast.literal_eval( self.config.Read( 'HiddenTriggerCols', '[]' ) )
self.autoCaptureClosestFrames = self.config.ReadInt( 'ClosestFrames', 0 )
def getCameraInfo( self ):
diff --git a/CrossMgrVideo/helptxt/QuickStart.md b/CrossMgrVideo/helptxt/QuickStart.md
index e71efb59d..443607870 100644
--- a/CrossMgrVideo/helptxt/QuickStart.md
+++ b/CrossMgrVideo/helptxt/QuickStart.md
@@ -211,7 +211,9 @@ Window containing the triggers.
* Left-click: shows the photos associated with the trigger.
* Right-click: brings up an Edit... and Delete... menu.
-* Double-click: brings up the Edit window. This allows you to change the Bib, First, Last, Team, Wave, Race and Note of the trigger.
+* Double-click: brings up the Edit window. This allows you to change the Bib, First, Last, Machine, Team, Wave, Race and Note of the trigger.
+
+Columns can be hidden or shown by right-clicking on the header row.
Triggers can be created manually with __Snapshot__, __Auto Capture__, __Capture__ or when connected to CrossMgr, from CrossMgr entries. CrossMgr can be configured to create a trigger for every entry, or just the last entry in the race (see CrossMgr help for details on the Camera setup).
diff --git a/FtpWriteFile.py b/FtpWriteFile.py
index 553ef79bf..2a5c554df 100644
--- a/FtpWriteFile.py
+++ b/FtpWriteFile.py
@@ -4,7 +4,9 @@
import os
import sys
import webbrowser
+import ftplib
import ftputil
+import ftputil.session
import paramiko
from urllib.parse import quote
import datetime
@@ -21,10 +23,10 @@ def lineno():
return inspect.currentframe().f_back.f_lineno
class CallCloseOnExit:
- def __enter__(self, obj):
+ def __init__(self, obj):
self.obj = obj
- return obj
-
+ def __enter__(self):
+ return self.obj
def __exit__(self, exc_type, exc_val, exc_tb):
self.obj.close()
@@ -55,8 +57,35 @@ def sftp_mkdir_p( sftp, remote_directory ):
# Create new dirs starting from the last one that existed.
for i in range( i_dir_last, len(dirs_exist) ):
sftp.mkdir( '/'.join(dirs_exist[:i+1]) )
-
-def FtpWriteFile( host, user='anonymous', passwd='anonymous@', timeout=30, serverPath='.', fname='', useSftp=False, sftpPort=22, callback=None ):
+
+
+class FtpWithPort(ftplib.FTP):
+ def __init__(self, host, user, passwd, port, timeout):
+ #Act like ftplib.FTP's constructor but connect to another port.
+ ftplib.FTP.__init__(self)
+ #self.set_debuglevel(2)
+ self.connect(host, port, timeout)
+ self.login(user, passwd)
+
+class FtpsWithPort(ftplib.FTP_TLS):
+ def __init__(self, host, user, passwd, port, timeout):
+ ftplib.FTP_TLS.__init__(self)
+ #self.set_debuglevel(2)
+ self.connect(host, port, timeout)
+ self.auth()
+ self.login(user, passwd)
+ #Switch to secure data connection.
+ self.prot_p()
+
+ def ntransfercmd(self, cmd, rest=None):
+ conn, size = ftplib.FTP.ntransfercmd(self, cmd, rest)
+ if self._prot_p:
+ conn = self.context.wrap_socket(conn,
+ server_hostname=self.host,
+ session=self.sock.session) #reuse ssl session
+ return conn, size
+
+def FtpWriteFile( host, port, user='anonymous', passwd='anonymous@', timeout=30, serverPath='.', fname='', protocol='FTP', callback=None ):
if isinstance(fname, str):
fname = [fname]
@@ -64,7 +93,7 @@ def FtpWriteFile( host, user='anonymous', passwd='anonymous@', timeout=30, serve
# Normalize serverPath.
serverPath = serverPath.strip().replace('\\', '/').rstrip('/')
- if not useSftp:
+ if protocol != 'SFTP':
# Stops ftputils from going into an infinite loop by removing leading slashes..
serverPath = serverPath.lstrip('/').lstrip('\\')
@@ -85,22 +114,22 @@ def FtpWriteFile( host, user='anonymous', passwd='anonymous@', timeout=30, serve
return
'''
- if useSftp:
+ if protocol == 'SFTP':
with CallCloseOnExit(paramiko.SSHClient()) as ssh:
ssh.set_missing_host_key_policy( paramiko.AutoAddPolicy() )
ssh.load_system_host_keys()
- ssh.connect( host, sftpPort, username, passwd )
+ ssh.connect( host, port, user, passwd )
with CallCloseOnExit(ssh.open_sftp()) as sftp:
sftp_mkdir_p( sftp, serverPath )
for i, f in enumerate(fname):
sftp.put(
- filePath,
+ f,
serverPath + '/' + os.path.basename(f),
SftpCallback( callback, f, i ) if callback else None
)
- else:
- with ftputil.FTPHost( host, user, passwd ) as ftp_host:
+ elif protocol == 'FTPS':
+ with ftputil.FTPHost(host, user, passwd, port, timeout, session_factory=FtpsWithPort) as ftp_host:
ftp_host.makedirs( serverPath, exist_ok=True )
for i, f in enumerate(fname):
ftp_host.upload_if_newer(
@@ -108,6 +137,18 @@ def FtpWriteFile( host, user='anonymous', passwd='anonymous@', timeout=30, serve
serverPath + '/' + os.path.basename(f),
(lambda byteStr, fname=f, i=i: callback(byteStr, fname, i)) if callback else None
)
+ ftp_host.close()
+
+ else: #default to unencrypted FTP
+ with ftputil.FTPHost(host, user, passwd, port, timeout, session_factory=FtpWithPort) as ftp_host:
+ ftp_host.makedirs( serverPath, exist_ok=True )
+ for i, f in enumerate(fname):
+ ftp_host.upload_if_newer(
+ f,
+ serverPath + '/' + os.path.basename(f),
+ (lambda byteStr, fname=f, i=i: callback(byteStr, fname, i)) if callback else None
+ )
+ ftp_host.close()
def FtpIsConfigured():
with Model.LockRace() as race:
@@ -126,10 +167,11 @@ def FtpUploadFile( fname=None, callback=None ):
params = {
'host': getattr(race, 'ftpHost', '').strip().strip('\t'), # Fix cut and paste problems.
+ 'port': getattr(race, 'ftpPort', 21),
'user': getattr(race, 'ftpUser', ''),
'passwd': getattr(race, 'ftpPassword', ''),
'serverPath': getattr(race, 'ftpPath', ''),
- 'useSftp': getattr(race, 'useSftp', False),
+ 'protocol': getattr(race, 'ftpProtocol', 'FTP'),
'fname': fname or [],
'callback': callback,
}
@@ -350,8 +392,8 @@ def getTitleTextSize( font ):
#------------------------------------------------------------------------------------------------
-ftpFields = ['ftpHost', 'ftpPath', 'ftpPhotoPath', 'ftpUser', 'ftpPassword', 'useSftp', 'ftpUploadDuringRace', 'urlPath', 'ftpUploadPhotos']
-ftpDefaults = ['', '', '', 'anonymous', 'anonymous@', False, False, 'http://', False]
+ftpFields = ['ftpHost', 'ftpPort', 'ftpPath', 'ftpPhotoPath', 'ftpUser', 'ftpPassword', 'ftpUploadDuringRace', 'urlPath', 'ftpUploadPhotos']
+ftpDefaults = ['', 21, '', '', 'anonymous', 'anonymous@', False, 'http://', False]
def GetFtpPublish( isDialog=True ):
ParentClass = wx.Dialog if isDialog else wx.Panel
@@ -364,11 +406,17 @@ def __init__( self, parent, id=wx.ID_ANY, uploadNowButton=True ):
else:
super().__init__( parent, id )
+ self.protocol = 'FTP'
+
fgs = wx.FlexGridSizer(vgap=4, hgap=4, rows=0, cols=2)
fgs.AddGrowableCol( 1, 1 )
- self.useSftp = wx.CheckBox( self, label=_("Use SFTP Protocol (on port 22)") )
+ self.useFtp = wx.RadioButton( self, label=_("FTP (unencrypted)"), style = wx.RB_GROUP )
+ self.useFtps = wx.RadioButton( self, label=_("FTPS (FTP with TLS)") )
+ self.useSftp = wx.RadioButton( self, label=_("SFTP (SSH file transfer)") )
+ self.Bind( wx.EVT_RADIOBUTTON,self.onSelectProtocol )
self.ftpHost = wx.TextCtrl( self, size=(256,-1), style=wx.TE_PROCESS_ENTER, value='' )
+ self.ftpPort = wx.lib.intctrl.IntCtrl( self, size=(256,-1), style=wx.TE_PROCESS_ENTER )
self.ftpPath = wx.TextCtrl( self, size=(256,-1), style=wx.TE_PROCESS_ENTER, value='' )
self.ftpUploadPhotos = wx.CheckBox( self, label=_("Upload Photos to Path") )
self.ftpUploadPhotos.Bind( wx.EVT_CHECKBOX, self.ftpUploadPhotosChanged )
@@ -393,12 +441,20 @@ def __init__( self, parent, id=wx.ID_ANY, uploadNowButton=True ):
self.cancelBtn = wx.Button( self, wx.ID_CANCEL )
self.Bind( wx.EVT_BUTTON, self.onCancel, self.cancelBtn )
+ fgs.Add( wx.StaticText( self, label = _("Protocol")), flag=wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL )
+ fgs.Add( self.useFtp, 1, flag=wx.TOP|wx.ALIGN_LEFT)
fgs.AddSpacer( 16 )
- fgs.Add( self.useSftp )
+ fgs.Add( self.useFtps, 1, flag=wx.TOP|wx.ALIGN_LEFT)
+ fgs.AddSpacer( 16 )
+ fgs.Add( self.useSftp, 1, flag=wx.TOP|wx.ALIGN_LEFT)
+
fgs.Add( wx.StaticText( self, label = _("Host Name")), flag=wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL )
fgs.Add( self.ftpHost, 1, flag=wx.TOP|wx.ALIGN_LEFT|wx.EXPAND )
+ fgs.Add( wx.StaticText( self, label = _("Port")), flag=wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL )
+ fgs.Add( self.ftpPort, 1, flag=wx.TOP|wx.ALIGN_LEFT|wx.EXPAND )
+
fgs.Add( wx.StaticText( self, label = _("Upload files to Path")), flag=wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL )
fgs.Add( self.ftpPath, 1, flag=wx.EXPAND )
@@ -459,6 +515,17 @@ def __init__( self, parent, id=wx.ID_ANY, uploadNowButton=True ):
fgs.AddSpacer( 4 )
self.SetSizerAndFit( fgs )
fgs.Fit( self )
+
+ def onSelectProtocol( self, event ):
+ if self.useSftp.GetValue():
+ self.protocol = 'SFTP'
+ self.ftpPort.SetValue(22)
+ elif self.useFtps.GetValue():
+ self.protocol = 'FTPS'
+ self.ftpPort.SetValue(21)
+ else:
+ self.protocol = 'FTP'
+ self.ftpPort.SetValue(21)
def onFtpTest( self, event ):
self.commit()
@@ -531,6 +598,7 @@ def refresh( self ):
else:
for f, v in zip(ftpFields, ftpDefaults):
getattr(self, f).SetValue( getattr(race, f, v) )
+ self.protocol = getattr(race, 'ftpProtocol', '')
self.urlPathChanged()
self.ftpUploadPhotosChanged()
@@ -540,6 +608,7 @@ def commit( self ):
if race:
for f in ftpFields:
setattr( race, f, getattr(self, f).GetValue() )
+ setattr( race, 'ftpProtocol', self.protocol)
race.urlFull = self.urlFull.GetLabel()
race.setChanged()
diff --git a/MainWin.py b/MainWin.py
index d4f3bd783..26f3507a9 100644
--- a/MainWin.py
+++ b/MainWin.py
@@ -1862,8 +1862,8 @@ def getBasePayload( self, publishOnly=True ):
payload = {}
payload['raceName'] = os.path.basename(self.fileName or '')[:-4]
- iTeam = ReportFields.index('Team')
- payload['infoFields'] = ReportFields[:iTeam] + ['Name'] + ReportFields[iTeam:]
+ iMachine = ReportFields.index('Machine')
+ payload['infoFields'] = ReportFields[:iMachine] + ['Name'] + ReportFields[iMachine:]
payload['organizer'] = getattr(race, 'organizer', '')
payload['reverseDirection'] = getattr(race, 'reverseDirection', False)
diff --git a/Properties.py b/Properties.py
index aea8a5cd8..ea5c4a11f 100644
--- a/Properties.py
+++ b/Properties.py
@@ -825,13 +825,13 @@ def __init__( self, parent, id=wx.ID_ANY, testCallback=None, ftpCallback=None ):
self.ftpCallback = ftpCallback
if ftpCallback:
- ftpBtn = wx.ToggleButton( self, label=_('Configure Ftp') )
+ ftpBtn = wx.ToggleButton( self, label=_('Configure FTP') )
ftpBtn.Bind( wx.EVT_TOGGLEBUTTON, ftpCallback )
else:
ftpBtn = None
explain = [
- wx.StaticText(self,label=_('Choose File Formats to Publish. Select Ftp option to upload files to Ftp server.')),
+ wx.StaticText(self,label=_('Choose File Formats to Publish. Select FTP option to upload files to (S)FTP server.')),
]
font = explain[0].GetFont()
fontUnderline = wx.FFont( font.GetPointSize(), font.GetFamily(), flags=wx.FONTFLAG_BOLD )
@@ -839,7 +839,7 @@ def __init__( self, parent, id=wx.ID_ANY, testCallback=None, ftpCallback=None ):
fgs = wx.FlexGridSizer( cols=4, rows=0, hgap=0, vgap=1 )
self.widget = []
- headers = [_('Format'), _('Ftp'), _('Note'), '']
+ headers = [_('Format'), _('FTP'), _('Note'), '']
for h in headers:
st = wx.StaticText(self, label=h)
st.SetFont( fontUnderline )
@@ -1273,7 +1273,7 @@ def __init__( self, parent, id=wx.ID_ANY, addEditButton=True ):
('raceOptionsProperties', RaceOptionsProperties, _('Race Options') ),
('rfidProperties', RfidProperties, _('RFID') ),
('webProperties', WebProperties, _('Web') ),
- ('ftpProperties', FtpProperties, _('FTP') ),
+ ('ftpProperties', FtpProperties, _('(S)FTP') ),
('batchPublishProperties', BatchPublishProperties, _('Batch Publish') ),
('gpxProperties', GPXProperties, _('GPX') ),
('notesProperties', NotesProperties, _('Notes') ),
diff --git a/ReadSignOnSheet.py b/ReadSignOnSheet.py
index 5b18d01f0..087277338 100644
--- a/ReadSignOnSheet.py
+++ b/ReadSignOnSheet.py
@@ -34,6 +34,7 @@
Fields = [
_('Bib#'),
_('LastName'), _('FirstName'),
+ _('Machine'),
_('Team'),
_('City'), _('State'), _('Prov'), _('StateProv'), _('Nat.'),
_('Category'), _('EventCategory'), _('Age'), _('Gender'),
diff --git a/Results.py b/Results.py
index 53ba84176..6b5d31c49 100644
--- a/Results.py
+++ b/Results.py
@@ -174,6 +174,7 @@ def __init__( self, parent, id = wx.ID_ANY ):
self.labelGrid.DisableDragRowSize()
# put a tooltip on the cells in a column
self.labelGrid.GetGridWindow().Bind(wx.EVT_MOTION, self.onMouseOver)
+ #
self.lapGrid = ColGrid.ColGrid( self.splitter, style=wx.BORDER_SUNKEN )
self.lapGrid.SetRowLabelSize( 0 )
@@ -195,6 +196,7 @@ def __init__( self, parent, id = wx.ID_ANY ):
self.Bind( wx.grid.EVT_GRID_CELL_RIGHT_CLICK, self.doRightClick )
self.lapGrid.Bind( wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.doLabelClick )
self.labelGrid.Bind( wx.grid.EVT_GRID_LABEL_LEFT_CLICK, self.doLabelClick )
+ self.labelGrid.Bind( wx.grid.EVT_GRID_LABEL_RIGHT_CLICK, self.onLabelColumnRightClick )
bs = wx.BoxSizer(wx.VERTICAL)
#bs.Add(self.hbs)
@@ -386,6 +388,31 @@ def doRightClick( self, event ):
self.PopupMenu( menu )
except Exception as e:
Utils.writeLog( 'Results:doRightClick: {}'.format(e) )
+
+ def onLabelColumnRightClick( 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.labelGrid.GetNumberCols() ):
+ menuItem = menu.AppendCheckItem( wx.ID_ANY, self.labelGrid.GetColLabelValue( c ) )
+ self.Bind( wx.EVT_MENU, self.onToggleLabelColumn )
+ if self.labelGrid.IsColShown( c ):
+ menu.Check( menuItem.GetId(), True )
+ self.PopupMenu(menu)
+ menu.Destroy()
+
+ def onToggleLabelColumn( self, event ):
+ #find the column number
+ colLabels = []
+ for c in range( self.labelGrid.GetNumberCols() ):
+ colLabels.append( self.labelGrid.GetColLabelValue( c ) )
+ label = event.GetEventObject().FindItemById( event.GetId() ).GetItemLabel()
+ c = colLabels.index( label )
+ with Model.LockRace() as race:
+ if self.labelGrid.IsColShown( c ):
+ self.labelGrid.HideCol( c )
+ else:
+ self.labelGrid.ShowCol( c )
def OnPopupCorrect( self, event ):
CorrectNumber( self, self.entry )
diff --git a/SendPhotoRequests.py b/SendPhotoRequests.py
index 2794f904f..63417c0f3 100644
--- a/SendPhotoRequests.py
+++ b/SendPhotoRequests.py
@@ -41,7 +41,7 @@ def getRequest( race, dirName, bib, raceSeconds, externalInfo ):
info['wave'] = category.fullname if category else ''
try:
riderInfo = externalInfo[bib]
- for a, b in (('firstName', 'FirstName'), ('lastName','LastName'), ('team', 'Team')):
+ for a, b in (('firstName', 'FirstName'), ('lastName','LastName'), ('machine', 'Machine'), ('team', 'Team')):
try:
info[a] = riderInfo[b]
except KeyError:
diff --git a/SeriesMgr/Aliases.py b/SeriesMgr/Aliases.py
index 8ab16b6bd..18999c941 100644
--- a/SeriesMgr/Aliases.py
+++ b/SeriesMgr/Aliases.py
@@ -1,9 +1,9 @@
import wx
-import os
-import sys
-import SeriesModel
-import Utils
from AliasGrid import AliasGrid
+from AliasesName import AliasesName
+from AliasesLicense import AliasesLicense
+from AliasesMachine import AliasesMachine
+from AliasesTeam import AliasesTeam
def normalizeText( text ):
return ', '.join( [t.strip() for t in text.split(',')][:2] )
@@ -11,111 +11,60 @@ def normalizeText( text ):
class Aliases(wx.Panel):
def __init__(self, parent):
wx.Panel.__init__(self, parent)
+ self.notebook = wx.Notebook( self )
+ self.notebook.Bind( wx.EVT_NOTEBOOK_PAGE_CHANGED, self.onPageChanging )
- text = (
- 'Name Aliases match different name spellings to the same participant.\n'
- 'This can be more convenient than editing race results when the same participant has resullts under different names.\n'
- '\n'
- 'To create a name Alias, first press the "Add Reference Name" button.\n'
- 'The first column is the name that will appear in Results.'
- 'Then, add Aliases in the next column separated by ";" (semicolons). These are the alternate spellings of the name.\n'
- 'SeriesMgr will match all Aliases to the Reference Name in the Results.\n'
- '\n'
- 'For example, Reference Name="Bell, Robert", Aliases="Bell, Bobby; Bell, Bob". Results for the alternate spellings will appear as "Bell, Robert".\n'
- 'Accents and upper/lower case are ignored.\n'
- '\n'
- 'You can Copy-and-Paste names from the Results without retyping them. Right-click and Copy the name in the Results page,'
- 'then Paste the name into the Reference Name or Alias field.\n'
- 'Aliases will not be applied until you press the "Refresh" button on the Results screen (or reload).\n'
- 'This allows you to configure many Aliases without having to wait for the Results update after each change.\n'
- )
+ # Add all the pages to the notebook.
+ self.pages = []
+
+ def addPage( page, name ):
+ self.notebook.AddPage( page, name )
+ self.pages.append( page )
+
+ self.attrClassName = [
+ [ 'aliasesName', AliasesName, 'Name Aliases' ],
+ [ 'licenseAliases', AliasesLicense, 'License Aliases' ],
+ [ 'machineAliases', AliasesMachine, 'Machine Aliases' ],
+ [ 'teamAliases', AliasesTeam, 'Team Aliases' ],
+ ]
- self.explain = wx.StaticText( self, label=text )
- self.explain.SetFont( wx.Font((0,15), wx.FONTFAMILY_SWISS, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False) )
+ for i, (a, c, n) in enumerate(self.attrClassName):
+ setattr( self, a, c(self.notebook) )
+ addPage( getattr(self, a), n )
- self.addButton = wx.Button( self, label='Add Reference Name' )
- self.addButton.Bind( wx.EVT_BUTTON, self.onAddButton )
+ self.notebook.SetSelection( 0 )
- headerNames = ('Name (Last, First)','Aliases separated by ";"')
- self.itemCur = None
- self.grid = AliasGrid( self )
- self.grid.CreateGrid( 0, len(headerNames) )
- self.grid.SetRowLabelSize( 64 )
- for col in range(self.grid.GetNumberCols()):
- self.grid.SetColLabelValue( col, headerNames[col] )
-
- sizer = wx.BoxSizer(wx.VERTICAL)
- sizer.Add(self.explain, 0, flag=wx.ALL, border=4 )
- sizer.Add(self.addButton, 0, flag=wx.ALL, border = 4)
- sizer.Add(self.grid, 1, flag=wx.EXPAND|wx.ALL, border = 4)
- self.SetSizer(sizer)
-
- def onAddButton( self, event ):
- defaultText = ''
+ sizer = wx.BoxSizer( wx.VERTICAL )
+ sizer.Add( self.notebook, 1, flag=wx.EXPAND )
+ self.SetSizer( sizer )
- # Initialize the name from the clipboard.
- if wx.TheClipboard.Open():
- do = wx.TextDataObject()
- if wx.TheClipboard.GetData(do):
- defaultText = do.GetText()
- wx.TheClipboard.Close()
-
- self.grid.AppendRows( 1 )
- self.grid.SetCellValue( self.grid.GetNumberRows()-1, 0, defaultText )
- self.grid.AutoSize()
- self.GetSizer().Layout()
- self.grid.MakeCellVisible( self.grid.GetNumberRows()-1, 0 )
-
- def getName( self, s ):
- name = [t.strip() for t in s.split(',')[:2]]
- if not name or not any(name):
- return None
- name.extend( [''] * (2 - len(name)) )
- return tuple( name )
+ wx.CallAfter( self.Refresh )
+ def refreshCurrentPage( self ):
+ self.callPageRefresh( self.notebook.GetSelection() )
+
def refresh( self ):
- model = SeriesModel.model
+ self.refreshCurrentPage()
+
+ def callPageRefresh( self, i ):
+ try:
+ self.pages[i].refresh()
+ except (AttributeError, IndexError) as e:
+ pass
- Utils.AdjustGridSize( self.grid, rowsRequired=len(model.references) )
- for row, (reference, aliases) in enumerate(model.references):
- self.grid.SetCellValue( row, 0, '{}, {}'.format(*reference) )
- self.grid.SetCellValue( row, 1, '; '.join('{}, {}'.format(*a) for a in aliases) )
-
- self.grid.AutoSize()
- self.GetSizer().Layout()
-
def commit( self ):
- references = []
+ self.callPageCommit( self.notebook.GetSelection() )
- self.grid.SaveEditControlValue()
- for row in range(self.grid.GetNumberRows()):
- reference = self.getName( self.grid.GetCellValue( row, 0 ) )
- if reference:
- aliases = [a.strip() for a in self.grid.GetCellValue(row, 1).split(';')]
- aliases = [self.getName(a) for a in aliases if a]
- aliases = [a for a in aliases if a]
- references.append( (reference, aliases) )
+ def callPageCommit( self, i ):
+ try:
+ self.pages[i].commit()
+ except (AttributeError, IndexError) as e:
+ pass
- references.sort()
+ def onPageChanging( self, event ):
+ self.callPageCommit( event.GetOldSelection() )
+ self.callPageRefresh( event.GetSelection() )
+ event.Skip() # Required to properly repaint the screen.
- model = SeriesModel.model
- model.setReferences( references )
-
-#----------------------------------------------------------------------------
-
-class AliasesFrame(wx.Frame):
- def __init__(self):
- wx.Frame.__init__(self, None, title="Aliases Test", size=(800,600) )
- self.panel = Aliases(self)
- self.Show()
-
-if __name__ == "__main__":
- app = wx.App(False)
- model = SeriesModel.model
- model.setReferences( [
- [('Bell', 'Robert'), [('Bell', 'Bobby'), ('Bell', 'Bob'), ('Bell', 'B')]],
- [('Sitarski', 'Stephen'), [('Sitarski', 'Steve'), ('Sitarski', 'Steven')]],
- ] )
- frame = AliasesFrame()
- frame.panel.refresh()
- app.MainLoop()
+ def getGrid( self ):
+ return self.pages[self.notebook.GetSelection()].getGrid()
diff --git a/SeriesMgr/AliasesLicense.py b/SeriesMgr/AliasesLicense.py
index 0ac9c2d4a..bdd958eb5 100644
--- a/SeriesMgr/AliasesLicense.py
+++ b/SeriesMgr/AliasesLicense.py
@@ -88,6 +88,8 @@ def commit( self ):
model = SeriesModel.model
model.setReferenceLicenses( references )
+ def getGrid( self ):
+ return self.grid
#----------------------------------------------------------------------------
class AliasesLicenseFrame(wx.Frame):
diff --git a/SeriesMgr/AliasesMachine.py b/SeriesMgr/AliasesMachine.py
new file mode 100644
index 000000000..8dfaacccf
--- /dev/null
+++ b/SeriesMgr/AliasesMachine.py
@@ -0,0 +1,110 @@
+import wx
+import os
+import sys
+import SeriesModel
+import Utils
+from AliasGrid import AliasGrid
+
+class AliasesMachine(wx.Panel):
+ def __init__(self, parent):
+ wx.Panel.__init__(self, parent)
+
+ text = (
+ 'Machine Aliases match alternate machine names to the same machine.\n'
+ 'This can be more convenient than editing race results when the same machine appears with a different spelling.\n'
+ '\n'
+ 'To create a machine Alias, first press the "Add Reference Machine" button.\n'
+ 'The first column is the Machine that will appear in Results.\n'
+ 'The second column are the Machine Aliases, separated by ";". These are the alternate machine names.\n'
+ 'SeriesMgr will match all aliased Machines to the Reference Machine in the Results.\n'
+ '\n'
+ 'For example, Reference Machine="ICE Trike", AliasesMachine="Trice; ICE". Results for the alternate Machines will appear as "ICE Trike".\n'
+ '\n'
+ 'You can Copy-and-Paste Machines from the Results without retyping them. Right-click and Copy the name in the Results page,'
+ 'then Paste the Machine into a Reference Machine or Alias field.\n'
+ 'Aliased Machines will not be applied until you press the "Refresh" button on the Results screen (or reload).\n'
+ 'This allows you to configure many Machines without having to wait for the Results update after each change.\n'
+ )
+
+ self.explain = wx.StaticText( self, label=text )
+ self.explain.SetFont( wx.Font((0,15), wx.FONTFAMILY_SWISS, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False) )
+
+ self.addButton = wx.Button( self, label='Add Reference Machine' )
+ self.addButton.Bind( wx.EVT_BUTTON, self.onAddButton )
+
+ headerNames = ('Machine','Aliases separated by ";"')
+ self.itemCur = None
+ self.grid = AliasGrid( self )
+ self.grid.CreateGrid( 0, len(headerNames) )
+ self.grid.SetRowLabelSize( 64 )
+ for col in range(self.grid.GetNumberCols()):
+ self.grid.SetColLabelValue( col, headerNames[col] )
+
+ sizer = wx.BoxSizer(wx.VERTICAL)
+ sizer.Add(self.explain, 0, flag=wx.ALL, border=4 )
+ sizer.Add(self.addButton, 0, flag=wx.ALL, border = 4)
+ sizer.Add(self.grid, 1, flag=wx.EXPAND|wx.ALL, border = 4)
+ self.SetSizer(sizer)
+
+ def onAddButton( self, event ):
+ defaultText = ''
+
+ # Initialize the team from the clipboard.
+ if wx.TheClipboard.Open():
+ do = wx.TextDataObject()
+ if wx.TheClipboard.GetData(do):
+ defaultText = do.GetText()
+ wx.TheClipboard.Close()
+
+ self.grid.AppendRows( 1 )
+ self.grid.SetCellValue( self.grid.GetNumberRows()-1, 0, defaultText )
+ self.grid.AutoSize()
+ self.GetSizer().Layout()
+ self.grid.MakeCellVisible( self.grid.GetNumberRows()-1, 0 )
+
+ def refresh( self ):
+ model = SeriesModel.model
+
+ Utils.AdjustGridSize( self.grid, rowsRequired=len(model.referenceMachines) )
+ for row, (reference, aliases) in enumerate(model.referenceMachines):
+ self.grid.SetCellValue( row, 0, reference )
+ self.grid.SetCellValue( row, 1, '; '.join(aliases) )
+
+ self.grid.AutoSize()
+ self.GetSizer().Layout()
+
+ def commit( self ):
+ references = []
+
+ self.grid.SaveEditControlValue()
+ for row in range(self.grid.GetNumberRows()):
+ reference = self.grid.GetCellValue( row, 0 ).strip()
+ if reference:
+ aliases = [a.strip() for a in self.grid.GetCellValue(row, 1).split(';')]
+ references.append( (reference, sorted( a for a in aliases if a )) )
+
+ references.sort()
+
+ model = SeriesModel.model
+ model.setReferenceMachines( references )
+
+ def getGrid( self ):
+ return self.grid
+#----------------------------------------------------------------------------
+
+class AliasesMachineFrame(wx.Frame):
+ def __init__(self):
+ wx.Frame.__init__(self, None, title="Machine Aliases Test", size=(800,600) )
+ self.panel = AliasesMachine(self)
+ self.Show()
+
+if __name__ == "__main__":
+ app = wx.App(False)
+ model = SeriesModel.model
+ model.setReferenceMachines( [
+ ['ICE Trike', ['ICE', 'I.C.E.', 'Trice']],
+ ['Windcheetah', ['Windy', 'Speedy']],
+ ] )
+ frame = AliasesMachineFrame()
+ frame.panel.refresh()
+ app.MainLoop()
diff --git a/SeriesMgr/AliasesName.py b/SeriesMgr/AliasesName.py
new file mode 100644
index 000000000..9bfee8e8e
--- /dev/null
+++ b/SeriesMgr/AliasesName.py
@@ -0,0 +1,123 @@
+import wx
+import os
+import sys
+import SeriesModel
+import Utils
+from AliasGrid import AliasGrid
+
+def normalizeText( text ):
+ return ', '.join( [t.strip() for t in text.split(',')][:2] )
+
+class AliasesName(wx.Panel):
+ def __init__(self, parent):
+ wx.Panel.__init__(self, parent)
+
+ text = (
+ 'Name Aliases match different name spellings to the same participant.\n'
+ 'This can be more convenient than editing race results when the same participant has resullts under different names.\n'
+ '\n'
+ 'To create a name Alias, first press the "Add Reference Name" button.\n'
+ 'The first column is the name that will appear in Results.'
+ 'Then, add Aliases in the next column separated by ";" (semicolons). These are the alternate spellings of the name.\n'
+ 'SeriesMgr will match all Aliases to the Reference Name in the Results.\n'
+ '\n'
+ 'For example, Reference Name="Bell, Robert", Aliases="Bell, Bobby; Bell, Bob". Results for the alternate spellings will appear as "Bell, Robert".\n'
+ 'Accents and upper/lower case are ignored.\n'
+ '\n'
+ 'You can Copy-and-Paste names from the Results without retyping them. Right-click and Copy the name in the Results page,'
+ 'then Paste the name into the Reference Name or Alias field.\n'
+ 'Aliases will not be applied until you press the "Refresh" button on the Results screen (or reload).\n'
+ 'This allows you to configure many Aliases without having to wait for the Results update after each change.\n'
+ )
+
+ self.explain = wx.StaticText( self, label=text )
+ self.explain.SetFont( wx.Font((0,15), wx.FONTFAMILY_SWISS, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_NORMAL, False) )
+
+ self.addButton = wx.Button( self, label='Add Reference Name' )
+ self.addButton.Bind( wx.EVT_BUTTON, self.onAddButton )
+
+ headerNames = ('Name (Last, First)','Aliases separated by ";"')
+ self.itemCur = None
+ self.grid = AliasGrid( self )
+ self.grid.CreateGrid( 0, len(headerNames) )
+ self.grid.SetRowLabelSize( 64 )
+ for col in range(self.grid.GetNumberCols()):
+ self.grid.SetColLabelValue( col, headerNames[col] )
+
+ sizer = wx.BoxSizer(wx.VERTICAL)
+ sizer.Add(self.explain, 0, flag=wx.ALL, border=4 )
+ sizer.Add(self.addButton, 0, flag=wx.ALL, border = 4)
+ sizer.Add(self.grid, 1, flag=wx.EXPAND|wx.ALL, border = 4)
+ self.SetSizer(sizer)
+
+ def onAddButton( self, event ):
+ defaultText = ''
+
+ # Initialize the name from the clipboard.
+ if wx.TheClipboard.Open():
+ do = wx.TextDataObject()
+ if wx.TheClipboard.GetData(do):
+ defaultText = do.GetText()
+ wx.TheClipboard.Close()
+
+ self.grid.AppendRows( 1 )
+ self.grid.SetCellValue( self.grid.GetNumberRows()-1, 0, defaultText )
+ self.grid.AutoSize()
+ self.GetSizer().Layout()
+ self.grid.MakeCellVisible( self.grid.GetNumberRows()-1, 0 )
+
+ def getName( self, s ):
+ name = [t.strip() for t in s.split(',')[:2]]
+ if not name or not any(name):
+ return None
+ name.extend( [''] * (2 - len(name)) )
+ return tuple( name )
+
+ def refresh( self ):
+ model = SeriesModel.model
+
+ Utils.AdjustGridSize( self.grid, rowsRequired=len(model.references) )
+ for row, (reference, aliases) in enumerate(model.references):
+ self.grid.SetCellValue( row, 0, '{}, {}'.format(*reference) )
+ self.grid.SetCellValue( row, 1, '; '.join('{}, {}'.format(*a) for a in aliases) )
+
+ self.grid.AutoSize()
+ self.GetSizer().Layout()
+
+ def commit( self ):
+ references = []
+
+ self.grid.SaveEditControlValue()
+ for row in range(self.grid.GetNumberRows()):
+ reference = self.getName( self.grid.GetCellValue( row, 0 ) )
+ if reference:
+ aliases = [a.strip() for a in self.grid.GetCellValue(row, 1).split(';')]
+ aliases = [self.getName(a) for a in aliases if a]
+ aliases = [a for a in aliases if a]
+ references.append( (reference, aliases) )
+
+ references.sort()
+
+ model = SeriesModel.model
+ model.setReferences( references )
+
+ def getGrid( self ):
+ return self.grid
+#----------------------------------------------------------------------------
+
+class AliasesNameFrame(wx.Frame):
+ def __init__(self):
+ wx.Frame.__init__(self, None, title="Name Aliases Test", size=(800,600) )
+ self.panel = AliasesName(self)
+ self.Show()
+
+if __name__ == "__main__":
+ app = wx.App(False)
+ model = SeriesModel.model
+ model.setReferences( [
+ [('Bell', 'Robert'), [('Bell', 'Bobby'), ('Bell', 'Bob'), ('Bell', 'B')]],
+ [('Sitarski', 'Stephen'), [('Sitarski', 'Steve'), ('Sitarski', 'Steven')]],
+ ] )
+ frame = AliasesNameFrame()
+ frame.panel.refresh()
+ app.MainLoop()
diff --git a/SeriesMgr/AliasesTeam.py b/SeriesMgr/AliasesTeam.py
index 553fa7f11..9b7cccb52 100644
--- a/SeriesMgr/AliasesTeam.py
+++ b/SeriesMgr/AliasesTeam.py
@@ -88,6 +88,9 @@ def commit( self ):
model = SeriesModel.model
model.setReferenceTeams( references )
+ def getGrid( self ):
+ return self.grid
+
#----------------------------------------------------------------------------
class AliasesTeamFrame(wx.Frame):
diff --git a/SeriesMgr/ExportGrid.py b/SeriesMgr/ExportGrid.py
index 48c2416d1..bf2d92c48 100644
--- a/SeriesMgr/ExportGrid.py
+++ b/SeriesMgr/ExportGrid.py
@@ -51,8 +51,8 @@ class ExportGrid:
def __init__( self, title, grid ):
self.title = title
self.grid = grid
- self.colnames = [grid.GetColLabelValue(c) for c in range(grid.GetNumberCols())]
- self.data = [ [grid.GetCellValue(r, c) for r in range(grid.GetNumberRows())] for c in range(grid.GetNumberCols()) ]
+ self.colnames = [grid.GetColLabelValue(c) for c in range(grid.GetNumberCols()) if grid.IsColShown(c)]
+ self.data = [ [grid.GetCellValue(r, c) for r in range(grid.GetNumberRows())] for c in range(grid.GetNumberCols()) if grid.IsColShown(c)]
self.fontName = 'Helvetica'
self.fontSize = 16
diff --git a/SeriesMgr/FieldMap.py b/SeriesMgr/FieldMap.py
index e85fc03aa..489c2d58f 100644
--- a/SeriesMgr/FieldMap.py
+++ b/SeriesMgr/FieldMap.py
@@ -112,6 +112,10 @@ def get_name_from_alias( self, alias ):
('Team','Team Name','TeamName','Rider Team','Club','Club Name','ClubName','Rider Club','Rider Club/Team',),
"Team",
),
+ ('machine',
+ ('Machine','Machine Name','MachineName','Rider Machine','Cycle','Cycle Name','CycleName','Rider Cycle','Bike','Bike Name','BikeName','Rider Bike','Vehicle','Vehicle Name','VehicleName','Rider Vehicle','HPV','Car','Velo','Velomobile','Wheelchair','Fiets','Rad'),
+ "Machine",
+ ),
('discipline',
('Discipline',),
"Discipline",
diff --git a/SeriesMgr/FileTrie.py b/SeriesMgr/FileTrie.py
index 1007d4253..eedc3ba24 100644
--- a/SeriesMgr/FileTrie.py
+++ b/SeriesMgr/FileTrie.py
@@ -42,7 +42,7 @@ def add( self, p ):
if c not in node:
node[c] = {}
node = node[c]
-
+
def best_match( self, p ):
path = []
node = self.node
@@ -65,14 +65,17 @@ def best_match( self, p ):
path.reverse()
if re.match( '^[a-zA-Z]:$', path[0] ):
path[0] += '\\'
-
+ # *nix paths should start with a '/'
+ if path[0] == '':
+ path[0] = '/'
return os.path.join( *path )
if __name__ == '__main__':
ft = FileTrie()
for i in range(5):
ft.add( r'c:\Projects\CrossMgr\SeriesMgr\test{}'.format(i) )
- ft.add( r'c:\Projects\CrossMgr\CrossMgrImpinj\test{}'.format(0) )
+ ft.add( r'c:\Projects\CrossMgr\CrossMgrImpinj\test{}'.format(0) )
+ ft.add( r'/home/Projects/CrossMgr/CrossMgrImpinj/test{}'.format(0) )
print( ft.best_match( '/home/Projects/CrossMgr/SeriesMgr/test2' ) )
print( ft.best_match( '/home/Projects/CrossMgr/CrossMgrImpinj/test0' ) )
print( ft.best_match( 'test4' ) )
diff --git a/SeriesMgr/FtpWriteFile.py b/SeriesMgr/FtpWriteFile.py
index a592bdbbf..c60f0a693 100644
--- a/SeriesMgr/FtpWriteFile.py
+++ b/SeriesMgr/FtpWriteFile.py
@@ -3,6 +3,7 @@
import os
import sys
import ftplib
+import paramiko
import datetime
import threading
import webbrowser
@@ -13,43 +14,110 @@
def lineno():
"""Returns the current line number in our program."""
return inspect.currentframe().f_back.f_lineno
-
-def FtpWriteFile( host, user = 'anonymous', passwd = 'anonymous@', timeout = 30, serverPath = '.', fileName = '', file = None ):
- ftp = ftplib.FTP( host, timeout = timeout )
- ftp.login( user, passwd )
- if serverPath and serverPath != '.':
- ftp.cwd( serverPath )
- fileOpened = False
- if file is None:
- file = open(fileName, 'rb')
- fileOpened = True
- ftp.storbinary( 'STOR {}'.format(os.path.basename(fileName)), file )
- ftp.quit()
- if fileOpened:
- file.close()
-def FtpWriteHtml( html_in ):
+class CallCloseOnExit:
+ def __init__(self, obj):
+ self.obj = obj
+ def __enter__(self):
+ return self.obj
+ def __exit__(self, exc_type, exc_val, exc_tb):
+ self.obj.close()
+
+class FtpWithPort(ftplib.FTP):
+ def __init__(self, host, user, passwd, port, timeout):
+ #Act like ftplib.FTP's constructor but connect to another port.
+ ftplib.FTP.__init__(self)
+ #self.set_debuglevel(2)
+ self.connect(host, port, timeout)
+ self.login(user, passwd)
+
+class FtpsWithPort(ftplib.FTP_TLS):
+ def __init__(self, host, user, passwd, port, timeout):
+ ftplib.FTP_TLS.__init__(self)
+ #self.set_debuglevel(2)
+ self.connect(host, port, timeout)
+ self.auth()
+ self.login(user, passwd)
+ #Switch to secure data connection.
+ self.prot_p()
+
+ def ntransfercmd(self, cmd, rest=None):
+ conn, size = ftplib.FTP.ntransfercmd(self, cmd, rest)
+ if self._prot_p:
+ conn = self.context.wrap_socket(conn,
+ server_hostname=self.host,
+ session=self.sock.session) # reuse ssl session
+ return conn, size
+
+def FtpWriteFile( host, port, user = 'anonymous', passwd = 'anonymous@', timeout = 30, serverPath = '.', fileName = '', file = None, protocol='FTP'):
+ if protocol == 'SFTP':
+ with CallCloseOnExit(paramiko.SSHClient()) as ssh:
+ ssh.set_missing_host_key_policy( paramiko.AutoAddPolicy() )
+ ssh.load_system_host_keys()
+ ssh.connect( host, port, user, passwd )
+
+ with CallCloseOnExit(ssh.open_sftp()) as sftp:
+ fileOpened = False
+ if file is None:
+ file = open(fileName, 'rb')
+ fileOpened = True
+ sftp.putfo(
+ file,
+ serverPath + os.path.basename(fileName)
+ )
+ if fileOpened:
+ file.close()
+ elif protocol == 'FTPS':
+ ftps = FtpsWithPort( host, user, passwd, port, timeout)
+ if serverPath and serverPath != '.':
+ ftps.cwd( serverPath )
+ fileOpened = False
+ if file is None:
+ file = open(fileName, 'rb')
+ fileOpened = True
+ ftps.storbinary( 'STOR {}'.format(os.path.basename(fileName)), file )
+ ftps.quit()
+ if fileOpened:
+ file.close()
+ else: #default to unencrypted FTP
+ ftp = FtpWithPort( host, user, passwd, port, timeout)
+ if serverPath and serverPath != '.':
+ ftp.cwd( serverPath )
+ fileOpened = False
+ if file is None:
+ file = open(fileName, 'rb')
+ fileOpened = True
+ ftp.storbinary( 'STOR {}'.format(os.path.basename(fileName)), file )
+ ftp.quit()
+ if fileOpened:
+ file.close()
+
+def FtpWriteHtml( html_in, team = False ):
Utils.writeLog( 'FtpWriteHtml: called.' )
modelFileName = Utils.getFileName() if Utils.getFileName() else 'Test.smn'
- fileName = os.path.basename( os.path.splitext(modelFileName)[0] + '.html' )
+ fileName = os.path.basename( os.path.splitext(modelFileName)[0] + ('-Team.html' if team else '.html') )
defaultPath = os.path.dirname( modelFileName )
with open(os.path.join(defaultPath, fileName), 'w') as fp:
fp.write( html_in )
model = SeriesModel.model
host = getattr( model, 'ftpHost', '' )
+ port = getattr( model, 'ftpPort', 21 )
user = getattr( model, 'ftpUser', '' )
passwd = getattr( model, 'ftpPassword', '' )
serverPath = getattr( model, 'ftpPath', '' )
+ protocol = getattr( model, 'ftpProtocol', 'FTP' )
with open( os.path.join(defaultPath, fileName), 'rb') as file:
try:
FtpWriteFile( host = host,
+ port = port,
user = user,
passwd = passwd,
serverPath = serverPath,
fileName = fileName,
- file = file )
+ file = file,
+ protocol = protocol)
except Exception as e:
Utils.writeLog( 'FtpWriteHtml Error: {}'.format(e) )
return e
@@ -59,17 +127,26 @@ def FtpWriteHtml( html_in ):
#------------------------------------------------------------------------------------------------
class FtpPublishDialog( wx.Dialog ):
- fields = ['ftpHost', 'ftpPath', 'ftpUser', 'ftpPassword', 'urlPath']
- defaults = ['', '', 'anonymous', 'anonymous@' 'http://']
+ fields = ['ftpHost', 'ftpPort', 'ftpPath', 'ftpUser', 'ftpPassword', 'urlPath']
+ defaults = ['', 21, '', 'anonymous', 'anonymous@', 'http://']
+ team = False
- def __init__( self, parent, html, id = wx.ID_ANY ):
- super().__init__( parent, id, "Ftp Publish Results",
+ def __init__( self, parent, html, team = False, id = wx.ID_ANY ):
+ super().__init__( parent, id, "(S)FTP Publish Results",
style=wx.DEFAULT_DIALOG_STYLE|wx.TAB_TRAVERSAL )
self.html = html
+ self.team = team
+ self.protocol = 'FTP'
+
bs = wx.GridBagSizer(vgap=0, hgap=4)
+ self.useFtp = wx.RadioButton( self, label=_("FTP (unencrypted)"), style = wx.RB_GROUP )
+ self.useFtps = wx.RadioButton( self, label=_("FTPS (FTP with TLS)") )
+ self.useSftp = wx.RadioButton( self, label=_("SFTP (SSH file transfer)") )
+ self.Bind( wx.EVT_RADIOBUTTON,self.onSelectProtocol )
self.ftpHost = wx.TextCtrl( self, size=(256,-1), style=wx.TE_PROCESS_ENTER, value='' )
+ self.ftpPort = wx.lib.intctrl.IntCtrl( self, size=(256,-1), style=wx.TE_PROCESS_ENTER )
self.ftpPath = wx.TextCtrl( self, size=(256,-1), style=wx.TE_PROCESS_ENTER, value='' )
self.ftpUser = wx.TextCtrl( self, size=(256,-1), style=wx.TE_PROCESS_ENTER, value='' )
self.ftpPassword = wx.TextCtrl( self, size=(256,-1), style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, value='' )
@@ -81,10 +158,32 @@ def __init__( self, parent, html, id = wx.ID_ANY ):
row = 0
border = 8
- bs.Add( wx.StaticText( self, label=_("Ftp Host Name:")), pos=(row,0), span=(1,1), border = border,
+
+ bs.Add( wx.StaticText( self, label=_("Protocol:")), pos=(row,0), span=(1,1), border = border,
+ flag=wx.LEFT|wx.TOP|wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL )
+ bs.Add( self.useFtp, pos=(row,1), span=(1,1), border = border, flag=wx.RIGHT|wx.TOP|wx.ALIGN_LEFT )
+
+ row += 1
+
+ bs.Add( self.useFtps, pos=(row,1), span=(1,1), border = border, flag=wx.RIGHT|wx.TOP|wx.ALIGN_LEFT )
+
+ row += 1
+
+ bs.Add( self.useSftp, pos=(row,1), span=(1,1), border = border, flag=wx.RIGHT|wx.TOP|wx.ALIGN_LEFT )
+
+ row += 1
+
+ bs.Add( wx.StaticText( self, label=_("Host Name:")), pos=(row,0), span=(1,1), border = border,
flag=wx.LEFT|wx.TOP|wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL )
bs.Add( self.ftpHost, pos=(row,1), span=(1,1), border = border, flag=wx.RIGHT|wx.TOP|wx.ALIGN_LEFT )
+
+ row += 1
+
+ bs.Add( wx.StaticText( self, label=_("Port:")), pos=(row,0), span=(1,1), border = border,
+ flag=wx.LEFT|wx.TOP|wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL )
+ bs.Add( self.ftpPort, pos=(row,1), span=(1,1), border = border, flag=wx.RIGHT|wx.TOP|wx.ALIGN_LEFT )
+
row += 1
bs.Add( wx.StaticText( self, label=_("Path on Host to Write HTML:")), pos=(row,0), span=(1,1), border = border,
flag=wx.LEFT|wx.TOP|wx.ALIGN_RIGHT|wx.ALIGN_CENTRE_VERTICAL )
@@ -122,6 +221,17 @@ def __init__( self, parent, html, id = wx.ID_ANY ):
self.CentreOnParent(wx.BOTH)
self.SetFocus()
+ def onSelectProtocol( self, event ):
+ if self.useSftp.GetValue():
+ self.protocol = 'SFTP'
+ self.ftpPort.SetValue(22)
+ elif self.useFtps.GetValue():
+ self.protocol = 'FTPS'
+ self.ftpPort.SetValue(21)
+ else:
+ self.protocol = 'FTP'
+ self.ftpPort.SetValue(21)
+
def urlPathChanged( self, event = None ):
url = self.urlPath.GetValue()
fileName = Utils.getFileName()
@@ -130,7 +240,7 @@ def urlPathChanged( self, event = None ):
else:
if not url.endswith( '/' ):
url += '/'
- fileName = os.path.basename( os.path.splitext(fileName)[0] + '.html' )
+ fileName = os.path.basename( os.path.splitext(fileName)[0] + ( '-Team.html' if self.team else '.html') )
url += fileName
self.urlFull.SetLabel( url )
@@ -142,6 +252,7 @@ def refresh( self ):
else:
for f, v in zip(FtpPublishDialog.fields, FtpPublishDialog.defaults):
getattr(self, f).SetValue( getattr(model, f, v) )
+ self.protocol = getattr(model, 'ftpProtocol', '')
self.urlPathChanged()
def setModelAttr( self ):
@@ -149,14 +260,17 @@ def setModelAttr( self ):
model = SeriesModel.model
for f in FtpPublishDialog.fields:
value = getattr(self, f).GetValue()
- if getattr(model, f, None) != value:
+ if getattr( model, f, None ) != value:
setattr( model, f, value )
model.setChanged()
+ if getattr( model, 'ftpProtocol', None ) != self.protocol:
+ setattr( model, 'ftpProtocol', self.protocol)
+ model.setChanged()
model.urlFull = self.urlFull.GetLabel()
def onOK( self, event ):
self.setModelAttr()
- e = FtpWriteHtml( self.html )
+ e = FtpWriteHtml( self.html, self.team )
if e:
Utils.MessageOK( self, 'FTP Publish: {}'.format(e), 'FTP Publish Error' )
else:
diff --git a/SeriesMgr/GetModelInfo.py b/SeriesMgr/GetModelInfo.py
index 3db617aaf..4b314dc13 100644
--- a/SeriesMgr/GetModelInfo.py
+++ b/SeriesMgr/GetModelInfo.py
@@ -4,7 +4,7 @@
import datetime
import operator
import itertools
-from collections import defaultdict, namedtuple
+from collections import defaultdict, namedtuple, Counter
import trueskill
@@ -75,7 +75,7 @@ def safe_upper( f ):
return f
class RaceResult:
- def __init__( self, firstName, lastName, license, team, categoryName, raceName, raceDate, raceFileName, bib, rank, raceOrganizer,
+ def __init__( self, firstName, lastName, license, machine, team, categoryName, raceName, raceDate, raceFileName, bib, rank, raceOrganizer,
raceURL=None, raceInSeries=None, tFinish=None, tProjected=None, primePoints=0, timeBonus=0, laps=1, pointsInput=None ):
self.firstName = str(firstName or '')
self.lastName = str(lastName or '')
@@ -85,6 +85,8 @@ def __init__( self, firstName, lastName, license, team, categoryName, raceName,
self.license = int(self.license)
self.license = str(self.license)
+ self.machine = str(machine or '')
+
self.team = str(team or '')
self.categoryName = str(categoryName or '')
@@ -108,6 +110,7 @@ def __init__( self, firstName, lastName, license, team, categoryName, raceName,
self.upgradeFactor = 1
self.upgradeResult = False
+
@property
def teamIsValid( self ):
@@ -136,7 +139,7 @@ def full_name( self ):
return ', '.join( [name for name in [self.lastName.upper(), self.firstName] if name] )
def __repr__( self ):
- return ', '.join( '{}'.format(p) for p in [self.full_name, self.license, self.categoryName, self.raceName, self.raceDate] if p )
+ return ', '.join( '{}'.format(p) for p in [self.full_name, self.license, self.machine, self.categoryName, self.raceName, self.raceDate] if p )
def ExtractRaceResults( r ):
if os.path.splitext(r.fileName)[1] == '.cmn':
@@ -155,6 +158,7 @@ def toInt( n ):
def ExtractRaceResultsExcel( raceInSeries ):
getReferenceName = SeriesModel.model.getReferenceName
getReferenceLicense = SeriesModel.model.getReferenceLicense
+ getReferenceMachine = SeriesModel.model.getReferenceMachine
getReferenceTeam = SeriesModel.model.getReferenceTeam
excel = GetExcelReader( raceInSeries.getFileName() )
@@ -185,6 +189,7 @@ def ExtractRaceResultsExcel( raceInSeries ):
'firstName': str(f('first_name','')).strip(),
'lastName' : str(f('last_name','')).strip(),
'license': str(f('license_code','')).strip(),
+ 'machine': str(f('machine','')).strip(),
'team': str(f('team','')).strip(),
'categoryName': f('category_code',None),
'laps': f('laps',1),
@@ -229,13 +234,19 @@ def ExtractRaceResultsExcel( raceInSeries ):
try:
info['lastName'], info['firstName'] = name.split(',',1)
except:
- pass
+ # Failing that, split on the last space character.
+ try:
+ info['firstName'], info['lastName'] = name.rsplit(' ',1)
+ except:
+ # If there are no spaces to split on, treat the entire name as lastName. This is fine.
+ info['lastName'] = name
if not info['firstName'] and not info['lastName']:
continue
info['lastName'], info['firstName'] = getReferenceName(info['lastName'], info['firstName'])
info['license'] = getReferenceLicense(info['license'])
+ info['machine'] = getReferenceMachine(info['machine'])
info['team'] = getReferenceTeam(info['team'])
# If there is a bib it must be numeric.
@@ -266,7 +277,6 @@ def ExtractRaceResultsExcel( raceInSeries ):
# Check if this is a team-only sheet.
raceInSeries.pureTeam = ('team' in fm and not any(n in fm for n in ('name', 'last_name', 'first_name', 'license')))
raceInSeries.resultsType = SeriesModel.Race.TeamResultsOnly if raceInSeries.pureTeam else SeriesModel.Race.IndividualAndTeamResults
-
return True, 'success', raceResults
def FixExcelSheetLocal( fileName, race ):
@@ -304,6 +314,7 @@ def ExtractRaceResultsCrossMgr( raceInSeries ):
getReferenceName = SeriesModel.model.getReferenceName
getReferenceLicense = SeriesModel.model.getReferenceLicense
+ getReferenceMachine = SeriesModel.model.getReferenceMachine
getReferenceTeam = SeriesModel.model.getReferenceTeam
Finisher = Model.Rider.Finisher
@@ -333,7 +344,7 @@ def ExtractRaceResultsCrossMgr( raceInSeries ):
'raceURL': raceURL,
'raceInSeries': raceInSeries,
}
- for fTo, fFrom in [('firstName', 'FirstName'), ('lastName', 'LastName'), ('license', 'License'), ('team', 'Team')]:
+ for fTo, fFrom in [('firstName', 'FirstName'), ('lastName', 'LastName'), ('license', 'License'), ('machine', 'Machine'), ('team', 'Team')]:
info[fTo] = getattr(rr, fFrom, '')
if not info['firstName'] and not info['lastName']:
@@ -342,6 +353,7 @@ def ExtractRaceResultsCrossMgr( raceInSeries ):
info['categoryName'] = category.fullname
info['lastName'], info['firstName'] = getReferenceName(info['lastName'], info['firstName'])
info['license'] = getReferenceLicense(info['license'])
+ info['machine'] = getReferenceMachine(info['machine'])
info['team'] = getReferenceTeam(info['team'])
info['laps'] = rr.laps
@@ -470,6 +482,8 @@ def GetCategoryResults( categoryName, raceResults, pointsForRank, useMostEventsC
riderTeam = defaultdict( lambda : '' )
riderUpgrades = defaultdict( lambda : [False] * len(races) )
riderNameLicense = {}
+ riderMachines = defaultdict( lambda : [''] * len(races) )
+
def asInt( v ):
return int(v) if int(v) == v else v
@@ -485,7 +499,27 @@ def FixUpgradeFormat( riderUpgrades, riderResults ):
v = riderResults[rider][i]
riderResults[rider][i] = tuple([upgradeFormat.format(v[0] if v[0] else '')] + list(v[1:]))
+<<<<<<< HEAD
+ def TidyMachinesList (riderMachines):
+ # Format list of unique machines used by each rider in frequency order
+ for rider, machines in riderMachines.items():
+ #remove Nones and empty strings
+ while('None' in machines):
+ machines.remove('None')
+ while('' in machines):
+ machines.remove('')
+ #sort by frequency
+ counts = Counter(machines)
+ machines = sorted(machines, key=counts.get, reverse=True)
+ #remove duplicates
+ machines = list(dict.fromkeys(machines))
+ #overwrite
+ riderMachines[rider] = machines
+
+ riderResults = defaultdict( lambda : [(0,999999,0,0)] * len(races) ) # (points, rr.rank, primePoints, 0) for each result. default rank 999999 for missing result.
+=======
riderResults = defaultdict( lambda : [(0,SeriesModel.rankDidNotParticipate,0,0)] * len(races) ) # (points, rr.rank, primePoints, 0) for each result.
+>>>>>>> 3db22bd07cf085fdbb096acced6cfee6bc63c48b
riderFinishes = defaultdict( lambda : [None] * len(races) )
if scoreByTime:
@@ -509,6 +543,8 @@ def FixUpgradeFormat( riderUpgrades, riderResults ):
continue
rider = rr.key()
riderNameLicense[rider] = (rr.full_name, rr.license)
+ if rr.machine and rr.machine != '0':
+ riderMachines[rider][raceSequence[rr.raceInSeries]] = rr.machine
if rr.team and rr.team != '0':
riderTeam[rider] = rr.team
riderResults[rider][raceSequence[rr.raceInSeries]] = (
@@ -519,7 +555,7 @@ def FixUpgradeFormat( riderUpgrades, riderResults ):
riderUpgrades[rider][raceSequence[rr.raceInSeries]] = rr.upgradeResult
riderPlaceCount[rider][(raceGrade[rr.raceFileName],rr.rank)] += 1
riderEventsCompleted[rider] += 1
-
+
# Adjust for the best times.
if bestResultsToConsider > 0:
for rider, finishes in riderFinishes.items():
@@ -546,10 +582,13 @@ def FixUpgradeFormat( riderUpgrades, riderResults ):
leaderEventsCompleted = riderEventsCompleted[leader]
riderGap = { r : riderTFinish[r] - leaderTFinish if riderEventsCompleted[r] == leaderEventsCompleted else None for r in riderOrder }
riderGap = { r : formatTimeGap(gap) if gap else '' for r, gap in riderGap.items() }
+
+ # Tidy up the machines list for display
+ TidyMachinesList( riderMachines )
# List of:
- # lastName, firstName, license, team, tTotalFinish, [list of (points, position) for each race in series]
- categoryResult = [list(riderNameLicense[rider]) + [riderTeam[rider], formatTime(riderTFinish[rider],True), riderGap[rider]] + [riderResults[rider]] for rider in riderOrder]
+ # lastName, firstName, license, [list of machines], team, tTotalFinish, [list of (points, position) for each race in series]
+ categoryResult = [list(riderNameLicense[rider]) + [riderMachines[rider], riderTeam[rider], formatTime(riderTFinish[rider],True), riderGap[rider]] + [riderResults[rider]] for rider in riderOrder]
return categoryResult, races, GetPotentialDuplicateFullNames(riderNameLicense)
elif scoreByPercent:
@@ -576,6 +615,8 @@ def FixUpgradeFormat( riderUpgrades, riderResults ):
continue
rider = rr.key()
riderNameLicense[rider] = (rr.full_name, rr.license)
+ if rr.machine and rr.machine != '0':
+ riderMachines[rider][raceSequence[rr.raceInSeries]] = rr.machine
if rr.team and rr.team != '0':
riderTeam[rider] = rr.team
percent = min( 100.0, (tFastest / tFinish) * 100.0 if tFinish > 0.0 else 0.0 ) * (rr.upgradeFactor if rr.upgradeResult else 1)
@@ -612,10 +653,13 @@ def FixUpgradeFormat( riderUpgrades, riderResults ):
leaderPercentTotal = riderPercentTotal[leader]
riderGap = { r : leaderPercentTotal - riderPercentTotal[r] for r in riderOrder }
riderGap = { r : percentFormat.format(gap) if gap else '' for r, gap in riderGap.items() }
-
+
+ # Tidy up the machines list for display
+ TidyMachinesList( riderMachines )
+
# List of:
- # lastName, firstName, license, team, totalPercent, [list of (percent, position) for each race in series]
- categoryResult = [list(riderNameLicense[rider]) + [riderTeam[rider], percentFormat.format(riderPercentTotal[rider]), riderGap[rider]] + [riderResults[rider]] for rider in riderOrder]
+ # lastName, firstName, license, [list of machines], team, totalPercent, [list of (percent, position) for each race in series]
+ categoryResult = [list(riderNameLicense[rider]) + [riderMachines[rider], riderTeam[rider], percentFormat.format(riderPercentTotal[rider]), riderGap[rider]] + [riderResults[rider]] for rider in riderOrder]
return categoryResult, races, GetPotentialDuplicateFullNames(riderNameLicense)
elif scoreByTrueSkill:
@@ -637,6 +681,8 @@ def formatRating( rating ):
for rr in raceResults:
rider = rr.key()
riderNameLicense[rider] = (rr.full_name, rr.license)
+ if rr.machine and rr.machine != '0':
+ riderMachines[rider][raceSequence[rr.raceInSeries]] = rr.machine
if rr.team and rr.team != '0':
riderTeam[rider] = rr.team
if rr.rank != SeriesModel.rankDNF:
@@ -686,10 +732,13 @@ def formatRating( rating ):
races.reverse()
for results in riderResults.values():
results.reverse()
+
+ # Tidy up the machines list for display
+ TidyMachinesList( riderMachines )
# List of:
- # lastName, firstName, license, team, points, [list of (points, position) for each race in series]
- categoryResult = [list(riderNameLicense[rider]) + [riderTeam[rider], riderPoints[rider], riderGap[rider]] + [riderResults[rider]] for rider in riderOrder]
+ # lastName, firstName, license, [list of machines], team, points, [list of (points, position) for each race in series]
+ categoryResult = [list(riderNameLicense[rider]) + [riderMachines[rider], riderTeam[rider], riderPoints[rider], riderGap[rider]] + [riderResults[rider]] for rider in riderOrder]
return categoryResult, races, GetPotentialDuplicateFullNames(riderNameLicense)
else: # Score by points.
@@ -698,6 +747,8 @@ def formatRating( rating ):
for rr in raceResults:
rider = rr.key()
riderNameLicense[rider] = (rr.full_name, rr.license)
+ if rr.machine and rr.machine != '0':
+ riderMachines[rider][raceSequence[rr.raceInSeries]] = rr.machine
if rr.team and rr.team != '0':
riderTeam[rider] = rr.team
primePoints = rr.primePoints if considerPrimePointsOrTimeBonus else 0
@@ -765,9 +816,12 @@ def formatRating( rating ):
for results in riderResults.values():
results.reverse()
+ # Tidy up the machines list for display
+ TidyMachinesList( riderMachines )
+
# List of:
- # lastName, firstName, license, team, points, [list of (points, position) for each race in series]
- categoryResult = [list(riderNameLicense[rider]) + [riderTeam[rider], riderPoints[rider], riderGap[rider]] + [riderResults[rider]] for rider in riderOrder]
+ # lastName, firstName, license, [list of machines], team, points, [list of (points, position) for each race in series]
+ categoryResult = [list(riderNameLicense[rider]) + [riderMachines[rider], riderTeam[rider], riderPoints[rider], riderGap[rider]] + [riderResults[rider]] for rider in riderOrder]
return categoryResult, races, GetPotentialDuplicateFullNames(riderNameLicense)
#------------------------------------------------------------------------------------------------
diff --git a/SeriesMgr/MainWin.py b/SeriesMgr/MainWin.py
index 835c06c75..53d4ce02c 100644
--- a/SeriesMgr/MainWin.py
+++ b/SeriesMgr/MainWin.py
@@ -39,8 +39,6 @@
from TeamResults import TeamResults
from CategorySequence import CategorySequence
from Aliases import Aliases
-from AliasesLicense import AliasesLicense
-from AliasesTeam import AliasesTeam
from Options import Options
from Errors import Errors
from Printing import SeriesMgrPrintout
@@ -263,9 +261,7 @@ def addPage( page, name ):
[ 'points', Points, 'Scoring Criteria' ],
[ 'categorySequence',CategorySequence, 'Category Options' ],
[ 'upgrades', Upgrades, 'Upgrades' ],
- [ 'aliases', Aliases, 'Name Aliases' ],
- [ 'licenseAliases', AliasesLicense, 'License Aliases' ],
- [ 'teamAliases', AliasesTeam, 'Team Aliases' ],
+ [ 'aliases', Aliases, 'Aliases' ],
[ 'options', Options, 'Options' ],
[ 'errors', Errors, 'Errors' ],
]
diff --git a/SeriesMgr/Races.py b/SeriesMgr/Races.py
index ce48d6b24..34f931304 100644
--- a/SeriesMgr/Races.py
+++ b/SeriesMgr/Races.py
@@ -61,7 +61,7 @@ def __init__(self, parent):
self.grid.SetColAttr( self.TeamPointsCol, attr )
attr = gridlib.GridCellAttr()
- attr.SetReadOnly( True )
+ #attr.SetReadOnly( True )
self.grid.SetColAttr( self.RaceCol, attr )
attr = gridlib.GridCellAttr()
@@ -212,11 +212,12 @@ def commit( self ):
pname = self.grid.GetCellValue( row, self.PointsCol )
pteamname = self.grid.GetCellValue( row, self.TeamPointsCol ) or None
grade = self.grid.GetCellValue(row, self.GradeCol).strip().upper()[:1]
+ raceName = self.grid.GetCellValue( row, self.RaceCol ).strip()
if not (grade and ord('A') <= ord(grade) <= ord('Z')):
grade = 'A'
if not fileName or not pname:
continue
- raceList.append( (fileName, pname, pteamname, grade) )
+ raceList.append( (fileName, pname, pteamname, grade, raceName) )
model = SeriesModel.model
model.setRaces( raceList )
diff --git a/SeriesMgr/ReadRaceResultsSheet.py b/SeriesMgr/ReadRaceResultsSheet.py
index 4cdcb73ab..a6378522c 100644
--- a/SeriesMgr/ReadRaceResultsSheet.py
+++ b/SeriesMgr/ReadRaceResultsSheet.py
@@ -12,7 +12,7 @@
from Excel import GetExcelReader
#-----------------------------------------------------------------------------------------------------
-Fields = ['Bib#', 'Pos', 'Time', 'FirstName', 'LastName', 'Category', 'License', 'Team']
+Fields = ['Bib#', 'Pos', 'Time', 'FirstName', 'LastName', 'Category', 'License', 'Machine', 'Team']
class FileNamePage(wx.adv.WizardPageSimple):
def __init__(self, parent):
diff --git a/SeriesMgr/Results.py b/SeriesMgr/Results.py
index 20decd31b..3475ce995 100644
--- a/SeriesMgr/Results.py
+++ b/SeriesMgr/Results.py
@@ -26,7 +26,7 @@
reNoDigits = re.compile( '[^0-9]' )
-HeaderNamesTemplate = ['Pos', 'Name', 'License', 'Team']
+HeaderNamesTemplate = ['Pos', 'Name', 'License', 'Machine', 'Team']
def getHeaderNames():
return HeaderNamesTemplate + ['Total Time' if SeriesModel.model.scoreByTime else 'Points', 'Gap']
@@ -73,7 +73,7 @@ def getHtmlFileName():
defaultPath = os.path.dirname( modelFileName )
return os.path.join( defaultPath, fileName )
-def getHtml( htmlfileName=None, seriesFileName=None ):
+def getHtml( htmlfileName=None, hideCols=[], seriesFileName=None):
model = SeriesModel.model
scoreByTime = model.scoreByTime
scoreByPercent = model.scoreByPercent
@@ -89,6 +89,7 @@ def getHtml( htmlfileName=None, seriesFileName=None ):
return 'SeriesMgr: No Categories.'
HeaderNames = getHeaderNames()
+
pointsForRank = { r.getFileName(): r.pointStructure for r in model.races }
if not seriesFileName:
@@ -289,10 +290,15 @@ def write( s ):
hr { clear: both; }
+.hidden {
+ display: none;
+}
+
@media print {
.noprint { display: none; }
.title { page-break-after: avoid; }
}
+
''')
with tag(html, 'script', dict( type="text/javascript")):
@@ -347,10 +353,10 @@ def write( s ):
if( col == 0 || col == 4 || col == 5 ) { // Pos, Points or Gap
cmpFunc = cmpPos;
}
- else if( col >= 6 ) { // Race Points/Time and Rank
+ else if( col >= 7 ) { // 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() );
+ var x = parseRank( a.cells[7+(col-7)*2+1].textContent.trim() );
+ var y = parseRank( b.cells[7+(col-7)*2+1].textContent.trim() );
return MakeCmpStable( a, b, x - y );
};
}
@@ -445,9 +451,9 @@ def write( s ):
pointsForRank,
useMostEventsCompleted=model.useMostEventsCompleted,
numPlacesTieBreaker=model.numPlacesTieBreaker )
- results = [rr for rr in results if toFloat(rr[3]) > 0.0]
-
- headerNames = HeaderNames + ['{}'.format(r[1]) for r in races]
+ results = [rr for rr in results if toFloat(rr[4]) > 0.0]
+ hideRaces = []
+ headerNames = HeaderNames + ['{}'.format(r[3].raceName) for r in races]
with tag(html, 'div', {'id':'catContent{}'.format(iTable)} ):
write( '
CrossMgr
-
+
Click and Drag in Photo to Zoom.