views/practice_xml.erb @@ -23,5 +23,9 @@ helpers do s.to_s.gsub(/[&"><]/,'') end + def xml_child_int(xml,child_name) + xml.at(child_name).inner_text.to_i + end + alias :h :html_escape end \ No newline at end of file helpers.rb @@ -4,7 +4,8 @@ <data_type>csv</data_type> <background> <alpha>90</alpha> - <border_alpha>10</border_alpha> + <border_color>000000</border_color> + <border_alpha>100</border_alpha> </background> <plot_area> <margins> public/chart_1_settings.xml @@ -4,7 +4,8 @@ <data_type>csv</data_type> <background> <alpha>90</alpha> - <border_alpha>10</border_alpha> + <border_color>000000</border_color> + <border_alpha>100</border_alpha> </background> <plot_area> <margins> public/chart_2_settings.xml @@ -1,5 +1,7 @@ body { - font-family: Arial, Helvetica, Verdana; + font-family: 'Century Gothic', Arial, Helvetica, Verdana; + margin: 0px; + background-color: #F1EBB9; } #left { @@ -11,23 +13,75 @@ body { margin-left: 440px; } +#content { + margin: 10px; +} + +/* Menu / Topbar stuff */ + +#menu { + background-color: #52121C; + color: white; + margin: 0px; +} + +#menu ul { + margin-top: 16px; + padding-right: 80px; + float: right; +} + +#menu li { + display: inline; + margin-right: 12px; + padding: 7px 7px 12px 7px; +} + +#menu li a, #menu li a:visited { + color: white; + text-decoration: none; +} + +#menu li.selected a { + color: black; +} + +#menu li.selected { + background-color: #F1EBB9; + color: black; + -moz-border-radius-topright: 12px; + -webkit-border-top-right-radius: 12px; + -moz-border-radius-topleft: 12px; + -webkit-border-top-left-radius: 12px; +} + +#title { + font-size: 26px; + padding: 6px; +} + +/* End menu stuff */ + table.classic { - width: 600px; border: 1px solid black; border-collapse: collapse; font-size: x-small; text-align: right; } -.header { +th { background-color: black; color: white; text-align: center; - font-size: medium; + font-weight: normal; } -.footer { +#footer { font-size: x-small; + text-align: center; + clear: both; + margin-top: 12px; + padding: 8px; } .error { public/style.css @@ -1,6 +1,9 @@ require 'rubygems' require 'sinatra' require 'andand' +require 'hpricot' +require 'lib/math_statistics' +require 'activesupport' get '/' do erb :index @@ -40,4 +43,67 @@ post '/' do erb :index end +get '/practice_xml' do + erb :practice_xml +end + +post '/practice_xml' do + data = Hpricot::XML(params[:data]) + # Look for the name of the GP (the andand keeps it working when nothing is found) + @track_title = (data/:track_name).inner_text + ' ( ' + (data/:track_country_name).inner_text + ' )' + + @sections = {} + 1.upto(3) { |x| @sections[x] = (data/:"time_#{x}").collect {|t| t.inner_text.to_f } } + total = @sections.collect { |s| s.last.median }.sum + @section_weight = @sections.collect { |s| s.last.median / total.to_f } + + # setup data init + @setup_data = {} + PARTS = [['front_wing','steer'],['rear_wing','grip'],['suspension'],['gears']] + + # put drp stuff in an easy array + # drp_data[lap_nr][skill_id] + # skills are: + SKILLS = %w{feedback_dqp acceleration braking top_speed kerb_use racing_line} + @drp_data = [] + + # get the data from each lap + (data/:laps/:data).each do |lap| + lap_nr = xml_child_int(lap,'lapnr') + @drp_data[lap_nr-1] ||= [] + 1.upto(3) do |section| + PARTS.each do |part| + # initialize arrays + @setup_data[part.first] ||= {} + @setup_data[part.first][section] ||= {} + @setup_data[part.first][section]['min'] ||= [0] + @setup_data[part.first][section]['max'] ||= [100] + # fill the arrays with minima and maxima + @setup_data[part.first][section]['min'] << xml_child_int(lap,part.first) if xml_child_int(lap,"feedback_#{part.last}_#{section}") == 1 + @setup_data[part.first][section]['max'] << xml_child_int(lap,part.first) if xml_child_int(lap,"feedback_#{part.last}_#{section}") == -1 + + end # part + end # section + SKILLS.each_index do |skill_id| + @drp_data[lap_nr-1][skill_id] = xml_child_int(lap,SKILLS[skill_id]) + end + end # laps + + # get the minima and maxima + PARTS.each do |part| + avgs = {} + 1.upto(3) do |section| + # fill the arrays with minima and maxima + @setup_data[part.first][section]['min'] = @setup_data[part.first][section]['min'].max + @setup_data[part.first][section]['max'] = @setup_data[part.first][section]['max'].min + @setup_data[part.first][section]['avg'] = (@setup_data[part.first][section]['min'] + @setup_data[part.first][section]['max'])/2.to_f + avgs[section] = @setup_data[part.first][section]['avg'] + end + @setup_data[part.first]['weighted_avg'] = avgs.collect { |section,avg| avg*@section_weight[section-1] }.sum + end + + + erb :practice_xml +end + require 'helpers.rb' \ No newline at end of file sinatra_app.rb @@ -10,10 +10,6 @@ <input type="submit" /> </p> </form> - <p class="footer"> - OpenSource Software. <a href="http://github.com/andruby/f1time-tools">Sourcecode</a> - - <a href="http://www.andrewsblog.org">Andrewsblog</a> - </p> <% if @csv_for_chart_1 %> <script type="text/javascript" src="amline/swfobject.js"></script> <div id="chart_1">You need to upgrade your Flash Player</div> views/index.erb @@ -6,13 +6,24 @@ <title>Andrew's F1Time Tools</title> </head> <body> - <h1>Andrew's F1Time lap data extractor</h1> + <div id="menu"> + <ul> + <li<%= ' class="selected"' if request.path_info == '/' %>><a href="/">lap data extractor</a></li> + <li<%= ' class="selected"' if request.path_info == '/practice_xml' %>><a href="/practice_xml">practice xml parser</a></li> + </ul> + <div id="title">Andrew's F1Time Tools</div> + </div> <% if @error %> <div class="error"><%= @error %></div> <% end %> - <%= yield %> + <div id="content"><%= yield %></div> + + <div id="footer"> + OpenSource Software. <a href="http://github.com/andruby/f1time-tools">Sourcecode</a> - + <a href="http://www.andrewsblog.org">Andrewsblog</a> + </div> <!-- Google Analytics Code --> <script type="text/javascript"> views/layout.erb d85184e94a21b157458f927b275018e4ff399626 Andrew Fecheyr Lippens andrew@bedesign.be http://github.com/andruby/f1time-tools/commit/06d7b12660727194c1b079b921fc8e622b2d1d81 06d7b12660727194c1b079b921fc8e622b2d1d81 2009-04-23T18:54:03-07:00 2009-04-23T18:54:03-07:00 New layout and added a xml parser for practice data a39ececf2f04d359fa2e7a3100fcd47e5105f578 Andrew Fecheyr Lippens andrew@bedesign.be