fgmapping 1.1.3 → 1.2.0

data/CHANGELOG

@@ -1,3 +1,5 @@
+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
 
 v1.1.2 Bug fix: path handling fixed while pressing button repeatedly

data/fgmapping.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fgmapping}
-  s.version = "1.1.3"
+  s.version = "1.2.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-14}
+  s.date = %q{2010-06-17}
   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: Fr. Jun 11 14:41:10 2010
+** Created: Do. Jun 17 17:42:25 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/init.rb

@@ -12,7 +12,12 @@
 # Author Michael Meltner (mmeltner@gmail.com)
 ##################################################
 
-Dir.chdir(File.dirname(__FILE__))
+# check if we were launched via symlink, then resolve it
+myself = __FILE__
+if File.lstat(myself).symlink? then
+	myself = File.readlink(__FILE__)
+end
+Dir.chdir(File.dirname(myself))
 
 load "waypoint.rb"
 

data/lib/main-dlg-impl.rb

@@ -137,6 +137,7 @@ class MainDlg < Qt::Widget
 		@navs = Navaid.new(arg)
 		
 		@httpMutex = Mutex.new
+		@queryMutex = Mutex.new
 			
 		@scene=Qt::GraphicsScene.new()
 		@w.gVmap.setScene(@scene)
@@ -211,6 +212,7 @@ class MainDlg < Qt::Widget
 				# just swallow error
 			end
 		
+			ap "generating xml-doc"
 			doc = XML::Document.new()
 			doc.root = XML::Node.new('gpx')
 			doc.root["xmlns"] = "http://www.topografix.com/GPX/1/1"
@@ -230,12 +232,14 @@ class MainDlg < Qt::Widget
 					trackpoint["lon"] = 	n.lon.to_s.gsub(",",".")
 					trackpoint << XML::Node.new("ele", n.elevation.to_s.gsub(",","."))
 					trackpoint << XML::Node.new("time", n.toGPStime)
+					trackpoint << XML::Node.new("time_us", n.timestamp.usec.to_s)
 					segnode << trackpoint
 				}
 			}
 			File.open($MAPSHOME + "/tracks/" + items.first.nodes.first.toGPStime + ".gpx", "w+"){|f|
 				f.puts doc.inspect
 			}
+			ap "xml-file written"
 		end
 	end
 	
@@ -257,10 +261,13 @@ class MainDlg < Qt::Widget
 					track=@mytracks[@mytrack_current]
 					track.nodes.clear
 					xpat_time = XML::XPath::Expression.new("ns:time")
+					xpat_time_us = XML::XPath::Expression.new("ns:time_us")
 					xpat_elevation = XML::XPath::Expression.new("ns:ele")
 					seg.find("ns:trkpt", "ns:http://www.topografix.com/GPX/1/1").each{|tpt|
-						track << Node.new(nil, tpt.find_first(xpat_time).content, tpt["lon"].to_f, \
-								tpt["lat"].to_f, tpt.find_first(xpat_elevation).content.to_f)
+						usec = tpt.find_first(xpat_time_us)
+						usec = (usec.nil? ? "0" : usec.content)
+						track << Node.new(nil, tpt.find_first(xpat_time).content + usec, \
+								tpt["lon"].to_f, tpt["lat"].to_f, tpt.find_first(xpat_elevation).content.to_f)
 						success = true
 					}
 				}
@@ -395,6 +402,7 @@ class MainDlg < Qt::Widget
 		@scene.addItem(vorGraphic)
 		vorNode = Node.new(0, nil, vor.lon.to_f, vor.lat.to_f)
 		vorGraphic.setPos((vorNode.toxtile - origin_x) * 256, (vorNode.toytile - origin_y) * 256)
+		vorGraphic.baseElement = vor
 		vor.sceneItem = vorGraphic
 		
 		# create text on Navaid
@@ -676,17 +684,21 @@ class MainDlg < Qt::Widget
 			end
 		else
 			begin
-				@fs_queries.each do |q|
-					@fs_socket.print("get " + q + "\r\n")
-					s=""
-					while select([@fs_socket], nil, nil, 0.1 ) do
-						s += @fs_socket.read(1)
-					end
-					if s.include?(q) then
-						@fs_ans << s.split("\n")
-						@fs_ans.flatten!
+				@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
-				end
+				}
 			rescue
 				puts "Warning: Can not communicate with Flightsimulator. Is Telnet interface configured?"
 				@scene.removeItem(@rose)
