fgmapping 1.2.0 → 1.2.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v1.2.1 corrected alt display in popup of tracks - restructured reading of flightgear data to make is more responsive - added application icon
+
 v1.2.0 Added setting of Radio Manager Waypoints in Flightgear
 
 v1.1.3 better z-order for display-elements, -added error handling for http connection losses

data/fgmapping.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fgmapping}
-  s.version = "1.2.0"
+  s.version = "1.2.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-17}
+  s.date = %q{2010-06-21}
   s.default_executable = %q{flightgear-mapping}
   s.description = %q{Flightgear live mapping}
   s.email = %q{mmeltner @nospamplease@ gmail.com}

data/lib/hud-widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'hud-widget.ui'
 **
-** Created: Do. Jun 17 17:42:25 2010
+** Created: Mo. Jun 21 22:46:54 2010
 **      by: Qt User Interface Compiler version 4.6.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/main-dlg-impl.rb

@@ -55,6 +55,8 @@ COLOROFFSET_DEG = 240.0
 
 MINSPEED = 0.3 # minimum speed required for heading marker to appear, in m/s
 FS_READ_INTERVAL = 100 # enter GUI refresh loop every 100ms
+LOOPSLEEPINTERVAL = (0.95 * FS_READ_INTERVAL / 1000) # spend 95% of time sleeping to prevent
+																	  # threads from starving. Time is in seconds!
 TICKSTOSKIP = 20
 AUTOSAVE_INTERVAL = 10 * 60 * 1000 # autosave interval for tracks
 HOVER_TIMER = 2000 # time until HUD widget disappears
@@ -128,6 +130,7 @@ class MainDlg < Qt::Widget
 		@mytrack_current=-1
 		@prev_track_node = nil
 		@posnode = Node.new(1, Time.now, @lon, @lat)
+		@tempposnode = Node.new(1, Time.now, @lon, @lat)
 
 		@node = Node.new(1, Time.now, @lon, @lat, 0, @zoom)
 		@rot = 0
@@ -167,10 +170,13 @@ class MainDlg < Qt::Widget
 			end
 		end
 		puts "Map Directory located here: \"#{$MAPSHOME}\""
+		
+		readFlightgear()
 	end
 
 	def get_data(path)
-		r=@fs_ans.detect do |f|
+		# check from end to get most recent position
+		r=@fs_ans.reverse.detect do |f|
 			f.include?(path)
 		end
 		r =~ /-?\d+\.\d+/
@@ -661,6 +667,40 @@ class MainDlg < Qt::Widget
 		end
 	end
 
+	def readFlightgear
+		Thread.new do
+			while true
+				if @fs_socket.nil? then
+					sleep 1
+				else
+					begin
+						@queryMutex.synchronize {
+							@fs_queries.each do |q|
+								@fs_socket.print("get " + q + "\r\n")
+								s=""
+								while select([@fs_socket], nil, nil, 0.3) do
+									s += @fs_socket.read(1)
+									# check for end of line characterized by this string: "\r\n/>"
+									# break	if s[-4..-1] == "\r\n/>" and s.include?(q)
+								end
+								if s.include?(q) then
+									@fs_ans << s.split("\n")
+									@fs_ans.flatten!
+								end
+							end
+						}
+					rescue
+						puts "Warning: Can not communicate with Flightsimulator. Is Telnet interface configured?"
+						@scene.removeItem(@rose)
+						@scene.removeItem(@pointer)
+						@fs_socket = nil
+						@hud = nil
+					end
+				end
+			end #while
+		end # Thread
+	end
+
 	def wakeupTimer()
 #		p "wakeup in"
 		# have to do centering every time as QT will not scroll to scene coordinates which have no elements placed there yet
@@ -671,7 +711,13 @@ class MainDlg < Qt::Widget
 		end
 
 		@wakeupCounter += 1
-		return if @wakeupCounter <= TICKSTOSKIP
+		if @wakeupCounter <= TICKSTOSKIP then
+			# trick to prevent threads from getting just tiny slices of time to execute 
+			# inside the main event loop of QT
+			sleep LOOPSLEEPINTERVAL
+			return
+		end
+		
 		@wakeupCounter = 0
 
 		if @fs_socket.nil? then
@@ -683,104 +729,86 @@ class MainDlg < Qt::Widget
 				puts "Non-critical socket error: #{$!}"
 			end
 		else
