fgmapping 1.0.1 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- data/CHANGELOG +2 -0
- data/Manifest +0 -1
- data/Rakefile +11 -1
- data/fgmapping.gemspec +3 -3
- data/lib/main-dlg-impl.rb +10 -10
- data/lib/navaid.rb +2 -2
- metadata +3 -4
- data/fgmap.gemspec +0 -32
data/CHANGELOG
CHANGED
data/Manifest
CHANGED
data/Rakefile
CHANGED
@@ -2,7 +2,17 @@ require 'rubygems'
|
|
2
2
|
require 'rake'
|
3
3
|
require 'echoe'
|
4
4
|
|
5
|
-
|
5
|
+
l=""
|
6
|
+
File.open("CHANGELOG", "r") do |f|
|
7
|
+
while l=f.gets
|
8
|
+
break if l !~ /\s*#/
|
9
|
+
end
|
10
|
+
end
|
11
|
+
l =~ /v\d+\.\d+\.\d+\s/
|
12
|
+
version = $&[1..-2]
|
13
|
+
puts "Version = #{version}"
|
14
|
+
|
15
|
+
Echoe.new('fgmapping', version) do |p|
|
6
16
|
p.description = "Flightgear live mapping"
|
7
17
|
p.url = "http://rubyforge.org/projects/fgmap"
|
8
18
|
p.author = "Michael Meltner"
|
data/fgmapping.gemspec
CHANGED
@@ -2,17 +2,17 @@
|
|
2
2
|
|
3
3
|
Gem::Specification.new do |s|
|
4
4
|
s.name = %q{fgmapping}
|
5
|
-
s.version = "1.0
|
5
|
+
s.version = "1.1.0"
|
6
6
|
|
7
7
|
s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
|
8
8
|
s.authors = ["Michael Meltner"]
|
9
|
-
s.date = %q{2010-06-
|
9
|
+
s.date = %q{2010-06-12}
|
10
10
|
s.default_executable = %q{flightgear-mapping}
|
11
11
|
s.description = %q{Flightgear live mapping}
|
12
12
|
s.email = %q{mmeltner @nospamplease@ gmail.com}
|
13
13
|
s.executables = ["flightgear-mapping"]
|
14
14
|
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"]
|
15
|
-
s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "bin/flightgear-mapping", "
|
15
|
+
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"]
|
16
16
|
s.homepage = %q{http://rubyforge.org/projects/fgmap}
|
17
17
|
s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fgmapping", "--main", "README.build_gem"]
|
18
18
|
s.require_paths = ["lib"]
|
data/lib/main-dlg-impl.rb
CHANGED
@@ -16,9 +16,7 @@ require "main-dlg"
|
|
16
16
|
require "tile"
|
17
17
|
require "resources"
|
18
18
|
require 'socket'
|
19
|
-
require "hud-impl"
|
20
|
-
# Author Michael Meltner (mmeltner@gmail.com)
|
21
|
-
|
19
|
+
require "hud-impl"
|
22
20
|
require "nodeinfo-impl"
|
23
21
|
require 'navaid.rb'
|
24
22
|
require "xml"
|
@@ -183,7 +181,7 @@ class MainDlg < Qt::Widget
|
|
183
181
|
t=Qt::GraphicsTextItem.new(i.to_s, flag)
|
184
182
|
t.setPos(x + OFFSET_FLAG_COUNTER_X, y + OFFSET_FLAG_COUNTER_Y)
|
185
183
|
flag.setZValue(Z_VALUE_WAYPOINT)
|
186
|
-
tooltip=("Lon: %.3f�"%node.lon)+("\nLat: %.3f�"%node.lat)
|
184
|
+
tooltip=("Lon: %.3f�"%node.lon)+("\nLat: %.3f�"%node.lat)
|
187
185
|
if node.elevation>0 then
|
188
186
|
tooltip += ("\nElevation: %.1fm" % node.elevation)
|
189
187
|
end
|
@@ -691,12 +689,12 @@ class MainDlg < Qt::Widget
|
|
691
689
|
@rot = get_data("/orientation/heading-deg")
|
692
690
|
@alt = get_data("/position/ground-elev-m")
|
693
691
|
@speed = get_data("/velocities/groundspeed-kt") * 1.852
|
694
|
-
@hud_widget.w.lBlat.setText("%2.3f�" % @posnode.lat)
|
695
|
-
@hud_widget.w.lBlon.setText("%2.3f�" % @posnode.lon)
|
692
|
+
@hud_widget.w.lBlat.setText("%2.3f�" % @posnode.lat)
|
693
|
+
@hud_widget.w.lBlon.setText("%2.3f�" % @posnode.lon)
|
696
694
|
@speed=5.0;@alt=1000
|
697
695
|
conversion = @metricUnit ? 1 : 0.54
|
698
696
|
@hud_widget.w.lBspeed.setText("%3.1f" % (@speed*conversion) + @metricUnit ? " km/h" : "kt")
|
699
|
-
@hud_widget.w.lBheading.setText("%3.1f�" % (@rot))
|
697
|
+
@hud_widget.w.lBheading.setText("%3.1f�" % (@rot))
|
700
698
|
conversion = @metricUnit ? 1 : 3.281
|
701
699
|
@hud_widget.w.lBalt.setText("%3.1f" % (@alt*conversion) + @metricUnit ? "m" : "ft")
|
702
700
|
mainnode_x=@node.toxtile
|
@@ -981,8 +979,8 @@ class TrackGraphicsPathItem < Qt::GraphicsPathItem
|
|
981
979
|
|
982
980
|
if !hit.nil? and !@parent.nil? then
|
983
981
|
n=@parent.nodes[hit]
|
984
|
-
@nodeinfo_widget.w.lBlon.text="%.3f�" % n.lon
|
985
|
-
@nodeinfo_widget.w.lBlat.text="%.3f�" % n.lat
|
982
|
+
@nodeinfo_widget.w.lBlon.text="%.3f�" % n.lon
|
983
|
+
@nodeinfo_widget.w.lBlat.text="%.3f�" % n.lat
|
986
984
|
@nodeinfo_widget.w.lBalt.text="%.1fm" % n.elevation
|
987
985
|
@nodeinfo_widget.w.lBspeed.text="%.1fkm/h" % n.speed
|
988
986
|
pos = mapToScene(hoverEvent.pos)
|
@@ -1068,7 +1066,9 @@ class TileGraphicsPixmapItem < Qt::GraphicsPixmapItem
|
|
1068
1066
|
dlg.movemap(dlg.node, true)
|
1069
1067
|
|
1070
1068
|
when entries[2]
|
1071
|
-
dlg.node=Node.new(1, Time.now, lon, lat)
|
1069
|
+
dlg.node = Node.new(1, Time.now, lon, lat)
|
1070
|
+
dlg.offset_x = 0
|
1071
|
+
dlg.offset_y = 0
|
1072
1072
|
dlg.movemap(dlg.node, true)
|
1073
1073
|
|
1074
1074
|
when entries[4]
|
data/lib/navaid.rb
CHANGED
@@ -9,8 +9,8 @@ rescue LoadError
|
|
9
9
|
end
|
10
10
|
|
11
11
|
|
12
|
-
|
13
|
-
NAVAID_FILE = "/home/chief/dev/nav.dat.gz"
|
12
|
+
NAVAID_FILE = "/usr/share/games/FlightGear/Navaids/nav.dat.gz"
|
13
|
+
#NAVAID_FILE = "/home/chief/dev/nav.dat.gz"
|
14
14
|
|
15
15
|
class Navaid
|
16
16
|
Vor = Struct.new( :lat, :lon, :freq, :shortName, :longName, :type, :sceneItem )
|
metadata
CHANGED
@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
|
|
4
4
|
prerelease: false
|
5
5
|
segments:
|
6
6
|
- 1
|
7
|
-
- 0
|
8
7
|
- 1
|
9
|
-
|
8
|
+
- 0
|
9
|
+
version: 1.1.0
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Michael Meltner
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2010-06-
|
17
|
+
date: 2010-06-12 00:00:00 +02:00
|
18
18
|
default_executable:
|
19
19
|
dependencies: []
|
20
20
|
|
@@ -50,7 +50,6 @@ files:
|
|
50
50
|
- README
|
51
51
|
- Rakefile
|
52
52
|
- bin/flightgear-mapping
|
53
|
-
- fgmap.gemspec
|
54
53
|
- fgmapping.gemspec
|
55
54
|
- lib/LICENSE
|
56
55
|
- lib/README
|
data/fgmap.gemspec
DELETED
@@ -1,32 +0,0 @@
|
|
1
|
-
# -*- encoding: utf-8 -*-
|
2
|
-
|
3
|
-
Gem::Specification.new do |s|
|
4
|
-
s.name = %q{fgmap}
|
5
|
-
s.version = "1.0.1"
|
6
|
-
|
7
|
-
s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
|
8
|
-
s.authors = ["Michael Meltner"]
|
9
|
-
s.date = %q{2010-06-11}
|
10
|
-
s.default_executable = %q{flightgear-mapping}
|
11
|
-
s.description = %q{Flightgear live mapping}
|
12
|
-
s.email = %q{mmeltner @nospamplease@ gmail.com}
|
13
|
-
s.executables = ["flightgear-mapping"]
|
14
|
-
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"]
|
15
|
-
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"]
|
16
|
-
s.homepage = %q{http://rubyforge.org/projects/fgmap}
|
17
|
-
s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Fgmap", "--main", "README"]
|
18
|
-
s.require_paths = ["lib"]
|
19
|
-
s.rubyforge_project = %q{fgmap}
|
20
|
-
s.rubygems_version = %q{1.3.5}
|
21
|
-
s.summary = %q{Flightgear live mapping}
|
22
|
-
|
23
|
-
if s.respond_to? :specification_version then
|
24
|
-
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
|
25
|
-
s.specification_version = 3
|
26
|
-
|
27
|
-
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
|
28
|
-
else
|
29
|
-
end
|
30
|
-
else
|
31
|
-
end
|
32
|
-
end
|