thyphoon/PBMap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Latest idle and djes code mixing

Browse Source
This commit is contained in:
djes
2016-08-26 12:06:18 +02:00
parent f20ff4e2d3
commit bc94b653b6
1 changed files with 149 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

363
PBMap.pb
View File

@@ -77,6 +77,7 @@ Module PBMap
PBMapZoom.i PBMapZoom.i
nImage.i nImage.i
key.s key.s
CacheFile.s
GetImageThread.i GetImageThread.i
EndStructure EndStructure
@@ -119,6 +120,10 @@ Module PBMap
CallBackPointer.i ; @Procedure(X.i, Y.i) to DrawPointer (you must use VectorDrawing lib) CallBackPointer.i ; @Procedure(X.i, Y.i) to DrawPointer (you must use VectorDrawing lib)
EndStructure EndStructure
Structure Option
WheelMouseRelative.i
EndStructure
;-PBMap Structure ;-PBMap Structure
Structure PBMap Structure PBMap
Window.i ; Parent Window Window.i ; Parent Window
@@ -128,6 +133,7 @@ Module PBMap
Drawing.DrawingParameters ; Drawing parameters based on focus point Drawing.DrawingParameters ; Drawing parameters based on focus point
; ;
CallBackLocation.i ; @Procedure(latitude.d,lontitude.d) CallBackLocation.i ; @Procedure(latitude.d,lontitude.d)
CallBackMainPointer.i ; @Procedure(X.i, Y.i) to DrawPointer (you must use VectorDrawing lib)
; ;
Position.PixelPosition ; Actual focus point coords in pixels (global) Position.PixelPosition ; Actual focus point coords in pixels (global)
MoveStartingPoint.PixelPosition ; Start mouse position coords when dragging the map MoveStartingPoint.PixelPosition ; Start mouse position coords when dragging the map
@@ -152,6 +158,8 @@ Module PBMap
EditMarkerIndex.l EditMarkerIndex.l
ImgLoading.i ;Image Loading Tile ImgLoading.i ;Image Loading Tile
Options.option ;
EndStructure EndStructure
#PB_MAP_REDRAW = #PB_EventType_FirstCustomValue + 1 #PB_MAP_REDRAW = #PB_EventType_FirstCustomValue + 1
@@ -251,32 +259,34 @@ Module PBMap
PBMap\EditMarkerIndex = -1 ;Initialised with "no marker selected" PBMap\EditMarkerIndex = -1 ;Initialised with "no marker selected"
PBMap\Font = LoadFont(#PB_Any, "Arial", 20, #PB_Font_Bold) PBMap\Font = LoadFont(#PB_Any, "Arial", 20, #PB_Font_Bold)
PBMap\Window = window PBMap\Window = window
;- Proxy details PBMap\Options\WheelMouseRelative = #True
;-Options
;-Preferences
;Use this to create and customize your preferences file for the first time ;Use this to create and customize your preferences file for the first time
; Result = CreatePreferences(GetHomeDirectory() + "PBMap.prefs") ; CreatePreferences(GetHomeDirectory() + "PBMap.prefs")
; If Proxy ; ;Or this to modify
; ;OpenPreferences(GetHomeDirectory() + "PBMap.prefs")
; ;Or this
; ;RunProgram("notepad.exe", GetHomeDirectory() + "PBMap.prefs", GetHomeDirectory())
; PreferenceGroup("PROXY") ; PreferenceGroup("PROXY")
; WritePreferenceInteger("Proxy", #True)
; WritePreferenceString("ProxyURL", "myproxy.fr") ; WritePreferenceString("ProxyURL", "myproxy.fr")
; WritePreferenceString("ProxyPort", "myproxyport") ; WritePreferenceString("ProxyPort", "myproxyport")
; WritePreferenceString("ProxyUser", "myproxyname") ; WritePreferenceString("ProxyUser", "myproxyname")
; EndIf ; WritePreferenceString("ProxyPass", "myproxypass") ;TODO !Warning! !not encoded!
; If Result
; ClosePreferences() ; ClosePreferences()
; EndIf OpenPreferences(GetHomeDirectory() + "PBMap.prefs")
Result = OpenPreferences(GetHomeDirectory() + "PBMap.prefs")
If Proxy
PreferenceGroup("PROXY") PreferenceGroup("PROXY")
Proxy = ReadPreferenceInteger("Proxy", #False)
If Proxy
Global ProxyURL$ = ReadPreferenceString("ProxyURL", "") ;InputRequester("ProxyServer", "Do you use a Proxy Server? Then enter the full url:", "") Global ProxyURL$ = ReadPreferenceString("ProxyURL", "") ;InputRequester("ProxyServer", "Do you use a Proxy Server? Then enter the full url:", "")
Global ProxyPort$ = ReadPreferenceString("ProxyPort", "") ;InputRequester("ProxyPort" , "Do you use a specific port? Then enter it", "") Global ProxyPort$ = ReadPreferenceString("ProxyPort", "") ;InputRequester("ProxyPort" , "Do you use a specific port? Then enter it", "")
Global ProxyUser$ = ReadPreferenceString("ProxyUser", "") ;InputRequester("ProxyUser" , "Do you use a user name? Then enter it", "") Global ProxyUser$ = ReadPreferenceString("ProxyUser", "") ;InputRequester("ProxyUser" , "Do you use a user name? Then enter it", "")
Global ProxyPassword$ = InputRequester("ProxyPass", "Do you use a password ? Then enter it", "") Global ProxyPassword$ = InputRequester("ProxyPass", "Do you use a password ? Then enter it", "") ;TODO
EndIf EndIf
If Result
ClosePreferences() ClosePreferences()
EndIf
curl_global_init(#CURL_GLOBAL_WIN32); curl_global_init(#CURL_GLOBAL_WIN32);
;- Main drawing thread launching ;- Main drawing thread launching
;PBMap\MainDrawingThread = CreateThread(@DrawingThread(), @PBMap\Drawing) ;PBMap\MainDrawingThread = CreateThread(@DrawingThread(), @PBMap\Drawing)
;If PBMap\MainDrawingThread = 0 ;If PBMap\MainDrawingThread = 0
; Error("MapGadget : can't create main drawing thread.") ; Error("MapGadget : can't create main drawing thread.")
@@ -300,35 +310,18 @@ Module PBMap
EndProcedure EndProcedure
Procedure Quit() Procedure Quit()
<<<<<<< HEAD
;kill main drawing thread (nicer than KillThread(PBMap\MainDrawingThread))
;LockMutex(PBMap\Drawing\Mutex)
PBMap\Drawing\End = #True PBMap\Drawing\End = #True
;UnlockMutex(PBMap\Drawing\Mutex) ; ;wait for loading threads to finish nicely
;wait for loading threads to finish nicely ; ResetList(PBMap\TilesThreads())
ResetList(PBMap\TilesThreads()) ; While NextElement(PBMap\TilesThreads())
While NextElement(PBMap\TilesThreads()) ; If IsThread(PBMap\TilesThreads()\GetImageThread) = 0
If IsThread(PBMap\TilesThreads()\GetImageThread) = 0 ; FreeMemory(PBMap\TilesThreads()\Tile)
FreeMemory(PBMap\TilesThreads()\Tile) ; DeleteElement(PBMap\TilesThreads())
DeleteElement(PBMap\TilesThreads()) ; ResetList( PBMap\TilesThreads())
ResetList( PBMap\TilesThreads()) ; EndIf
======= ; Wend
Protected TimeCounter.q
;Ask main drawing thread to stop and wait for it for 2 seconds
LockMutex(PBMap\Drawing\Mutex)
PBMap\Drawing\End = #True
UnlockMutex(PBMap\Drawing\Mutex)
TimeCounter = ElapsedMilliseconds()
Repeat
Delay(100)
If ElapsedMilliseconds() - TimeCounter > 2000
;Should not occur
KillThread(PBMap\MainDrawingThread)
>>>>>>> refs/remotes/origin/djes
EndIf
Until Not IsThread(PBMap\MainDrawingThread)
;Wait for loading threads to finish nicely. Passed 2 seconds, kills them. ;Wait for loading threads to finish nicely. Passed 2 seconds, kills them.
TimeCounter = ElapsedMilliseconds() Protected TimeCounter = ElapsedMilliseconds()
Repeat Repeat
ResetList(PBMap\TilesThreads()) ResetList(PBMap\TilesThreads())
While NextElement(PBMap\TilesThreads()) While NextElement(PBMap\TilesThreads())
@@ -459,20 +452,6 @@ Module PBMap
EndIf EndIf
EndProcedure EndProcedure
<<<<<<< HEAD
=======
Procedure.i GetTileFromMem(key.s)
MyDebug("Check if we have this image in memory", 3)
If FindMapElement(PBMap\MemCache\Images(), key)
MyDebug("Key : " + key + " found !", 3)
ProcedureReturn PBMap\MemCache\Images()\nImage
Else
MyDebug("Key : " + key + " not found !", 3)
ProcedureReturn -1
EndIf
EndProcedure
>>>>>>> refs/remotes/origin/djes
Procedure.i GetTileFromHDD(CacheFile.s) Procedure.i GetTileFromHDD(CacheFile.s)
Protected nImage.i Protected nImage.i
Debug "Loading image " + CacheFile + " ; Size : " + Str(FileSize(CacheFile)) Debug "Loading image " + CacheFile + " ; Size : " + Str(FileSize(CacheFile))
@@ -487,20 +466,31 @@ Module PBMap
MyDebug("Failed loading " + CacheFile + " as nImage " + Str(nImage) + " -> not an image !", 3) MyDebug("Failed loading " + CacheFile + " as nImage " + Str(nImage) + " -> not an image !", 3)
EndIf EndIf
Else Else
Debug "Failed loading " + CacheFile + " -> Size = 0" Debug "Failed loading " + CacheFile + " -> Size <= 0"
MyDebug("Failed loading " + CacheFile + " -> Size = 0", 3) MyDebug("Failed loading " + CacheFile + " -> Size <= 0", 3)
EndIf EndIf
ProcedureReturn -1 ProcedureReturn -1
EndProcedure EndProcedure
Procedure.i GetTileFromMem(Zoom.i, XTile.i, YTile.i) ; Procedure.i GetTileFromMem(Zoom.i, XTile.i, YTile.i)
Protected key.s = "Z" + RSet(Str(Zoom), 4, "0") + "X" + RSet(Str(XTile), 8, "0") + "Y" + RSet(Str(YTile), 8, "0") ; Protected key.s = "Z" + RSet(Str(Zoom), 4, "0") + "X" + RSet(Str(XTile), 8, "0") + "Y" + RSet(Str(YTile), 8, "0")
MyDebug("Check if we have this image in memory") ; MyDebug("Check if we have this image in memory")
; If FindMapElement(PBMap\MemCache\Images(), key)
; MyDebug("Key : " + key + " found !")
; ProcedureReturn PBMap\MemCache\Images()\nImage
; Else
; Protected CacheFile.s = PBMap\HDDCachePath + "PBMap_" + Str(Zoom) + "_" + Str(XTile) + "_" + Str(YTile) + ".png"
; MyDebug("Key : " + key + " Try HDD!")
; ProcedureReturn GetTileFromHDD(CacheFile.s)
; EndIf
; EndProcedure
Procedure.i GetLocalTile(key.s, CacheFile.s)
MyDebug("Check if we have this image in memory", 3)
If FindMapElement(PBMap\MemCache\Images(), key) If FindMapElement(PBMap\MemCache\Images(), key)
MyDebug("Key : " + key + " found !") MyDebug("Key : " + key + " found !", 3)
ProcedureReturn PBMap\MemCache\Images()\nImage ProcedureReturn PBMap\MemCache\Images()\nImage
Else Else
Protected CacheFile.s = PBMap\HDDCachePath + "PBMap_" + Str(Zoom) + "_" + Str(XTile) + "_" + Str(YTile) + ".png"
MyDebug("Key : " + key + " Try HDD!") MyDebug("Key : " + key + " Try HDD!")
ProcedureReturn GetTileFromHDD(CacheFile.s) ProcedureReturn GetTileFromHDD(CacheFile.s)
EndIf EndIf
@@ -524,13 +514,9 @@ Module PBMap
If *Buffer If *Buffer
nImage = CatchImage(#PB_Any, *Buffer, MemorySize(*Buffer)) nImage = CatchImage(#PB_Any, *Buffer, MemorySize(*Buffer))
If IsImage(nImage) If IsImage(nImage)
<<<<<<< HEAD MyDebug("Load from web " + TileURL + " as Tile nb " + nImage, 3)
MyDebug("Load from web " + TileURL + " as Tile nb " + nImage)
Debug "url: " + TileURL Debug "url: " + TileURL
Debug "cache file: " + CacheFile Debug "cache file: " + CacheFile
=======
MyDebug("Load from web " + TileURL + " as Tile nb " + nImage, 3)
>>>>>>> refs/remotes/origin/djes
SaveImage(nImage, CacheFile, #PB_ImagePlugin_PNG) SaveImage(nImage, CacheFile, #PB_ImagePlugin_PNG)
FreeMemory(*Buffer) FreeMemory(*Buffer)
Else Else
@@ -539,11 +525,8 @@ Module PBMap
;ShowMemoryViewer(*Buffer, MemorySize(*Buffer)) ;ShowMemoryViewer(*Buffer, MemorySize(*Buffer))
EndIf EndIf
Else Else
<<<<<<< HEAD
Debug("ReceiveHTTPMemory's buffer is empty") Debug("ReceiveHTTPMemory's buffer is empty")
=======
MyDebug("ReceiveHTTPMemory's buffer is empty", 3) MyDebug("ReceiveHTTPMemory's buffer is empty", 3)
>>>>>>> refs/remotes/origin/djes
EndIf EndIf
EndIf EndIf
ProcedureReturn nImage ProcedureReturn nImage
@@ -551,61 +534,23 @@ Module PBMap
Procedure GetImageThread(*Tile.Tile) Procedure GetImageThread(*Tile.Tile)
Protected nImage.i = -1 Protected nImage.i = -1
<<<<<<< HEAD
LockMutex(PBMap\TileThreadMutex)
Protected key.s = "Z" + RSet(Str(*Tile\PBMapZoom), 4, "0") + "X" + RSet(Str(*Tile\PBMapTileX), 8, "0") + "Y" + RSet(Str(*Tile\PBMapTileY), 8, "0")
Protected CacheFile.s = PBMap\HDDCachePath + "PBMap_" + Str(*Tile\PBMapZoom) + "_" + Str(*Tile\PBMapTileX) + "_" + Str(*Tile\PBMapTileY) + ".png"
;Adding the image to the cache if possible
AddMapElement(PBMap\MemCache\Images(), key)
PBMap\MemCache\Images()\nImage= PBMap\ImgLoading
UnlockMutex(PBMap\TileThreadMutex)
;nImage = GetTileFromHDD(CacheFile) ;nImage = GetTileFromHDD(CacheFile)
;If nImage = -1 ;If nImage = -1
; LockMutex(PBMap\TileThreadMutex) nImage = GetTileFromWeb(*Tile\PBMapZoom, *Tile\PBMapTileX, *Tile\PBMapTileY, *Tile\CacheFile)
nImage = GetTileFromWeb(*Tile\PBMapZoom, *Tile\PBMapTileX, *Tile\PBMapTileY, CacheFile)
;UnlockMutex(PBMap\TileThreadMutex)
;EndIf ;EndIf
If nImage <> -1 If nImage <> -1
LockMutex(PBMap\TileThreadMutex) LockMutex(PBMap\TileThreadMutex)
PBMap\MemCache\Images(key)\nImage = nImage PBMap\MemCache\Images(*Tile\key)\nImage = nImage
UnlockMutex(PBMap\TileThreadMutex) UnlockMutex(PBMap\TileThreadMutex)
MyDebug("Image nb " + Str(nImage) + " successfully added to mem cache") MyDebug("Image nb " + Str(nImage) + " successfully added to mem cache")
MyDebug("With the following key : " + key) MyDebug("With the following key : " + *Tile\key)
Else Else
MyDebug("Error GetImageThread procedure, image not loaded - " + key) MyDebug("Error GetImageThread procedure, image not loaded - " + *Tile\key)
nImage = -1 nImage = -1
EndIf EndIf
;Define this tile image nb ;Define this tile image nb
*Tile\nImage = nImage *Tile\nImage = nImage
PostEvent(#PB_Event_Gadget,PBMap\window,PBmap\Gadget,#PB_MAP_REDRAW,*tile) PostEvent(#PB_Event_Gadget,PBMap\window,PBmap\Gadget,#PB_MAP_REDRAW,*tile)
=======
Protected CacheFile.s = PBMap\HDDCachePath + "PBMap_" + Str(*Tile\PBMapZoom) + "_" + Str(*Tile\PBMapTileX) + "_" + Str(*Tile\PBMapTileY) + ".png"
Protected Tile.position
; PBMap\MemCache\Images(*Tile\key)\Mutex = CreateMutex()
; LockMutex(PBMap\MemCache\Images(*Tile\key)\Mutex)
; LockMutex(LoadMutexTest)
nImage = GetTileFromHDD(CacheFile)
; UnlockMutex(LoadMutexTest)
If nImage = -1
nImage = GetTileFromWeb(*Tile\PBMapZoom, *Tile\PBMapTileX, *Tile\PBMapTileY, CacheFile)
If nImage = -1
MyDebug("Error GetImageThread procedure, image not loaded - " + *Tile\key, 3)
*Tile\nImage = -1
ProcedureReturn
EndIf
EndIf
PBMap\MemCache\Images(*Tile\key)\nImage = nImage
; Tile\x=*Tile\PBMapTileX
; Tile\y=*Tile\PBMapTiley
; XY2LatLon(@Tile,@PBMap\MemCache\Images(*Tile\key)\Location)
MyDebug("Image nb " + Str(nImage) + " successfully added to mem cache", 3)
MyDebug("With the following key : " + *Tile\key, 3)
;Define this tile image nb
*Tile\nImage = nImage
; UnlockMutex(PBMap\MemCache\Images(key)\Mutex)
>>>>>>> refs/remotes/origin/djes
EndProcedure EndProcedure
Procedure DrawTile(*Tile.Tile) Procedure DrawTile(*Tile.Tile)
@@ -621,35 +566,8 @@ Module PBMap
Protected x = *Tile\Position\x Protected x = *Tile\Position\x
Protected y = *Tile\Position\y Protected y = *Tile\Position\y
Protected Text$ = "Loading" Protected Text$ = "Loading"
<<<<<<< HEAD
MyDebug(" Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX))
MyDebug(" at coords " + Str(x) + "," + Str(y))
; BeginVectorLayer()
; ;MovePathCursor(x, y)
; VectorSourceColor(RGBA(255, 255, 255, 128))
; AddPathBox(x, y, PBMap\TileSize, PBMap\TileSize)
; FillPath()
; MovePathCursor(x, y)
; VectorFont(FontID(PBMap\Font), PBMap\TileSize / 20)
; VectorSourceColor(RGBA(150, 150, 150, 255))
; MovePathCursor(x + (PBMap\TileSize - VectorTextWidth(Text$)) / 2, y + (PBMap\TileSize - VectorTextHeight(Text$)) / 2)
; DrawVectorText(Text$)
; EndVectorLayer()
=======
MyDebug(" Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX), 2) MyDebug(" Drawing tile nb " + " X : " + Str(*Tile\PBMapTileX) + " Y : " + Str(*Tile\PBMapTileX), 2)
MyDebug(" at coords " + Str(x) + "," + Str(y), 2) MyDebug(" at coords " + Str(x) + "," + Str(y))
BeginVectorLayer()
;MovePathCursor(x, y)
VectorSourceColor(RGBA(255, 255, 255, 128))
AddPathBox(x, y, PBMap\TileSize, PBMap\TileSize)
FillPath()
MovePathCursor(x, y)
VectorFont(FontID(PBMap\Font), PBMap\TileSize / 20)
VectorSourceColor(RGBA(150, 150, 150, 255))
MovePathCursor(x + (PBMap\TileSize - VectorTextWidth(Text$)) / 2, y + (PBMap\TileSize - VectorTextHeight(Text$)) / 2)
DrawVectorText(Text$)
EndVectorLayer()
>>>>>>> refs/remotes/origin/djes
EndProcedure EndProcedure
Procedure DrawTiles(*Drawing.DrawingParameters) Procedure DrawTiles(*Drawing.DrawingParameters)
@@ -659,40 +577,26 @@ Module PBMap
Protected ty = Int(*Drawing\Position\y) Protected ty = Int(*Drawing\Position\y)
Protected nx = *Drawing\CenterX / PBMap\TileSize ;How many tiles around the point Protected nx = *Drawing\CenterX / PBMap\TileSize ;How many tiles around the point
Protected ny = *Drawing\CenterY / PBMap\TileSize Protected ny = *Drawing\CenterY / PBMap\TileSize
<<<<<<< HEAD
Protected px,py,img
Protected px, py, img, key.s, CacheFile.s
MyDebug("Drawing tiles") MyDebug("Drawing tiles")
For y = - ny - 1 To ny + 1 For y = - ny - 1 To ny + 1
For x = - nx - 1 To nx + 1 For x = - nx - 1 To nx + 1
px = *Drawing\CenterX + x * PBMap\TileSize - *Drawing\DeltaX px = *Drawing\CenterX + x * PBMap\TileSize - *Drawing\DeltaX
py = *Drawing\CenterY + y * PBMap\TileSize - *Drawing\DeltaY py = *Drawing\CenterY + y * PBMap\TileSize - *Drawing\DeltaY
img = GetTileFromMem(PBMap\Zoom,tx+x,ty+y) CacheFile = PBMap\HDDCachePath + "PBMap_" + Str(PBMap\Zoom) + "_" + Str(tx + x) + "_" + Str(ty + y) + ".png"
key = "Z" + RSet(Str(PBMap\Zoom), 4, "0") + "X" + RSet(Str(tx + x), 8, "0") + "Y" + RSet(Str(ty + y), 8, "0") ;Unique identifier
img = GetLocalTile(key, CacheFile)
If img <> -1 If img <> -1
MovePathCursor(px, py) MovePathCursor(px, py)
DrawVectorImage(ImageID(img)) DrawVectorImage(ImageID(img))
Else Else
MovePathCursor(px, py) MovePathCursor(px, py)
DrawVectorImage(ImageID(PBMap\ImgLoading)) DrawVectorImage(ImageID(PBMap\ImgLoading))
Protected *NewTile.Tile = AllocateMemory(SizeOf(Tile)) Protected *NewTile.Tile = AllocateMemory(SizeOf(Tile))
If *NewTile If *NewTile
With *NewTile With *NewTile
;Keep a track of tiles (especially to free memory) ;Keep a track of tiles (especially to free memory)
=======
MyDebug("Drawing tiles", 2)
For y = - ny - 1 To ny + 1
For x = - nx - 1 To nx + 1
;Was quiting the loop if a move occured, giving maybe smoother movement
;If PBMap\Moving
; Break 2
;EndIf
;Store parameters in only one memory place, and give it to the thread if needed
Protected *NewTile.Tile = AllocateMemory(SizeOf(Tile))
If *NewTile
With *NewTile
;Keep a track of tiles, and eventually associated threads, to free memory
>>>>>>> refs/remotes/origin/djes
AddElement(PBMap\TilesThreads()) AddElement(PBMap\TilesThreads())
PBMap\TilesThreads()\Tile = *NewTile PBMap\TilesThreads()\Tile = *NewTile
;New tile parameters ;New tile parameters
@@ -701,7 +605,12 @@ Module PBMap
\PBMapTileX = tx + x \PBMapTileX = tx + x
\PBMapTileY = ty + y \PBMapTileY = ty + y
\PBMapZoom = PBMap\Zoom \PBMapZoom = PBMap\Zoom
<<<<<<< HEAD \key = key
\CacheFile = CacheFile
LockMutex(PBMap\TileThreadMutex)
AddMapElement(PBMap\MemCache\Images(), \key) ;Add the image to the cache, once in this loop
PBMap\MemCache\Images()\nImage = PBMap\ImgLoading
UnlockMutex(PBMap\TileThreadMutex)
\GetImageThread = CreateThread(@GetImageThread(), *NewTile) \GetImageThread = CreateThread(@GetImageThread(), *NewTile)
PBMap\TilesThreads()\GetImageThread = \GetImageThread PBMap\TilesThreads()\GetImageThread = \GetImageThread
myDebug(" Creating get image thread nb " + Str(\GetImageThread)) myDebug(" Creating get image thread nb " + Str(\GetImageThread))
@@ -712,33 +621,6 @@ Module PBMap
MyDebug(" Error, can't create a new tile") MyDebug(" Error, can't create a new tile")
Break 2 Break 2
EndIf EndIf
=======
\key = "Z" + RSet(Str(\PBMapZoom), 4, "0") + "X" + RSet(Str(\PBMapTileX), 8, "0") + "Y" + RSet(Str(\PBMapTileY), 8, "0") ;Unique identifier
;Check if the image exists
\nImage = GetTileFromMem(\key)
If \nImage = -1
;If not, load it in the background
If AddMapElement(PBMap\MemCache\Images(), \key) ;Add the image to the cache, once in this loop
\GetImageThread = CreateThread(@GetImageThread(), *NewTile)
PBMap\TilesThreads()\GetImageThread = \GetImageThread
MyDebug(" Creating get image thread nb " + Str(\GetImageThread), 2)
Else
MyDebug(" Can't add a new image to the map list", 2)
CallDebugger
EndIf
EndIf
If IsImage(\nImage)
DrawTile(*NewTile)
Else
MyDebug("Image missing", 2)
DrawLoading(*NewTile)
*Drawing\Dirty = #True ;Signals that this image is missing so we should have to redraw
EndIf
EndWith
Else
MyDebug(" Error, can't create a new tile", 2)
Break 2
>>>>>>> refs/remotes/origin/djes
EndIf EndIf
Next Next
Next Next
@@ -751,23 +633,22 @@ Module PBMap
DeleteElement(PBMap\TilesThreads()) DeleteElement(PBMap\TilesThreads())
EndIf EndIf
Next Next
<<<<<<< HEAD
;EnableDebugger ;EnableDebugger
EndProcedure EndProcedure
Procedure Pointer(x.i, y.i, color.l = #Red) ; Procedure Pointer(x.i, y.i, color.l = #Red)
color=RGBA(255, 0, 0, 255) ; color=RGBA(255, 0, 0, 255)
VectorSourceColor(color) ; VectorSourceColor(color)
MovePathCursor(x, y) ; MovePathCursor(x, y)
AddPathLine(-8,-16,#PB_Path_Relative) ; AddPathLine(-8,-16,#PB_Path_Relative)
AddPathCircle(8,0,8,180,0,#PB_Path_Relative) ; AddPathCircle(8,0,8,180,0,#PB_Path_Relative)
AddPathLine(-8,16,#PB_Path_Relative) ; AddPathLine(-8,16,#PB_Path_Relative)
;FillPath(#PB_Path_Preserve) ; ;FillPath(#PB_Path_Preserve)
;ClipPath(#PB_Path_Preserve) ; ;ClipPath(#PB_Path_Preserve)
AddPathCircle(0,-16,5,0,360,#PB_Path_Relative) ; AddPathCircle(0,-16,5,0,360,#PB_Path_Relative)
VectorSourceColor(color) ; VectorSourceColor(color)
FillPath(#PB_Path_Preserve):VectorSourceColor(RGBA(0, 0, 0, 255)):StrokePath(1) ; FillPath(#PB_Path_Preserve):VectorSourceColor(RGBA(0, 0, 0, 255)):StrokePath(1)
======= ; EndProcedure
; ;-**** Clean Mem Cache ; ;-**** Clean Mem Cache
; ;TODO in development, by now there's many cache problem as the loading thread could be perturbed ; ;TODO in development, by now there's many cache problem as the loading thread could be perturbed
; ;GadgetWidth(PBMap\Gadget)/PBMap\TileSize ; ;GadgetWidth(PBMap\Gadget)/PBMap\TileSize
@@ -794,7 +675,6 @@ Module PBMap
; EndIf ; EndIf
; Next ; Next
EndProcedure
Procedure DrawPointer(*Drawing.DrawingParameters) Procedure DrawPointer(*Drawing.DrawingParameters)
If PBMap\CallBackMainPointer > 0 If PBMap\CallBackMainPointer > 0
@@ -813,7 +693,6 @@ Module PBMap
FillPath(#PB_Path_Preserve):VectorSourceColor(RGBA($FF, 0, 0, $FF));RGBA(0, 0, 0, 255)) FillPath(#PB_Path_Preserve):VectorSourceColor(RGBA($FF, 0, 0, $FF));RGBA(0, 0, 0, 255))
StrokePath(1) StrokePath(1)
EndIf EndIf
>>>>>>> refs/remotes/origin/djes
EndProcedure EndProcedure
Procedure DrawScale(*Drawing.DrawingParameters) Procedure DrawScale(*Drawing.DrawingParameters)
@@ -938,11 +817,20 @@ Module PBMap
;Drawing\Dirty = #False ;Drawing\Dirty = #False
;Main drawing stuff ;Main drawing stuff
StartVectorDrawing(CanvasVectorOutput(PBMap\Gadget)) StartVectorDrawing(CanvasVectorOutput(PBMap\Gadget))
<<<<<<< HEAD
DrawTiles(*Drawing) DrawTiles(*Drawing)
DrawTrack(*Drawing)
DrawMarker(*Drawing)
DrawPointer(*Drawing)
;DrawTrack(*Drawing) ;DrawTrack(*Drawing)
;DrawMarker(*Drawing) ;DrawMarker(*Drawing)
;Pointer(*Drawing\CenterX, *Drawing\CenterY, #Red) ;Pointer(*Drawing\CenterX, *Drawing\CenterY, #Red)
;- Display how many images in cache
VectorFont(FontID(PBMap\Font), 30)
VectorSourceColor(RGBA(0, 0, 0, 80))
MovePathCursor(50,50)
DrawVectorText(Str(MapSize(PBMap\MemCache\Images())))
MovePathCursor(50,80)
DrawVectorText(Str(ListSize(PBMap\TilesThreads())))
StopVectorDrawing() StopVectorDrawing()
;Redraw ;Redraw
; If something was not correctly drawn, redraw after a while ; If something was not correctly drawn, redraw after a while
@@ -957,34 +845,6 @@ Module PBMap
; EndIf ; EndIf
;UnlockMutex(*SharedDrawing\Mutex) ;UnlockMutex(*SharedDrawing\Mutex)
;Until Drawing\End ;Until Drawing\End
=======
DrawTiles(@Drawing)
DrawTrack(@Drawing)
DrawMarker(@Drawing)
DrawPointer(@Drawing)
;DrawScale(@Drawing)
;- Display how many images in cache
VectorFont(FontID(PBMap\Font), 30)
VectorSourceColor(RGBA(0, 0, 0, 80))
MovePathCursor(50,50)
DrawVectorText(Str(MapSize(PBMap\MemCache\Images())))
MovePathCursor(50,80)
DrawVectorText(Str(ListSize(PBMap\TilesThreads())))
StopVectorDrawing()
;Redraw
; If something was not correctly drawn, redraw after a while
LockMutex(*SharedDrawing\Mutex) ;Be sure that we're not modifying variables while moving (seems not useful, but it is, especially to clean the semaphore)
If Drawing\Dirty
MyDebug("Something was dirty ! We try again to redraw")
Drawing\PassNb + 1
SignalSemaphore(*SharedDrawing\Semaphore)
Else
;Clean the semaphore to avoid multiple unuseful redraws
Repeat : Until TrySemaphore(*SharedDrawing\Semaphore) = 0
EndIf
UnlockMutex(*SharedDrawing\Mutex)
Until Drawing\End
>>>>>>> refs/remotes/origin/djes
EndProcedure EndProcedure
Procedure Refresh() Procedure Refresh()
@@ -1089,6 +949,10 @@ Module PBMap
PBMap\CallBackLocation = CallBackLocation PBMap\CallBackLocation = CallBackLocation
EndProcedure EndProcedure
Procedure SetCallBackMainPointer(CallBackMainPointer.i)
PBMap\CallBackMainPointer = CallBackMainPointer
EndProcedure
Procedure.d GetLatitude() Procedure.d GetLatitude()
Protected Value.d Protected Value.d
; LockMutex(PBMap\Drawing\Mutex) ; LockMutex(PBMap\Drawing\Mutex)
@@ -1157,19 +1021,16 @@ Module PBMap
;New move values ;New move values
PBMap\Position\x - MouseX PBMap\Position\x - MouseX
PBMap\Position\y - MouseY PBMap\Position\y - MouseY
<<<<<<< HEAD
;-*** Fill parameters and signal the drawing thread ;-*** Fill parameters and signal the drawing thread
; LockMutex(PBMap\Drawing\Mutex) ; LockMutex(PBMap\Drawing\Mutex)
=======
;Fill parameters and send a signal to the drawing thread
LockMutex(PBMap\Drawing\Mutex)
>>>>>>> refs/remotes/origin/djes
;PBMap tile position in tile.decimal ;PBMap tile position in tile.decimal
PBMap\Drawing\Position\x = PBMap\Position\x / PBMap\TileSize PBMap\Drawing\Position\x = PBMap\Position\x / PBMap\TileSize
PBMap\Drawing\Position\y = PBMap\Position\y / PBMap\TileSize PBMap\Drawing\Position\y = PBMap\Position\y / PBMap\TileSize
PBMap\Drawing\PassNb = 1 PBMap\Drawing\PassNb = 1
XY2LatLon(@PBMap\Drawing, @PBMap\TargetLocation) XY2LatLon(@PBMap\Drawing, @PBMap\TargetLocation)
<<<<<<< HEAD
;If CallBackLocation send Location to function ;If CallBackLocation send Location to function
If PBMap\CallBackLocation > 0 If PBMap\CallBackLocation > 0
CallFunctionFast(PBMap\CallBackLocation, @PBMap\TargetLocation) CallFunctionFast(PBMap\CallBackLocation, @PBMap\TargetLocation)
@@ -1180,16 +1041,6 @@ Module PBMap
;SignalSemaphore(PBMap\Drawing\Semaphore) ;SignalSemaphore(PBMap\Drawing\Semaphore)
DrawingThread() DrawingThread()
;- *** ;- ***
=======
UnlockMutex(PBMap\Drawing\Mutex)
;Start drawing
SignalSemaphore(PBMap\Drawing\Semaphore)
EndIf
;If CallBackLocation send Location to function
If PBMap\CallBackLocation > 0
CallFunctionFast(PBMap\CallBackLocation, @PBMap\TargetLocation)
EndIf
>>>>>>> refs/remotes/origin/djes
PBMap\MoveStartingPoint\x = GetGadgetAttribute(PBMap\Gadget, #PB_Canvas_MouseX) PBMap\MoveStartingPoint\x = GetGadgetAttribute(PBMap\Gadget, #PB_Canvas_MouseX)
PBMap\MoveStartingPoint\y = GetGadgetAttribute(PBMap\Gadget, #PB_Canvas_MouseY) PBMap\MoveStartingPoint\y = GetGadgetAttribute(PBMap\Gadget, #PB_Canvas_MouseY)
; DrawingThread() ; DrawingThread()
@@ -1357,24 +1208,12 @@ CompilerIf #PB_Compiler_IsMainFile
CloseConsole() CloseConsole()
CompilerEndIf CompilerEndIf
<<<<<<< HEAD
; IDE Options = PureBasic 5.42 LTS (Windows - x86) ; IDE Options = PureBasic 5.42 LTS (Windows - x86)
; CursorPosition = 1073 ; ExecutableFormat = Console
; FirstLine = 1062 ; CursorPosition = 333
; Folding = -------- ; FirstLine = 331
; EnableUnicode
=======
; IDE Options = PureBasic 5.50 (Windows - x64)
; CursorPosition = 450
; FirstLine = 444
; Folding = --------- ; Folding = ---------
>>>>>>> refs/remotes/origin/djes ; EnableUnicode
; EnableThread ; EnableThread
; EnableXP ; EnableXP
; EnableUnicode
; IDE Options = PureBasic 5.42 LTS (Windows - x86)
; CursorPosition = 30
; FirstLine = 21
; Folding = ---------
; EnableUnicode
; EnableXP