fgmapping 1.0.1 → 1.1.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.1.0 included permanent storage of settings and selection between metric <-> imperial units
+
 v1.0.1 bug fix release
 
 v1.0.0 Initial release

data/Manifest

@@ -4,7 +4,6 @@ Manifest
 README
 Rakefile
 bin/flightgear-mapping
-fgmap.gemspec
 fgmapping.gemspec
 lib/LICENSE
 lib/README

data/Rakefile

@@ -2,7 +2,17 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('fgmapping', '1.0.1') do |p|
+l=""
+File.open("CHANGELOG", "r") do |f|
+	while l=f.gets
+		break if l !~ /\s*#/
+	end
+end
+l =~ /v\d+\.\d+\.\d+\s/
+version = $&[1..-2]
+puts "Version = #{version}"
+
+Echoe.new('fgmapping', version) do |p|
   p.description    = "Flightgear live mapping"
   p.url            = "http://rubyforge.org/projects/fgmap"
   p.author         = "Michael Meltner"

data/fgmapping.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fgmapping}
-  s.version = "1.0.1"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Meltner"]
-  s.date = %q{2010-06-11}
+  s.date = %q{2010-06-12}
   s.default_executable = %q{flightgear-mapping}
   s.description = %q{Flightgear live mapping}
   s.email = %q{mmeltner @nospamplease@ gmail.com}
   s.executables = ["flightgear-mapping"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/flightgear-mapping", "lib/LICENSE", "lib/README", "lib/bsearch.rb", "lib/hud-impl.rb", "lib/hud-widget.rb", "lib/init.rb", "lib/main-dlg-impl.rb", "lib/main-dlg.rb", "lib/navaid.rb", "lib/nodeinfo-impl.rb", "lib/nodeinfo-widget.rb", "lib/resources.rb", "lib/tile.rb", "lib/waypoint.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/flightgear-mapping", "fgmap.gemspec", "fgmapping.gemspec", "lib/LICENSE", "lib/README", "lib/bsearch.rb", "lib/hud-impl.rb", "lib/hud-widget.rb", "lib/init.rb", "lib/main-dlg-impl.rb", "lib/main-dlg.rb", "lib/navaid.rb", "lib/nodeinfo-impl.rb", "lib/nodeinfo-widget.rb", "lib/resources.rb", "lib/tile.rb", "lib/waypoint.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/flightgear-mapping", "fgmapping.gemspec", "lib/LICENSE", "lib/README", "lib/bsearch.rb", "lib/hud-impl.rb", "lib/hud-widget.rb", "lib/init.rb", "lib/main-dlg-impl.rb", "lib/main-dlg.rb", "lib/navaid.rb", "lib/nodeinfo-impl.rb", "lib/nodeinfo-widget.rb", "lib/resources.rb", "lib/tile.rb", "lib/waypoint.rb"]
   s.homepage = %q{http://rubyforge.org/projects/fgmap}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fgmapping", "--main", "README.build_gem"]
   s.require_paths = ["lib"]

data/lib/main-dlg-impl.rb

@@ -16,9 +16,7 @@ require "main-dlg"
 require "tile"
 require "resources"
 require 'socket'
-require "hud-impl"#
-# Author Michael Meltner (mmeltner@gmail.com)
-
+require "hud-impl"
 require "nodeinfo-impl"
 require 'navaid.rb'
 require "xml"
@@ -183,7 +181,7 @@ class MainDlg < Qt::Widget
 		t=Qt::GraphicsTextItem.new(i.to_s, flag)
 		t.setPos(x + OFFSET_FLAG_COUNTER_X, y + OFFSET_FLAG_COUNTER_Y)
 		flag.setZValue(Z_VALUE_WAYPOINT)
-		tooltip=("Lon: %.3f�"%node.lon)+("\nLat: %.3f�"%node.lat)
+		tooltip=("Lon: %.3f�"%node.lon)+("\nLat: %.3f�"%node.lat)
 		if node.elevation>0 then
 			tooltip += ("\nElevation: %.1fm" % node.elevation)
 		end
@@ -691,12 +689,12 @@ class MainDlg < Qt::Widget
 						@rot = get_data("/orientation/heading-deg")
 						@alt = get_data("/position/ground-elev-m")
 						@speed = get_data("/velocities/groundspeed-kt") * 1.852
-						@hud_widget.w.lBlat.setText("%2.3f�" % @posnode.lat)
-						@hud_widget.w.lBlon.setText("%2.3f�" % @posnode.lon)
+						@hud_widget.w.lBlat.setText("%2.3f�" % @posnode.lat)
+						@hud_widget.w.lBlon.setText("%2.3f�" % @posnode.lon)
 						@speed=5.0;@alt=1000
 						conversion = @metricUnit ? 1 : 0.54
 						@hud_widget.w.lBspeed.setText("%3.1f" % (@speed*conversion) +  @metricUnit ? " km/h" : "kt")
-						@hud_widget.w.lBheading.setText("%3.1f�" % (@rot))
+						@hud_widget.w.lBheading.setText("%3.1f�" % (@rot))
 						conversion = @metricUnit ? 1 : 3.281
 						@hud_widget.w.lBalt.setText("%3.1f" % (@alt*conversion) +  @metricUnit ? "m" : "ft")
 						mainnode_x=@node.toxtile
@@ -981,8 +979,8 @@ class TrackGraphicsPathItem < Qt::GraphicsPathItem
 		
 		if !hit.nil? and !@parent.nil? then
 			n=@parent.nodes[hit]
-			@nodeinfo_widget.w.lBlon.text="%.3f�" % n.lon
-			@nodeinfo_widget.w.lBlat.text="%.3f�" % n.lat
+			@nodeinfo_widget.w.lBlon.text="%.3f�" % n.lon
+			@nodeinfo_widget.w.lBlat.text="%.3f�" % n.lat
 			@nodeinfo_widget.w.lBalt.text="%.1fm" % n.elevation
 			@nodeinfo_widget.w.lBspeed.text="%.1fkm/h" % n.speed
 			pos = mapToScene(hoverEvent.pos)
@@ -1068,7 +1066,9 @@ class TileGraphicsPixmapItem < Qt::GraphicsPixmapItem
 				dlg.movemap(dlg.node, true)
 				
 			when entries[2]
-				dlg.node=Node.new(1, Time.now, lon, lat)
+				dlg.node = Node.new(1, Time.now, lon, lat)
+				dlg.offset_x = 0
+				dlg.offset_y = 0
 				dlg.movemap(dlg.node, true)
 				
 			when entries[4]

data/lib/navaid.rb

@@ -9,8 +9,8 @@ rescue LoadError
 end
 
 
-#NAVAID_FILE = "/usr/share/games/FlightGear/Navaids/nav.dat.gz"
-NAVAID_FILE = "/home/chief/dev/nav.dat.gz"
+NAVAID_FILE = "/usr/share/games/FlightGear/Navaids/nav.dat.gz"
+#NAVAID_FILE = "/home/chief/dev/nav.dat.gz"
 
 class Navaid
 	Vor = Struct.new( :lat, :lon, :freq, :shortName, :longName, :type, :sceneItem )

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Michael Meltner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-11 00:00:00 +02:00
+date: 2010-06-12 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -50,7 +50,6 @@ files:
 - README
 - Rakefile
 - bin/flightgear-mapping
-- fgmap.gemspec
 - fgmapping.gemspec
 - lib/LICENSE
 - lib/README

data/fgmap.gemspec

@@ -1,32 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{fgmap}
-  s.version = "1.0.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Michael Meltner"]
-  s.date = %q{2010-06-11}
-  s.default_executable = %q{flightgear-mapping}
-  s.description = %q{Flightgear live mapping}
-  s.email = %q{mmeltner @nospamplease@ gmail.com}
-  s.executables = ["flightgear-mapping"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "bin/flightgear-mapping", "lib/LICENSE", "lib/README", "lib/bsearch.rb", "lib/hud-impl.rb", "lib/hud-widget.rb", "lib/init.rb", "lib/main-dlg-impl.rb", "lib/main-dlg.rb", "lib/navaid.rb", "lib/nodeinfo-impl.rb", "lib/nodeinfo-widget.rb", "lib/resources.rb", "lib/tile.rb", "lib/waypoint.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/flightgear-mapping", "lib/LICENSE", "lib/README", "lib/bsearch.rb", "lib/hud-impl.rb", "lib/hud-widget.rb", "lib/init.rb", "lib/main-dlg-impl.rb", "lib/main-dlg.rb", "lib/navaid.rb", "lib/nodeinfo-impl.rb", "lib/nodeinfo-widget.rb", "lib/resources.rb", "lib/tile.rb", "lib/waypoint.rb", "fgmap.gemspec"]
-  s.homepage = %q{http://rubyforge.org/projects/fgmap}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fgmap", "--main", "README"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{fgmap}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Flightgear live mapping}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end