-			begin
-				@queryMutex.synchronize {
-					@fs_queries.each do |q|
-						@fs_socket.print("get " + q + "\r\n")
-						s=""
-						while select([@fs_socket], nil, nil, 0.3) do
-							s += @fs_socket.read(1)
-							# check for end of line characterized by this string: "\r\n/>"
-							break	if s[-4..-1] == "\r\n/>" and s.include?(q)
-						end
-						if s.include?(q) then
-							@fs_ans << s.split("\n")
-							@fs_ans.flatten!
-						end
+			#ap @fs_ans
+			if @fs_ans.length>0 then # check if any answer has been received yet.
+				if !@hud.nil? then
+					@tempposnode.lon = get_data("/position/longitude-deg")
+					@tempposnode.lat = get_data("/position/latitude-deg")
+					@rot = get_data("/orientation/heading-deg")
+					@alt = get_data("/position/altitude-ft")
+					@speed = get_data("/velocities/groundspeed-kt")
+					# protect against invalid data
+					if !(@tempposnode.lon and @tempposnode.lat and @rot and @alt and @speed) then
+						@fs_ans=[]
+						return
 					end
-				}
-			rescue
-				puts "Warning: Can not communicate with Flightsimulator. Is Telnet interface configured?"
-				@scene.removeItem(@rose)
-				@scene.removeItem(@pointer)
-				@fs_socket = nil
-				@hud = nil
-			else # rescue
-				#ap @fs_ans
-				if @fs_ans.length>0 then # check if any answer has been received yet.
-					if !@hud.nil? then
-						@posnode.lon = get_data("/position/longitude-deg")
-						@posnode.lat = get_data("/position/latitude-deg")
-						@rot = get_data("/orientation/heading-deg")
-						@alt = get_data("/position/altitude-ft")
-						speed = get_data("/velocities/groundspeed-kt") * 1.852
-						# protect against bug in Flightsim, speed ofter zero if returned
-						@speed = speed if speed > 0
-						@hud_widget.w.lBlat.setText("%2.3f°" % @posnode.lat)
-						@hud_widget.w.lBlon.setText("%2.3f°" % @posnode.lon)
-						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))
-						conversion = @metricUnit ? 3.281 : 1
-						@hud_widget.w.lBalt.setText("%3.1f" % (@alt/conversion) +  (@metricUnit ? "m" : "ft"))
-						mainnode_x=@node.toxtile
-						mainnode_y=@node.toytile
-						@rose.setPos((@posnode.toxtile - mainnode_x) * 256, (@posnode.toytile - mainnode_y) * 256)
-						
-						@pointer.setTransform(Qt::Transform.new.scale(SCALE_SVG,SCALE_SVG).rotate(@rot+180.0) \
-								.translate(-@pointer_offsetx, -@pointer_offsetx))
-						@pointer.setPos((@posnode.toxtile - mainnode_x) * 256 ,(@posnode.toytile - mainnode_y) * 256)
-						
-						to_x = mainnode_x
-						to_y = mainnode_y
-						to_lon = @node.lon
-						to_lat = @node.lat
-						if !@w.cBtoorigin.isChecked and !@waypoints.currentwp.nil? then
-							if !@waypoints.nodes[@waypoints.currentwp-1].nil? then
-								to_x = @waypoints.nodes[@waypoints.currentwp-1].toxtile
-								to_y = @waypoints.nodes[@waypoints.currentwp-1].toytile
-								to_lon = @waypoints.nodes[@waypoints.currentwp-1].lon
-								to_lat = @waypoints.nodes[@waypoints.currentwp-1].lat
-							end
+					@posnode = @tempposnode.dup
+					
+					@speed = @speed  * 1.852
+					@hud_widget.w.lBlat.setText("%2.3f°" % @posnode.lat)
+					@hud_widget.w.lBlon.setText("%2.3f°" % @posnode.lon)
+					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))
+					conversion = @metricUnit ? 3.281 : 1
+					@hud_widget.w.lBalt.setText("%3.1f" % (@alt/conversion) +  (@metricUnit ? "m" : "ft"))
+					mainnode_x=@node.toxtile
+					mainnode_y=@node.toytile
+					@rose.setPos((@posnode.toxtile - mainnode_x) * 256, (@posnode.toytile - mainnode_y) * 256)
+					
+					@pointer.setTransform(Qt::Transform.new.scale(SCALE_SVG,SCALE_SVG).rotate(@rot+180.0) \
+							.translate(-@pointer_offsetx, -@pointer_offsetx))
+					@pointer.setPos((@posnode.toxtile - mainnode_x) * 256 ,(@posnode.toytile - mainnode_y) * 256)
+					
+					to_x = mainnode_x
+					to_y = mainnode_y
+					to_lon = @node.lon
+					to_lat = @node.lat
+					if !@w.cBtoorigin.isChecked and !@waypoints.currentwp.nil? then
+						if !@waypoints.nodes[@waypoints.currentwp-1].nil? then
+							to_x = @waypoints.nodes[@waypoints.currentwp-1].toxtile
+							to_y = @waypoints.nodes[@waypoints.currentwp-1].toytile
+							to_lon = @waypoints.nodes[@waypoints.currentwp-1].lon
+							to_lat = @waypoints.nodes[@waypoints.currentwp-1].lat
 						end
