fgmapping 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/CHANGELOG CHANGED
@@ -1,3 +1,5 @@
1
+ v1.1.1 Bug fix: corrected altitude handlinh and HUD display
2
+
1
3
  v1.1.0 included permanent storage of settings and selection between metric <-> imperial units
2
4
 
3
5
  v1.0.1 bug fix release
data/README CHANGED
@@ -15,23 +15,28 @@ Run:
15
15
  You basically have 3 options:
16
16
 
17
17
  1) (you already have ruby and qtruby installed)
18
- - unpack the 'fg-map.tar.gz' into any directory
18
+ - unpack the 'fgmap.tar.gz' into any directory
19
19
  - cd into this directory
20
20
  - on shell type: ruby init.rb
21
21
 
22
22
  2) (you already have ruby and rubygems installed)
23
23
  - type: sudo gem install fgmapping
24
+ - make sure /var/lib/gems/1.8/bin is in your standard path ($PATH)
25
+ - execute 'flightgear-mapping'
24
26
 
25
27
  3) (you don't have ruby installed, don't even know what this is)
26
- - download "fg-map_linux"
27
- - change permission to 'executable': chmod 774 fg-map_linux
28
- - to run it, just type ./fg-map_linux
28
+ - download "fgmap_linux"
29
+ - change permission to 'executable': chmod 774 fgmap_linux
30
+ - to run it, just type ./fgmap_linux
29
31
 
30
32
  In any case you need to launch Flightgear like this:
31
33
  - run Flightgear with additional command line option: --telnet=2948
32
34
 
33
35
 
34
36
  Develop:
37
+ Download git repository:
38
+ - git clone git://rubyforge.org/fgmap.git
39
+ Remarks for development:
35
40
  - .ui files can be edited with QT designer
36
41
  - corresponding .rb files are generated by just issuing 'make'
37
42
 
data/fgmapping.gemspec CHANGED
@@ -2,11 +2,11 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = %q{fgmapping}
5
- s.version = "1.1.0"
5
+ s.version = "1.1.1"
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-12}
9
+ s.date = %q{2010-06-13}
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}
data/lib/README CHANGED
@@ -15,23 +15,28 @@ Run:
15
15
  You basically have 3 options:
16
16
 
17
17
  1) (you already have ruby and qtruby installed)
18
- - unpack the 'fg-map.tar.gz' into any directory
18
+ - unpack the 'fgmap.tar.gz' into any directory
19
19
  - cd into this directory
20
20
  - on shell type: ruby init.rb
21
21
 
22
22
  2) (you already have ruby and rubygems installed)
23
23
  - type: sudo gem install fgmapping
24
+ - make sure /var/lib/gems/1.8/bin is in your standard path ($PATH)
25
+ - execute 'flightgear-mapping'
24
26
 
25
27
  3) (you don't have ruby installed, don't even know what this is)
26
- - download "fg-map_linux"
27
- - change permission to 'executable': chmod 774 fg-map_linux
28
- - to run it, just type ./fg-map_linux
28
+ - download "fgmap_linux"
29
+ - change permission to 'executable': chmod 774 fgmap_linux
30
+ - to run it, just type ./fgmap_linux
29
31
 
30
32
  In any case you need to launch Flightgear like this:
31
33
  - run Flightgear with additional command line option: --telnet=2948
32
34
 
33
35
 
34
36
  Develop:
37
+ Download git repository:
38
+ - git clone git://rubyforge.org/fgmap.git
39
+ Remarks for development:
35
40
  - .ui files can be edited with QT designer
36
41
  - corresponding .rb files are generated by just issuing 'make'
37
42
 
data/lib/main-dlg-impl.rb CHANGED
@@ -119,8 +119,9 @@ class MainDlg < Qt::Widget
119
119
 
120
120
  @offset_x=@offset_y=0
121
121
  @fs_ans=[]
122
- @fs_queries=["/position/latitude-deg", "/position/longitude-deg", "/position/ground-elev-m",
122
+ @fs_queries=["/position/latitude-deg", "/position/longitude-deg", "/position/altitude-ft",
123
123
  "/orientation/heading-deg", "/velocities/groundspeed-kt"]
124
+ @speed = 0
124
125
 
125
126
  @waypoints=Way.new(nil,'user', Time.now, "Blue")
126
127
  @mytracks=[]
@@ -181,7 +182,7 @@ class MainDlg < Qt::Widget
181
182
  t=Qt::GraphicsTextItem.new(i.to_s, flag)
182
183
  t.setPos(x + OFFSET_FLAG_COUNTER_X, y + OFFSET_FLAG_COUNTER_Y)
183
184
  flag.setZValue(Z_VALUE_WAYPOINT)
184
- tooltip=("Lon: %.3f"%node.lon)+("\nLat: %.3f"%node.lat)
185
+ tooltip=("Lon: %.3f°"%node.lon)+("\nLat: %.3f°"%node.lat)
185
186
  if node.elevation>0 then
186
187
  tooltip += ("\nElevation: %.1fm" % node.elevation)
187
188
  end
@@ -687,16 +688,17 @@ class MainDlg < Qt::Widget
687
688
  @posnode.lon = get_data("/position/longitude-deg")
688
689
  @posnode.lat = get_data("/position/latitude-deg")
689
690
  @rot = get_data("/orientation/heading-deg")
690
- @alt = get_data("/position/ground-elev-m")
691
- @speed = get_data("/velocities/groundspeed-kt") * 1.852
692
- @hud_widget.w.lBlat.setText("%2.3f�" % @posnode.lat)
693
- @hud_widget.w.lBlon.setText("%2.3f�" % @posnode.lon)
694
- @speed=5.0;@alt=1000
691
+ @alt = get_data("/position/altitude-ft")
692
+ speed = get_data("/velocities/groundspeed-kt") * 1.852
693
+ # protect against bug in Flightsim, speed ofter zero if returned
694
+ @speed = speed if speed > 0
695
+ @hud_widget.w.lBlat.setText("%2.3f°" % @posnode.lat)
696
+ @hud_widget.w.lBlon.setText("%2.3f°" % @posnode.lon)
695
697
  conversion = @metricUnit ? 1 : 0.54
696
- @hud_widget.w.lBspeed.setText("%3.1f" % (@speed*conversion) + @metricUnit ? " km/h" : "kt")
697
- @hud_widget.w.lBheading.setText("%3.1f" % (@rot))
698
- conversion = @metricUnit ? 1 : 3.281
699
- @hud_widget.w.lBalt.setText("%3.1f" % (@alt*conversion) + @metricUnit ? "m" : "ft")
698
+ @hud_widget.w.lBspeed.setText("%3.1f" % (@speed*conversion) + (@metricUnit ? " km/h" : "kt"))
699
+ @hud_widget.w.lBheading.setText("%3.1f°" % (@rot))
700
+ conversion = @metricUnit ? 3.281 : 1
701
+ @hud_widget.w.lBalt.setText("%3.1f" % (@alt/conversion) + (@metricUnit ? "m" : "ft"))
700
702
  mainnode_x=@node.toxtile
701
703
  mainnode_y=@node.toytile
702
704
  @rose.setPos((@posnode.toxtile - mainnode_x) * 256, (@posnode.toytile - mainnode_y) * 256)
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 1
8
- - 0
9
- version: 1.1.0
8
+ - 1
9
+ version: 1.1.1
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-12 00:00:00 +02:00
17
+ date: 2010-06-13 00:00:00 +02:00
18
18
  default_executable:
19
19
  dependencies: []
20
20