@@ -694,7 +706,7 @@ class MainDlg < Qt::Widget
 				@fs_socket = nil
 				@hud = nil
 			else # rescue
-#				p @fs_ans
+				#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")
@@ -771,9 +783,22 @@ class MainDlg < Qt::Widget
 			end # rescue
 			@fs_ans=[]
 		end # socket nil
-#		p "wakeup out"
 	end
 	
+
+	def writeFlightsim(element)
+		@queryMutex.synchronize {
+			@fs_socket.print(element + "\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/>"
+			end
+		}
+	end
+
+
 	def autosaveTimer()
 		savetrack(@mytracks, false)
 	end
@@ -998,6 +1023,8 @@ class TrackGraphicsPathItem < Qt::GraphicsPathItem
 			@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
+			@nodeinfo_widget.w.lBdist.text="%.2fkm" % (@parent.distance(n) / 1000)
+			@nodeinfo_widget.w.lBtime.text=@parent.duration_str
 			pos = mapToScene(hoverEvent.pos)
 			if !@nodeinfo.isVisible or @nodeinfo_widget.hover_widget_pos.nil? or (!@nodeinfo_widget.hover_widget_pos.nil? \
 						and Qt::LineF.new(@nodeinfo_widget.hover_widget_pos, pos).length > 30) then
@@ -1043,7 +1070,7 @@ class TileGraphicsPixmapItem < Qt::GraphicsPixmapItem
 	
 	def contextMenuEvent(contextEvent)
 		dlg=contextEvent.widget.parent.parent
-		entries=["Set Waypoint", "Delete Waypoint", "Set Origin", "-", "Save Waypoints", "Save Track", "Load Waypoints",
+		entries=["Set Waypoint", "Delete Waypoint", "Waypoints to Route-Mgr", "Set Origin", "-", "Save Waypoints", "Save Track", "Load Waypoints",
 				"Load Track", ["Metric Units", dlg.metricUnit]]
 		menu=Qt::Menu.new
 		entries.each{|e|
@@ -1056,7 +1083,11 @@ class TileGraphicsPixmapItem < Qt::GraphicsPixmapItem
 				if e=="-" then
 					menu.addSeparator
 				else
-					menu.addAction(e)
+					action = Qt::Action.new(e, nil)
+					if e =~ /(Delete Waypoint|Waypoints to)/ then
+						action.setEnabled(false) if dlg.waypoints.nodes.empty?
+					end
+					menu.addAction(action)
 				end
 			end
 		}
@@ -1081,18 +1112,26 @@ class TileGraphicsPixmapItem < Qt::GraphicsPixmapItem
 				dlg.movemap(dlg.node, true)
 				
 			when entries[2]
+				Thread.new {
+					dlg.waypoints.nodes.each do |n|
+						dlg.writeFlightsim("set /autopilot/route-manager/input @INSERT-1:#{n.lon.to_s.gsub(",",".")},#{n.lat.to_s.gsub(",",".")}")
+					end
+				}
+		
+
+			when entries[3]
 				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]
+			when entries[5]
 				dlg.saveWaypoints([dlg.waypoints])
 				
-			when entries[5]
+			when entries[6]
 				dlg.savetrack(dlg.mytracks)
 
-			when entries[6]
+			when entries[7]
 				savecurrent = dlg.waypoints.currentwp
 				if dlg.loadwaypoint("Load Waypoints") then
 					dlg.waypoints.currentwp = nil
@@ -1100,7 +1139,7 @@ class TileGraphicsPixmapItem < Qt::GraphicsPixmapItem
 					dlg.waypoints.currentwp = savecurrent
 				end
 				
-			when entries[7]
+			when entries[8]
 				dlg.mytrack_current += (dlg.w.pBrecordTrack.isChecked ? 0 : 1)
 				savewp=dlg.mytracks[dlg.mytrack_current]
 				if dlg.mytracks[dlg.mytrack_current].nil? then
@@ -1114,7 +1153,7 @@ class TileGraphicsPixmapItem < Qt::GraphicsPixmapItem
 					dlg.mytracks[dlg.mytrack_current]=savewp
 				end
 
-			when entries[8][0]
+			when entries[9][0]
 				dlg.metricUnit = !dlg.metricUnit
 								
 		end #case
@@ -1122,11 +1161,39 @@ class TileGraphicsPixmapItem < Qt::GraphicsPixmapItem
 end
 
 
-class Qt::GraphicsScene
-	def mouseMoveEvent(mouseEvent)
-		super
-#			a=mouseEvent.scenePos()
-#			p a.x
+class Qt::GraphicsSvgItem
+	attr_accessor :baseElement
+
+	def contextMenuEvent(contextEvent)
+		dlg=contextEvent.widget.parent.parent
+		entries=["Add Waypoint as last", "Add Waypoint at"]
+		menu=Qt::Menu.new
+		entries.each{|e|
+			menu.addAction(e)
+		}
+		sel=menu.exec(contextEvent.screenPos)
+		sel=sel.text if !sel.nil?
+
+		ok = Qt::Boolean.new(true)
+
+		case sel
+			when entries[1]
+				# don't put this into a thread, it will create nasty core-dumps
+				resp = Qt::InputDialog.getInt(dlg, "Enter Waypoint Position.", "After which waypoint shall I insert this one?\nEnter 0 to insert at beginning.", 0, 0, 9999, 1, ok)
+		end #case
+		
+		if ok.value then
+			Thread.new {
+				case sel
+					when entries[0]
+						dlg.writeFlightsim("set /autopilot/route-manager/input @INSERT-1:#{baseElement.shortName}")
+
+					when entries[1]
+						dlg.writeFlightsim("set /autopilot/route-manager/input @INSERT+#{resp}:#{baseElement.shortName}")
+				end #case
+			}
+		end
 	end
+
 end
 

data/lib/main-dlg.rb

@@ -1,7 +1,7 @@
 =begin
 ** Form generated from reading ui file 'main-dlg.ui'
 **
-** Created: Fr. Jun 11 14:41:10 2010
+** Created: Do. Jun 17 17:42:25 2010
 **      by: Qt User Interface Compiler version 4.6.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -35,7 +35,7 @@ class Ui_MainDlg
     if mainDlg.objectName.nil?
         mainDlg.objectName = "mainDlg"
     end
-    mainDlg.resize(588, 389)
+    mainDlg.resize(681, 473)
     @horizontalLayout_3 = Qt::HBoxLayout.new(mainDlg)
     @horizontalLayout_3.objectName = "horizontalLayout_3"
     @verticalLayout = Qt::VBoxLayout.new()

data/lib/nodeinfo-widget.rb

@@ -1,17 +1,20 @@
 =begin
 ** Form generated from reading ui file 'nodeinfo-widget.ui'
 **
-** Created: Fr. Jun 11 14:41:10 2010
+** Created: Mo. Jun 14 18:03:14 2010
 **      by: Qt User Interface Compiler version 4.6.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 =end
 
 class Ui_NodeinfoWidget
-    attr_reader :gridLayout_3
-    attr_reader :frame
     attr_reader :gridLayout_2
+    attr_reader :frame
     attr_reader :gridLayout
+    attr_reader :label_7
+    attr_reader :lBdist
+    attr_reader :label_8
+    attr_reader :lBtime
     attr_reader :label_4
     attr_reader :lBalt
     attr_reader :label_3
@@ -25,7 +28,7 @@ class Ui_NodeinfoWidget
     if nodeinfoWidget.objectName.nil?
         nodeinfoWidget.objectName = "nodeinfoWidget"
     end
-    nodeinfoWidget.resize(146, 58)
+    nodeinfoWidget.resize(186, 78)
     @sizePolicy = Qt::SizePolicy.new(Qt::SizePolicy::MinimumExpanding, Qt::SizePolicy::MinimumExpanding)
     @sizePolicy.setHorizontalStretch(0)
     @sizePolicy.setVerticalStretch(0)
@@ -35,35 +38,64 @@ class Ui_NodeinfoWidget
     brush = Qt::Brush.new(Qt::Color.new(255, 255, 255, 0))
     brush.style = Qt::SolidPattern
     @palette.setBrush(Qt::Palette::Active, Qt::Palette::Base, brush)
-    brush1 = Qt::Brush.new(Qt::Color.new(224, 223, 222, 200))
+    brush1 = Qt::Brush.new(Qt::Color.new(224, 223, 222, 100))
     brush1.style = Qt::SolidPattern
     @palette.setBrush(Qt::Palette::Active, Qt::Palette::Window, brush1)
     @palette.setBrush(Qt::Palette::Inactive, Qt::Palette::Base, brush)
-    brush2 = Qt::Brush.new(Qt::Color.new(224, 223, 222, 100))
-    brush2.style = Qt::SolidPattern
-    @palette.setBrush(Qt::Palette::Inactive, Qt::Palette::Window, brush2)
-    @palette.setBrush(Qt::Palette::Disabled, Qt::Palette::Base, brush2)
-    @palette.setBrush(Qt::Palette::Disabled, Qt::Palette::Window, brush2)
+    @palette.setBrush(Qt::Palette::Inactive, Qt::Palette::Window, brush1)
+    @palette.setBrush(Qt::Palette::Disabled, Qt::Palette::Base, brush1)
+    @palette.setBrush(Qt::Palette::Disabled, Qt::Palette::Window, brush1)
     nodeinfoWidget.palette = @palette
-    @gridLayout_3 = Qt::GridLayout.new(nodeinfoWidget)
-    @gridLayout_3.margin = 1
-    @gridLayout_3.objectName = "gridLayout_3"
+    @gridLayout_2 = Qt::GridLayout.new(nodeinfoWidget)
+    @gridLayout_2.objectName = "gridLayout_2"
     @frame = Qt::Frame.new(nodeinfoWidget)
     @frame.objectName = "frame"
     @frame.frameShape = Qt::Frame::StyledPanel
     @frame.frameShadow = Qt::Frame::Raised
-    @gridLayout_2 = Qt::GridLayout.new(@frame)
-    @gridLayout_2.margin = 1
-    @gridLayout_2.objectName = "gridLayout_2"
-    @gridLayout = Qt::GridLayout.new()
+    @gridLayout = Qt::GridLayout.new(@frame)
     @gridLayout.objectName = "gridLayout"
-    @label_4 = Qt::Label.new(@frame)
-    @label_4.objectName = "label_4"
+    @label_7 = Qt::Label.new(@frame)
+    @label_7.objectName = "label_7"
     @font = Qt::Font.new
     @font.pointSize = 7
+    @label_7.font = @font
+
+    @gridLayout.addWidget(@label_7, 0, 0, 1, 1)
+
+    @lBdist = Qt::Label.new(@frame)
+    @lBdist.objectName = "lBdist"
+    @sizePolicy1 = Qt::SizePolicy.new(Qt::SizePolicy::Preferred, Qt::SizePolicy::Preferred)
+    @sizePolicy1.setHorizontalStretch(1)
+    @sizePolicy1.setVerticalStretch(0)
+    @sizePolicy1.heightForWidth = @lBdist.sizePolicy.hasHeightForWidth
+    @lBdist.sizePolicy = @sizePolicy1
+    @lBdist.font = @font
+    @lBdist.frameShape = Qt::Frame::Panel
+    @lBdist.frameShadow = Qt::Frame::Sunken
+
+    @gridLayout.addWidget(@lBdist, 0, 1, 1, 1)
+
+    @label_8 = Qt::Label.new(@frame)
+    @label_8.objectName = "label_8"
+    @label_8.font = @font
+
+    @gridLayout.addWidget(@label_8, 0, 2, 1, 1)
+
+    @lBtime = Qt::Label.new(@frame)
+    @lBtime.objectName = "lBtime"
+    @sizePolicy1.heightForWidth = @lBtime.sizePolicy.hasHeightForWidth
+    @lBtime.sizePolicy = @sizePolicy1
+    @lBtime.font = @font
+    @lBtime.frameShape = Qt::Frame::Panel
+    @lBtime.frameShadow = Qt::Frame::Sunken
+
+    @gridLayout.addWidget(@lBtime, 0, 3, 1, 1)
+
+    @label_4 = Qt::Label.new(@frame)
+    @label_4.objectName = "label_4"
     @label_4.font = @font
 
-    @gridLayout.addWidget(@label_4, 0, 0, 1, 1)
+    @gridLayout.addWidget(@label_4, 1, 0, 1, 1)
 
     @lBalt = Qt::Label.new(@frame)
     @lBalt.objectName = "lBalt"
@@ -71,13 +103,13 @@ class Ui_NodeinfoWidget
     @lBalt.frameShape = Qt::Frame::Panel
     @lBalt.frameShadow = Qt::Frame::Sunken
 
-    @gridLayout.addWidget(@lBalt, 0, 1, 1, 1)
+    @gridLayout.addWidget(@lBalt, 1, 1, 1, 1)
 
     @label_3 = Qt::Label.new(@frame)
     @label_3.objectName = "label_3"
     @label_3.font = @font
 
-    @gridLayout.addWidget(@label_3, 0, 2, 1, 1)
+    @gridLayout.addWidget(@label_3, 1, 2, 1, 1)
 
     @lBspeed = Qt::Label.new(@frame)
     @lBspeed.objectName = "lBspeed"
@@ -85,13 +117,13 @@ class Ui_NodeinfoWidget
     @lBspeed.frameShape = Qt::Frame::Panel
     @lBspeed.frameShadow = Qt::Frame::Sunken
 
-    @gridLayout.addWidget(@lBspeed, 0, 3, 1, 1)
+    @gridLayout.addWidget(@lBspeed, 1, 3, 1, 1)
 
     @label_6 = Qt::Label.new(@frame)
     @label_6.objectName = "label_6"
     @label_6.font = @font
 
-    @gridLayout.addWidget(@label_6, 1, 0, 1, 1)
+    @gridLayout.addWidget(@label_6, 2, 0, 1, 1)
 
     @lBlat = Qt::Label.new(@frame)
     @lBlat.objectName = "lBlat"
@@ -99,13 +131,13 @@ class Ui_NodeinfoWidget
     @lBlat.frameShape = Qt::Frame::Panel
     @lBlat.frameShadow = Qt::Frame::Sunken
 
-    @gridLayout.addWidget(@lBlat, 1, 1, 1, 1)
+    @gridLayout.addWidget(@lBlat, 2, 1, 1, 1)
 
     @label_5 = Qt::Label.new(@frame)
     @label_5.objectName = "label_5"
     @label_5.font = @font
 
-    @gridLayout.addWidget(@label_5, 1, 2, 1, 1)
+    @gridLayout.addWidget(@label_5, 2, 2, 1, 1)
 
     @lBlon = Qt::Label.new(@frame)
     @lBlon.objectName = "lBlon"
@@ -113,13 +145,10 @@ class Ui_NodeinfoWidget
     @lBlon.frameShape = Qt::Frame::Panel
     @lBlon.frameShadow = Qt::Frame::Sunken
 
-    @gridLayout.addWidget(@lBlon, 1, 3, 1, 1)
-
-
-    @gridLayout_2.addLayout(@gridLayout, 0, 0, 1, 1)
+    @gridLayout.addWidget(@lBlon, 2, 3, 1, 1)
 
 
-    @gridLayout_3.addWidget(@frame, 0, 0, 1, 1)
+    @gridLayout_2.addWidget(@frame, 0, 0, 1, 1)
 
 
     retranslateUi(nodeinfoWidget)
@@ -133,6 +162,8 @@ class Ui_NodeinfoWidget
 
     def retranslateUi(nodeinfoWidget)
     nodeinfoWidget.windowTitle = Qt::Application.translate("NodeinfoWidget", "Form", nil, Qt::Application::UnicodeUTF8)
+    @label_7.text = Qt::Application.translate("NodeinfoWidget", "Dist:", nil, Qt::Application::UnicodeUTF8)
+    @label_8.text = Qt::Application.translate("NodeinfoWidget", "Time:", nil, Qt::Application::UnicodeUTF8)
     @label_4.text = Qt::Application.translate("NodeinfoWidget", "Alt:", nil, Qt::Application::UnicodeUTF8)
     @label_3.text = Qt::Application.translate("NodeinfoWidget", "Speed", nil, Qt::Application::UnicodeUTF8)
     @label_6.text = Qt::Application.translate("NodeinfoWidget", "Lat:", nil, Qt::Application::UnicodeUTF8)

data/lib/resources.rb

@@ -1,7 +1,7 @@
 #****************************************************************************
 #** Ruby Resource object code
 #**
-#** Created: Fr. Jun 11 14:41:10 2010
+#** Created: Do. Jun 17 17:42:25 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/dev/fgmap/flag-blue.png
+  # /home/chief/develop/ruby/fgmap/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/dev/fgmap/vor.svg
+    # /home/chief/develop/ruby/fgmap/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/dev/fgmap/wpttemp-red.png
+    # /home/chief/develop/ruby/fgmap/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,7 @@ 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/dev/fgmap/rose.svg
+    # /home/chief/develop/ruby/fgmap/rose.svg
   0x0,0x0,0xd,0x19,
   0x3c,
   0x3f,0x78,0x6d,0x6c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x3d,0x22,0x31,0x2e,

data/lib/tile.rb

@@ -17,8 +17,8 @@ class Node
 		@id = id
 		if time.kind_of? String then
 			#2009-06-18T20:32:16Z
-			time =~ /(\d*)-(\d*)-(\d*)T(\d*):(\d*):(\d*)Z/
-			@timestamp = Time.local($1,$2,$3,$4,$5,$6)
+			time =~ /(\d*)-(\d*)-(\d*)T(\d*):(\d*):(\d*)Z(\d*)/
+			@timestamp = Time.local($1,$2,$3,$4,$5,$6,$7)
 		else
 			@timestamp = time
 		end
@@ -122,7 +122,7 @@ class Node
 
 	def distanceto_str(lon, lat)
 		d = distanceto(lon, lat)
-		if d < 2.0 then
+		if d < 2000 then
 			return ("%.1f" % d) + "m"
 		else
 			return ("%.1f" % (d/1000.0)) + "km"
@@ -149,12 +149,14 @@ class Way
 		end
 		@nodes=[]
 		@currentwp=nil
+		@distance_result=Hash.new(nil)
 	end
 	
 	def <<(node)
 		i=@nodes.index(nil)
 		if i.nil? then
 			@nodes << node
+			# fetch last 10 elements
 			check_nodes = @nodes[-10, 10]
 			if check_nodes.nil? then
 				check_nodes = @nodes
@@ -163,11 +165,11 @@ class Way
 				(node.timestamp - n.timestamp) <= SPEED_AVG_TIME_SEC
 			}
 			speeds=[]