-						@pointertoorigin.setTransform(Qt::Transform.new.scale(SCALE_SVG,SCALE_SVG).rotateRadians(Math::PI / 2 + \
-								Math.atan2((@posnode.toytile - to_y), (@posnode.toxtile - to_x))) \
-								.translate(-@pointertoorigin_offsetx, -@pointertoorigin_offsetx))
-						@pointertoorigin.setPos((@posnode.toxtile - mainnode_x) * 256 ,(@posnode.toytile - mainnode_y) * 256)
-						
-						@hud_widget.w.lBdistance.text = @posnode.distanceto_str(to_lon, to_lat)
-						
-						if @w.cBautocenter.isChecked then
-							@offset_x = @posnode.toxtile - mainnode_x
-							@offset_y = @posnode.toytile - mainnode_y
-							movemap(@node)
+					end
+					@pointertoorigin.setTransform(Qt::Transform.new.scale(SCALE_SVG,SCALE_SVG).rotateRadians(Math::PI / 2 + \
+							Math.atan2((@posnode.toytile - to_y), (@posnode.toxtile - to_x))) \
+							.translate(-@pointertoorigin_offsetx, -@pointertoorigin_offsetx))
+					@pointertoorigin.setPos((@posnode.toxtile - mainnode_x) * 256 ,(@posnode.toytile - mainnode_y) * 256)
+					
+					@hud_widget.w.lBdistance.text = @posnode.distanceto_str(to_lon, to_lat)
+					
+					if @w.cBautocenter.isChecked then
+						@offset_x = @posnode.toxtile - mainnode_x
+						@offset_y = @posnode.toytile - mainnode_y
+						movemap(@node)
+					end
+					if @mytrack_current >= 0 and @w.pBrecordTrack.isChecked then
+						if @mytracks[@mytrack_current].nil? then
+							@mytracks[@mytrack_current] = Way.new(1, 'user', Time.now, nextcolor)
+							@linepen.setColor(Qt::Color.new(@mytracks[@mytrack_current].color))
+							@prev_track_node = false
 						end
-						if @mytrack_current >= 0 and @w.pBrecordTrack.isChecked then
-							if @mytracks[@mytrack_current].nil? then
-								@mytracks[@mytrack_current] = Way.new(1, 'user', Time.now, nextcolor)
-								@linepen.setColor(Qt::Color.new(@mytracks[@mytrack_current].color))
-								@prev_track_node = false
-							end
-							@mytracks[@mytrack_current] << Node.new(nil, Time.now, @posnode.lon, @posnode.lat, @alt)
-							n = @mytracks[@mytrack_current].nodes.last
-							n.speed = @speed
-							if !@prev_track_node then
-								@tckpath = Qt::PainterPath.new(Qt::PointF.new((n.toxtile - mainnode_x) * 256, (n.toytile - mainnode_y) * 256))
-								@mytracks[@mytrack_current].path=TrackGraphicsPathItem.new(@mytracks[@mytrack_current])
-								@mytracks[@mytrack_current].path.setPath(@tckpath)
-								@mytracks[@mytrack_current].path.setZValue(Z_VALUE_TRACK)
-								@mytracks[@mytrack_current].path.setPen(@linepen)
-								@scene.addItem(@mytracks[@mytrack_current].path)
-								@prev_track_node = true
-							else
-								@tckpath.lineTo((n.toxtile - mainnode_x) * 256, (n.toytile - mainnode_y) * 256)
-								@mytracks[@mytrack_current].path.setPath(@tckpath)
-							end
+						@mytracks[@mytrack_current] << Node.new(nil, Time.now, @posnode.lon, @posnode.lat, @alt / 3.281)
+						n = @mytracks[@mytrack_current].nodes.last
+						n.speed = @speed
+						if !@prev_track_node then
+							@tckpath = Qt::PainterPath.new(Qt::PointF.new((n.toxtile - mainnode_x) * 256, (n.toytile - mainnode_y) * 256))
+							@mytracks[@mytrack_current].path=TrackGraphicsPathItem.new(@mytracks[@mytrack_current])
+							@mytracks[@mytrack_current].path.setPath(@tckpath)
+							@mytracks[@mytrack_current].path.setZValue(Z_VALUE_TRACK)
+							@mytracks[@mytrack_current].path.setPen(@linepen)
+							@scene.addItem(@mytracks[@mytrack_current].path)
+							@prev_track_node = true
+						else
+							@tckpath.lineTo((n.toxtile - mainnode_x) * 256, (n.toytile - mainnode_y) * 256)
+							@mytracks[@mytrack_current].path.setPath(@tckpath)
 						end