-			t_diff = 0
+			t_diff = 0.0
 			avg_nodes.each_with_index{|n, i|
 				if i>0 then
 					t_diff = n.timestamp - avg_nodes[i-1].timestamp
-					if t_diff > 0 then
+					if t_diff > 0.0 then
 						speeds << n.distanceto(avg_nodes[i-1].lon, avg_nodes[i-1].lat) / t_diff
 					end
 				end
@@ -175,7 +177,7 @@ class Way
 			if speeds.length > 0 then
 				avg_speed = speeds.inject(0){ |result, element| result + element } / speeds.length * 3.6
 			else
-				avg_speed = 0
+				avg_speed = 0.0
 			end
 			node.speed = avg_speed
 			@nodes.length
@@ -213,4 +215,30 @@ class Way
 		return @timestamp.strftime("%Y-%m-%dT%H:%M:%SZ")
 	end
 
+ 	def duration_str
+ 		if !@sec.nil? then
+ 			return @sec
+ 		end
+ 		sec = (nodes.last.timestamp - nodes.first.timestamp).to_i
+ 		min = sec / 60
+ 		@sec = "#{min/60}:" + ("%02d" % (min % 60)) + (":%02d" % (sec % 60))
+ 	end
+ 	
+	def distance(n)
+		if @distance_result[n].nil? then
+			distancenode=nil
+			total_distance=0.0
+			@nodes.each{|n|
+				if distancenode.nil? then distancenode = n; end
+				d = n.distanceto(distancenode.lon, distancenode.lat)
+				if  d >= 1.0 then # ignore if smaller than 1 meter
+					total_distance += d
+					distancenode = n
+				end
+				@distance_result[n] = total_distance
+			}
+  		end
+		return @distance_result[n]
+	end
+
 end

data/lib/waypoint.rb

@@ -12,7 +12,13 @@
 # Author Michael Meltner (mmeltner@gmail.com)
 ##################################################
 
-Dir.chdir(File.dirname(__FILE__))
+# check if we were launched via symlink, then resolve it
+myself = __FILE__
+if File.lstat(myself).symlink? then
+	myself = File.readlink(__FILE__)
+end
+Dir.chdir(File.dirname(myself))
+
 require "rubygems"
 require "Qt4"
 require "main-dlg-impl.rb"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 3
-  version: 1.1.3
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Michael Meltner
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-14 00:00:00 +02:00
+date: 2010-06-17 00:00:00 +02:00
 default_executable: 
 dependencies: []