-						
-					end # if !@hud.nil?
-				end # if @fs_ans.length>0
-			end # rescue
+					end
+					
+				end # if !@hud.nil?
+			end # if @fs_ans.length>0
 			@fs_ans=[]
 		end # socket nil
 	end

data/lib/main-dlg.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'main-dlg.ui'
 **
-** Created: Do. Jun 17 17:42:25 2010
+** Created: Mo. Jun 21 22:46:54 2010
 **      by: Qt User Interface Compiler version 4.6.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/nodeinfo-widget.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'nodeinfo-widget.ui'
 **
-** Created: Mo. Jun 14 18:03:14 2010
+** Created: Mo. Jun 21 22:46:54 2010
 **      by: Qt User Interface Compiler version 4.6.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

data/lib/resources.rb

@@ -1,7 +1,7 @@
 #****************************************************************************
 #** Ruby Resource object code
 #**
-#** Created: Do. Jun 17 17:42:25 2010
+#** Created: Mo. Jun 21 22:46:54 2010
 #**      by: The Ruby Resource Compiler for Qt version 4.6.2
 #**
 #** WARNING! All changes made in this file will be lost!
@@ -21,7 +21,7 @@ class QCleanupResources__dest_class__
 	end
 
 @@qt_resource_data = [
-  # /home/chief/develop/ruby/fgmap/flag-blue.png
+  # /home/chief/dev/fg-map/develop/flag-blue.png
   0x0,0x0,0x9,0xfd,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -184,7 +184,7 @@ class QCleanupResources__dest_class__
   0x72,0x65,0x0,0x0,0x78,0xda,0x2b,0x2f,0x2f,0xd7,0xcb,0xcc,0xcb,0x2e,0x4e,0x4e,
   0x2c,0x48,0xd5,0xcb,0x2f,0x4a,0x7,0x0,0x36,0xd8,0x6,0x58,0x10,0x53,0xca,0x5c,
   0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
-    # /home/chief/develop/ruby/fgmap/vor.svg
+    # /home/chief/dev/fg-map/develop/vor.svg
   0x0,0x1,0x23,0x81,
   0x3c,
   0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,
@@ -4852,7 +4852,7 @@ class QCleanupResources__dest_class__
   0x20,0x20,0x20,0x20,0x3c,0x2f,0x67,0x3e,0xa,0x20,0x20,0x20,0x20,0x3c,0x2f,0x67,
   0x3e,0xa,0x20,0x20,0x3c,0x2f,0x67,0x3e,0xa,0x3c,0x2f,0x73,0x76,0x67,0x3e,0xa,
   
-    # /home/chief/develop/ruby/fgmap/wpttemp-red.png
+    # /home/chief/dev/fg-map/develop/wpttemp-red.png
   0x0,0x0,0x4,0xe7,
   0x89,
   0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
@@ -4934,7 +4934,98 @@ class QCleanupResources__dest_class__
   0x65,0x59,0x10,0x42,0xe0,0x70,0x38,0x50,0x57,0x57,0x17,0x16,0xd2,0xdd,0xdd,0x8d,
   0xff,0x0,0x69,0xa0,0xd9,0x7,0xbe,0x3e,0xff,0xc9,0x0,0x0,0x0,0x0,0x49,0x45,
   0x4e,0x44,0xae,0x42,0x60,0x82,
-    # /home/chief/develop/ruby/fgmap/rose.svg
+    # /home/chief/dev/fg-map/develop/vor.png
+  0x0,0x0,0x5,0x7c,
+  0x89,
+  0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0,
+  0x0,0x0,0x30,0x0,0x0,0x0,0x30,0x8,0x6,0x0,0x0,0x0,0x57,0x2,0xf9,0x87,
+  0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0,
+  0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0,
+  0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1,
+  0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0x6,0x15,
+  0x14,0x29,0x1,0xbf,0x98,0x63,0x35,0x0,0x0,0x0,0x19,0x74,0x45,0x58,0x74,0x43,
+  0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x77,
+  0x69,0x74,0x68,0x20,0x47,0x49,0x4d,0x50,0x57,0x81,0xe,0x17,0x0,0x0,0x4,0xd7,
+  0x49,0x44,0x41,0x54,0x68,0xde,0xed,0x9a,0x7b,0x68,0xd5,0x65,0x18,0xc7,0x3f,0xdf,
+  0xb3,0xad,0xcd,0xe1,0xbc,0xcc,0x46,0xd3,0xb4,0xd6,0xc5,0x9d,0x36,0x6a,0x18,0x4c,
+  0xa7,0x74,0x41,0xcc,0x44,0x8d,0x8a,0x28,0x4c,0x89,0x22,0xd1,0x58,0x92,0x4,0x45,
+  0x99,0x44,0x74,0x13,0x49,0x84,0x22,0xb,0x24,0xc2,0x3f,0xec,0x8a,0x56,0xae,0x90,
+  0xb4,0x45,0x24,0x41,0x44,0x65,0x17,0xd7,0xd5,0x9c,0x19,0x95,0x2c,0x43,0x5,0x6d,
+  0xca,0x6a,0xd7,0xa7,0x7f,0x9e,0x43,0x87,0xd3,0x39,0xfb,0xbd,0xe7,0x9c,0xed,0xd4,
+  0x60,0x3f,0x18,0xbf,0xf7,0xf7,0x9e,0xf7,0xf6,0xbc,0xcf,0xf3,0x7c,0xdf,0xef,0xf3,
+  0xbc,0x93,0x99,0x31,0x92,0x9f,0x18,0x23,0xfc,0x19,0x15,0xe0,0xbf,0x7e,0x8a,0x87,
+  0x63,0x50,0x49,0x97,0x3,0x33,0x80,0x29,0x40,0x19,0xd0,0x7,0xfc,0x9,0xb4,0x3,
+  0x5f,0x9a,0xd9,0xfe,0xff,0x9d,0x6,0x24,0xad,0x90,0xd4,0x26,0xe9,0x7b,0x60,0xb,
+  0x30,0x1e,0xd8,0xd,0x9c,0xf,0xf4,0x3,0x9f,0x1,0x4b,0x80,0x6d,0x92,0xe,0x4a,
+  0xda,0x23,0xa9,0x36,0xef,0x89,0xcd,0x2c,0xaf,0x3f,0x60,0x2d,0xd0,0xd,0x7c,0xb,
+  0xd4,0x78,0xdd,0x1c,0xa0,0xc8,0xcb,0x9b,0x81,0x65,0x5e,0xbe,0x2c,0xa9,0xdf,0x62,
+  0xe0,0x24,0x70,0x2,0xa8,0xcf,0x79,0xfe,0x3c,0x16,0x7e,0x1,0x60,0xc0,0x8b,0xfe,
+  0x5d,0x91,0xa1,0x5d,0x51,0x86,0xfa,0x52,0x7f,0xcb,0xcd,0xeb,0xf7,0x5c,0xd6,0x11,
+  0xcb,0xd1,0x5c,0x36,0x3,0x9f,0x0,0x37,0x1,0x93,0x5d,0x93,0xa7,0x32,0x68,0xb8,
+  0x3f,0x43,0x7d,0x77,0x62,0x38,0xa0,0x13,0xb8,0x43,0x52,0x9f,0xa4,0xc5,0x92,0x8a,
+  0x87,0xc5,0x84,0xdc,0xae,0xdb,0x80,0xf,0x92,0xea,0x56,0x3,0xb1,0x3c,0x34,0x79,
+  0x29,0x70,0x6b,0xd2,0x77,0x17,0xb0,0x61,0xc8,0x4d,0x8,0xa8,0x6,0x3e,0x4,0x56,
+  0x0,0xb5,0xf9,0xfa,0x4e,0x86,0x39,0x4,0xcc,0x2,0x5e,0x1,0x9e,0x1d,0x32,0x1,
+  0x1c,0xa,0xf7,0x2,0x6b,0x87,0x63,0xe1,0x69,0xe6,0x8b,0x1,0x9f,0x2,0x6b,0xa2,
+  0xb4,0x1b,0x3a,0xe0,0x63,0xc0,0x36,0x37,0xa1,0xe2,0x2,0x8,0x70,0x6,0x30,0x15,
+  0xf8,0x11,0x38,0x37,0x2f,0x1,0x80,0x72,0xe0,0xf3,0x42,0xec,0x7c,0xb2,0x29,0xf9,
+  0xfb,0x6c,0xa0,0x3d,0x67,0x14,0x92,0x14,0x73,0xac,0x9e,0x24,0x69,0x72,0xa1,0xe8,
+  0x81,0xfd,0x43,0x91,0xe7,0x0,0xd3,0x25,0xad,0xcc,0x9,0x85,0x7c,0x7,0xbe,0x1,
+  0xa6,0x3,0x1b,0xb,0xac,0x85,0x3a,0xe0,0xd,0x2f,0x5b,0xa6,0x76,0x1a,0x2c,0x1e,
+  0x90,0x74,0x4,0x98,0x6f,0x66,0xdf,0x5,0x68,0x4a,0xee,0x70,0xbd,0x92,0xca,0xfd,
+  0x5b,0x69,0x9a,0xf7,0xf9,0xc9,0x5d,0x62,0x66,0x3d,0x81,0xe7,0xce,0x6b,0x6e,0xc6,
+  0x1b,0xff,0xf5,0x5b,0x84,0x0,0x6,0x8c,0x31,0xb3,0xbf,0x2,0xc8,0xdb,0x95,0xc0,
+  0x51,0xa0,0x8,0x68,0x6,0xe,0x1,0x25,0x29,0x4d,0x7b,0x9c,0xe0,0x3d,0x5,0x54,
+  0x1,0x13,0x80,0x97,0xcd,0xac,0x23,0x62,0xfc,0x59,0xc0,0x47,0x66,0x56,0x12,0xcc,
+  0x46,0x25,0x3d,0xe3,0xe8,0xd3,0x1d,0xb0,0x49,0xd,0x40,0xa7,0x99,0x6d,0x91,0x74,
+  0xc,0x58,0xef,0xb0,0x5b,0x9a,0xd2,0xae,0xcb,0x17,0xbf,0x8,0x58,0x5,0x3c,0x9,
+  0xd4,0x0,0x1d,0x11,0x3e,0xb1,0x57,0x52,0x87,0xa4,0x69,0x66,0x76,0x38,0xc8,0x7,
+  0x80,0x93,0x59,0xd8,0xeb,0x4a,0xe0,0x12,0xa0,0x29,0x8a,0xd3,0x0,0x15,0xc0,0x9,
+  0x2f,0x37,0x3,0xb3,0x3,0xe7,0xb8,0xb,0x78,0x24,0x1b,0x14,0x1a,0x2f,0xe9,0xba,
+  0x40,0xe0,0xe8,0x7,0x4e,0x1,0x6f,0x2,0xf1,0x88,0xb6,0x5d,0xc0,0x7a,0x49,0x4f,
+  0x3,0xc7,0x3,0x7d,0xa0,0x4,0xa8,0xf4,0x18,0x23,0x38,0x1e,0xe8,0x34,0xb3,0x9d,
+  0x81,0x2,0x1c,0x3,0xde,0x6,0x76,0x0,0xa7,0x23,0xcc,0xa1,0xdf,0xa9,0xc2,0xc5,
+  0xc0,0x55,0x2e,0x50,0x14,0xac,0xf6,0x9a,0xd9,0xba,0x34,0x26,0x49,0x26,0x75,0xc5,
+  0x81,0x43,0x5e,0x2e,0xe,0x50,0xef,0x32,0xa7,0xd6,0x63,0xd3,0xfc,0x36,0x3,0x98,
+  0x96,0x4a,0x9,0x80,0x1b,0xbc,0x4f,0x3c,0xf0,0x30,0xad,0x2,0xde,0x9,0x35,0xa1,
+  0x89,0xc0,0x54,0x49,0x2f,0x1,0xf3,0x3,0x34,0xd0,0x8,0x3c,0x67,0x66,0xa7,0x53,
+  0x54,0x3f,0xf,0xd8,0xe7,0x24,0xb0,0x3c,0xa5,0xcf,0x17,0xe,0xa9,0xd5,0x1,0xe3,
+  0x3f,0xe0,0x51,0x5e,0x49,0xa8,0x6,0xea,0x1d,0x19,0xea,0x80,0xca,0x80,0x1d,0x6a,
+  0x6,0xe,0x27,0x60,0x39,0xa9,0x7e,0xa2,0x23,0xd9,0x8d,0x69,0xfa,0x5c,0xed,0x1a,
+  0x68,0x8,0x18,0x3f,0xe,0xcc,0x5,0x5a,0x83,0xb8,0x90,0x4b,0x7a,0x34,0xb,0x14,
+  0xba,0x6,0x38,0x2,0x3c,0x9c,0x29,0x2,0x4b,0x69,0x3f,0x16,0x78,0xdd,0x7d,0xa6,
+  0x3e,0x8b,0x79,0x76,0x5,0x99,0x90,0x99,0xf5,0x2,0x55,0x92,0x16,0x4,0x3a,0x71,
+  0x25,0x70,0x3d,0xb0,0x3a,0x53,0x4,0x96,0x72,0x6a,0x2f,0xf5,0x43,0x6d,0x87,0xc3,
+  0x6a,0x24,0xa,0x49,0x5a,0x95,0x6d,0x56,0xa2,0x7,0x78,0x3f,0x50,0x80,0x52,0x3f,
+  0xf0,0xee,0x94,0xd4,0x1e,0x81,0x28,0x3,0xc0,0x26,0x33,0xbb,0x5,0x18,0x17,0x92,
+  0x19,0xf1,0xd,0xed,0x5,0xf6,0x67,0x23,0xc0,0x6e,0xe0,0xf6,0x40,0x1,0x6,0x80,
+  0x49,0x66,0xd6,0x2,0x54,0x4b,0x8a,0xf,0xb2,0x9b,0x5b,0x81,0xad,0xfe,0x39,0xc6,
+  0xfb,0x12,0xa0,0xb5,0x7b,0x92,0xfa,0x45,0x73,0x21,0x49,0x15,0x6e,0xd7,0x8d,0x66,
+  0xf6,0x43,0xc4,0x4,0x4b,0x3c,0xc0,0xff,0xc5,0x83,0x91,0xbb,0x3d,0x89,0x95,0x8a,
+  0x1a,0xdd,0xc0,0x79,0xee,0xd8,0x67,0x2,0xb5,0xc0,0x43,0x66,0xf6,0x55,0xc4,0xf8,
+  0xb,0x81,0x16,0x33,0x2b,0xcf,0x96,0xcc,0x75,0x3b,0x99,0x1b,0x8,0x3c,0x31,0x8b,
+  0xcc,0xac,0x3f,0xf1,0x8e,0x62,0xaf,0x51,0xfe,0x92,0xd4,0x7e,0xd,0x50,0x67,0x66,
+  0xcb,0xb3,0x8d,0x7,0x16,0x2,0xef,0x2,0x67,0x1,0xb7,0x15,0x38,0x1e,0xa8,0x2,
+  0xee,0x8f,0x8a,0x7,0x62,0x11,0xce,0xd3,0xa,0x2c,0x0,0x5e,0x0,0xe,0x14,0x38,
+  0x6f,0x7b,0x1c,0xe8,0x94,0x74,0x10,0x58,0x97,0x51,0x3b,0x51,0x17,0x1c,0x92,0x1a,
+  0xdc,0xfe,0x2e,0x2c,0x74,0xe6,0x59,0xd2,0x14,0xe0,0x27,0x33,0x2b,0xcb,0x39,0xb9,
+  0x6b,0x66,0x5f,0x3,0x2d,0x92,0x36,0x49,0x2a,0xcd,0x2a,0x6b,0x96,0xfb,0xc2,0x2b,
+  0x25,0x95,0x3a,0x8c,0xcf,0xcc,0x3b,0x33,0xe7,0x7c,0xe5,0x67,0xe0,0xe6,0x2,0xfa,
+  0xc0,0x76,0xe0,0x89,0xa8,0x93,0x3d,0x9b,0x1,0x67,0x2,0x1f,0xfb,0xbb,0x6c,0x18,
+  0x17,0x5e,0xe,0xdc,0xe7,0xb1,0x45,0xd1,0x90,0x66,0xa7,0xdd,0xa1,0xdb,0x80,0xb7,
+  0x12,0x99,0x67,0xe0,0x8a,0x3c,0x17,0x7c,0x4e,0x82,0xd0,0x79,0x12,0xe0,0x0,0xb0,
+  0xb,0x98,0x30,0xd4,0xb9,0xd1,0x84,0xc3,0x37,0x3a,0x11,0x7b,0x1e,0xb8,0x36,0x1d,
+  0x47,0xcf,0x52,0x80,0x71,0x4e,0xad,0xe7,0x1,0xad,0xc0,0xe3,0x9e,0xb1,0x18,0xbe,
+  0xfb,0x1,0xcf,0x95,0x2e,0x75,0x3a,0xbc,0x67,0xb0,0xbb,0x0,0x7,0x8a,0xb4,0xf5,
+  0x49,0x65,0x73,0x9e,0xd3,0x54,0xb0,0xb,0x8e,0xa4,0xc3,0xe6,0x5e,0xe0,0xf,0xa7,
+  0xe,0xc5,0x9,0xa7,0x4f,0x6a,0xf3,0x28,0xb0,0xc8,0xcb,0x35,0x49,0xf5,0x73,0x3d,
+  0x8e,0xfe,0x15,0x98,0x9d,0xab,0x5f,0xd,0x65,0x36,0x79,0xb9,0x5f,0x54,0x98,0x2f,
+  0x6c,0x83,0xa7,0x6,0x5f,0x5,0x1e,0x74,0xba,0xfd,0x9e,0xdf,0xc6,0x98,0x47,0x6a,
+  0xf1,0x7c,0xe7,0xd6,0x70,0xdc,0xd4,0x4b,0x6a,0xf2,0x88,0xeb,0x22,0xbf,0xc1,0xe9,
+  0xf1,0x9d,0xde,0x7,0xec,0x34,0xb3,0xdf,0x86,0x6c,0xae,0xd1,0x7f,0x35,0x18,0x15,
+  0x60,0x54,0x80,0x91,0xfd,0xfc,0xd,0xb7,0xa7,0x37,0xa3,0xe5,0x4f,0xd,0x38,0x0,
+  0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82,
+    # /home/chief/dev/fg-map/develop/rose.svg
   0x0,0x0,0xd,0x19,
   0x3c,
   0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,
@@ -5170,6 +5261,11 @@ class QCleanupResources__dest_class__
   0xf,0xee,0x28,0x27,
   0x0,0x77,
   0x0,0x70,0x0,0x74,0x0,0x74,0x0,0x65,0x0,0x6d,0x0,0x70,0x0,0x2d,0x0,0x72,0x0,0x65,0x0,0x64,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67,
+    # vor.png
+  0x0,0x7,
+  0xd,0x65,0x57,0xa7,
+  0x0,0x76,
+  0x0,0x6f,0x0,0x72,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67,
     # rose.svg
   0x0,0x8,
   0x6,0x98,0x55,0xe7,
@@ -5181,11 +5277,13 @@ class QCleanupResources__dest_class__
   # :
   0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1,
   # :/icons
-  0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x2,
+  0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x5,0x0,0x0,0x0,0x2,
   # :/icons/rose.svg
-  0x0,0x0,0x0,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x32,0x71,
+  0x0,0x0,0x0,0x7c,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x37,0xf1,
   # :/icons/flag-blue.png
   0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0,
+  # :/icons/vor.png
+  0x0,0x0,0x0,0x68,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x32,0x71,
   # :/icons/vor.svg
   0x0,0x0,0x0,0x30,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0xa,0x1,
   # :/icons/wpttemp-red.png

data/lib/waypoint.rb

@@ -24,6 +24,7 @@ require "Qt4"
 require "main-dlg-impl.rb"
 
 a = Qt::Application.new(ARGV)
+a.setWindowIcon(Qt::Icon.new(":/icons/vor.png"))
 u = Qt::MainWindow.new
 
 w = MainDlg.new(u, ARGV[0])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Michael Meltner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-17 00:00:00 +02:00
+date: 2010-06-21 00:00:00 +02:00
 default_executable: 
 dependencies: []