Skip to content
Commits on Source (10)
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: 'bug'
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. OS X, Debian, Suse, Windows]
- QMapShack Version [e.g. 1.13.1]
**Additional context**
Add any other context about the problem here.
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.
**What is the linked issue for this pull request (start with a `#`):** QMS-#
**Describe roughly what you have done:**
I added...
**What steps have to be done to perform a simple smoke test:**
1. Open whatever
2. Click here
**Does the code comply to the coding rules and naming conventions [Coding Guidleines](https://github.com/Maproom/qmapshack/wiki/DeveloperCodingGuideline):**
- [ ] yes
**Is every user facing string in a tr() macro?**
- [ ] yes
**Is the change user facing?**
- [ ] yes,
- [ ] no
**If there are user facing changes did you add the ticket number and title into the changelog?**
- [ ] yes, I didn't forget to change changelog.txt
CMakeLists.txt.user
......@@ -40,7 +40,7 @@ endif(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR APP
# Define project name and version tags
###############################################################################################
# this is not only the QMS version it will be the package version, too.
project(QMapShack VERSION 1.13.2)
project(QMapShack VERSION 1.14.0)
# FOR A RELEASE:
# remove "development" for a release
......
This diff is collapsed.
......@@ -17,7 +17,8 @@ required:
- qmapshack
- cmake (version 3.x and above)
- svn command line tool (for routino)
- mercurial (hg) command line tool
- git (git) command line tool
- Xcode and Xcode Command Line Tools
Because brew nowadays does not include qt5 with mysql the best way is to install most of the required packages by using MacPorts and some by using brew.
When your build machine runs Mojave 10.14 QMapShack will also need 10.14 to run. For older OS X build system has to be an older version too.
......@@ -32,7 +33,7 @@ sudo port install qt5-qttranslations
sudo port install qt5-qtwebengine
sudo port install gdal
sudo port install mercurial
sudo port install proj4
sudo port install proj6
sudo port install quazip
Download the brew package manager if you not already have:
......@@ -40,7 +41,6 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/
After istalling brew use it to install the required packages:
brew install svn
brew install hg
The routino library source must be downloaded from the SVN repository
"http://routino.org/svn/trunk/" built manually.
......@@ -62,7 +62,7 @@ Script call:
Building QMapShack and QMapTool
*******************************
To get the source of QMapShack:
hg clone https://bitbucket.org/maproom/qmapshack
git clone https://github.com/Maproom/qmapshack.git QMapShack
In the same directory as this how to is the bash script "bundle-all.sh". The script
does all steps for packaging the application but not building the binary.
......@@ -70,7 +70,7 @@ So you need to build the binary first with the commands:
mkdir build_QMapShack
cd build_QMapShack
cmake ../QMapShack -DCMAKE_PREFIX_PATH=/opt/local/libexec/qt5 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DROUTINO_DEV_PATH=... -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DQUAZIP_INCLUDE_DIR=/opt/local/include/quazip5 -DQUAZIP_LIBRARIES=/opt/local/lib/libquazip5.1.0.0.dylib -DPROJ4_ROOT=/opt/local/lib/proj5 -DPROJ4_INCLUDE_DIRS=/opt/local/lib/proj5/include -DPROJ4_LIBRARIES=/opt/local/lib/proj5/lib/libproj.13.dylib
cmake ../QMapShack -DCMAKE_PREFIX_PATH=/opt/local/libexec/qt5 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DROUTINO_DEV_PATH=... -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DQUAZIP_INCLUDE_DIR=/opt/local/include/quazip5 -DQUAZIP_LIBRARIES=/opt/local/lib/libquazip5.1.0.0.dylib -DPROJ4_ROOT=/opt/local/lib/proj6 -DPROJ4_INCLUDE_DIRS=/opt/local/lib/proj6/include -DPROJ4_LIBRARIES=/opt/local/lib/proj6/lib/libproj.15.dylib
make
"QMapShack" is the relative path to where you have checked out QMapShack.
......@@ -78,7 +78,7 @@ make
The passed parameter are more or less self describing:
CMAKE_PREFIX_PATH path to used libraries by QMapShack, QT5 needs to be set by default.
CMAKE_OSX_DEPLOYMENT_TARGET the target system of the build (10.12 is the Sierra OS-X, see https://en.wikipedia.org/wiki/OS_X#Versions for a full list)
CMAKE_OSX_DEPLOYMENT_TARGET the target system of the build (10.12 is the Sierra OS-X, see https://en.wikipedia.org/wiki/OS_X#Versions for a full list, best results when set to the OS X of build machine)
ROUTINO_DEV_PATH The path to the routino library (is the same as you set previously with ROUTINO_LIB_DIR)
CMAKE_BUILD_TYPE "Debug" or "Release" depending what you want
DCMAKE_VERBOSE_MAKEFILE enable verbose output from Makefile builds
......@@ -96,7 +96,7 @@ variables set:
QT_DIR=... (absolute path to the qt5 library base package, same as in CMAKE_PREFIX_PATH, z.B. /opt/local/libexec/qt5 )
GDAL_DIR=... (absolute path to the gdal library base package, z.B. /opt/local )
PROJ_DIR=... (absolute path to the proj4 library base package, z.B. /opt/local/lib/proj5)
PROJ_DIR=... (absolute path to the proj4 library base package, z.B. /opt/local/lib/proj6)
ROUTINO_LIB_DIR=.. (absolute path to the routino library base package, same as ROUTINO_LIB_DIR / ROUTINO_DEV_PATH, z.B. /Users/.../Desktop/ROUTINO_BUILD )
QUAZIP_LIB_DIR=.. (absolute path to the Quazip library base package)
BUILD_DIR=.. (absolute path to the QMapShack build directory, the created directory "build_QMapShack" for the cmake build)
......
......@@ -61,7 +61,7 @@ function copyExtTools {
function adjustLinkingExtTools {
for F in `find $BUILD_BUNDLE_RES_BIN_DIR -type f ! \( -name "*.py" \)`
do
adjustLinkQt $F "/usr/local/"
adjustLinkQt $F "/opt/local/"
done
}
......
......@@ -3,6 +3,7 @@
APP_VERSION=0
BUILD_TIME=$(date +"%y-%m-%dT%H:%M:%S")
BUILD_HASH_KEY=0
COMMIT_STATUS=0
function buildIcon {
......@@ -250,17 +251,16 @@ function extractVersion {
APP_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION"
}
function readRevisionHash {
cd $QMS_SRC_DIR
BUILD_HASH_KEY=$(hg --debug id -i)
BUILD_HASH_KEY=$(git rev-parse HEAD)
COMMIT_STATUS=$(git status -s -uno)
if [[ "$BUILD_HASH_KEY" == *"+"* ]]; then
read -p "BEWARE - There are uncommited chagnes..."
if [[ "$COMMIT_STATUS" != "" ]]; then
read -p "BEWARE - There are uncommited changes..."
fi
}
function updateInfoPlist {
/usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $APP_VERSION" "$BUILD_BUNDLE_CONTENTS_DIR/Info.plist"
/usr/libexec/PlistBuddy -c "Set :CFBundleVersion $APP_VERSION" "$BUILD_BUNDLE_CONTENTS_DIR/Info.plist"
......
Next to all dependencies you need a working mercurial, g++ and cmake installation to compile QMapShack on your computer. Clone and compile the code base by:
Next to all dependencies you need a working GIT, g++ and cmake installation to compile QMapShack on your computer. Clone and compile the code base by:
hg clone https://bitbucket.org/maproom/qmapshack QMapShack
git clone https://github.com/Maproom/qmapshack.git QMapShack
cd QMapShack
git checkout dev
cd ..
mkdir build_QMapShack
cd build_QMapShack
ccmake ../QMapShack
......@@ -8,15 +11,12 @@ Next to all dependencies you need a working mercurial, g++ and cmake installatio
To update the code to the cutting edge do in QMapShack:
hg pull
hg update
git pull
And change back to build_QMapShack:
make
As everything is better with a GUI you might want to have a look at [TortoiseHg](https://tortoisehg.bitbucket.io/).
Dependencies
* [Qt5](https://www.qt.io/) (at least 5.8)
......@@ -27,4 +27,4 @@ Dependencies
* CMake/Make
* a C++ compiler (supporting C++11)
If you want to compile QMapShack for Windows have a look [at the wiki](https://bitbucket.org/maproom/qmapshack/wiki/BuildWindowsVisualStudio).
V1.XX.X
[QMS-5] App crashes on using the "Change Start Point" filter
[QMS-6] Enhance overview detection for VRT maps
[QMS-8] Incorrect elevation for fit files from GPSMAP 66s
[QMS-12] Unify versions of all QMapShack tools
[QMS-13] Add support for Garmin Edge 500
[QMS-14] Drawing track: Alternate mode O A V T with a simple key with no modifiers
[QMS-18] Improved explanation of 'Date equals'
[QMS-19] Invalid GPX due to `::` in `ql` namespace
[QMS-20] Windows Start Menu - change links from bitbucket to github
[QMS-22] Aviation units: nm for distances and feet for altitude
[QMS-27] Error in workspace search for attributes
[QMS-31] Fix all links to Bitbucket in the code
[QMS-53] Unload Garmin `Archive` when folder is deflated
[QMS-54] Invalid point cannot be deactivated when tracks are read from the navigation device
------------------------------------------------------------------------
---------Restart issue numbering because of migration to GitHub---------
------------------------------------------------------------------------
V 1.13.2
[Issue #446] Advanced Filtering System
[Issue #491] Skip saving of geo search
......
qmapshack (1.14.0-1~bpo10+1) buster-backports; urgency=medium
* Rebuild for buster-backports.
-- Bas Couwenberg <sebastic@debian.org> Wed, 06 Nov 2019 06:04:37 +0100
qmapshack (1.14.0-1) unstable; urgency=medium
* New upstream release.
* Update URLs for move to GitHub.
* Bump Standards-Version to 4.4.1, no changes.
* Add Johannes Zellner to copyright holders.
* Drop spelling-errors.patch, applied upstream.
-- Bas Couwenberg <sebastic@debian.org> Fri, 01 Nov 2019 09:29:57 +0100
qmapshack (1.13.2-1~bpo10+1) buster-backports; urgency=medium
* Rebuild for buster-backports.
......
......@@ -17,10 +17,10 @@ Build-Depends: cmake,
qttools5-dev,
qttools5-dev-tools,
qtwebengine5-dev
Standards-Version: 4.4.0
Standards-Version: 4.4.1
Vcs-Browser: https://salsa.debian.org/debian-gis-team/qmapshack
Vcs-Git: https://salsa.debian.org/debian-gis-team/qmapshack.git -b buster-backports
Homepage: https://bitbucket.org/maproom/qmapshack/wiki/Home
Homepage: https://github.com/Maproom/qmapshack/wiki
Package: qmapshack
Architecture: any
......
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: QMapShack
Upstream-Contact: Oliver Eichler <oliver.eichler@gmx.de>
Source: https://bitbucket.org/maproom/qmapshack/downloads
Source: https://github.com/Maproom/qmapshack
Files: *
Copyright: 2006-2009, 2012, 2014-2018, Oliver Eichler <oliver.eichler@gmx.de>
2019, Henri Hornburg hrnbg@t-online.de>
2019, Johannes Zellner <johannes@zellner.org>
2016-2018, Michel Durand <zero@cms123.fr>
2017-2018, Norbert Truchsess <norbert.truchsess@t-online.de>
2015-2017, Christian Eichler <code@christian-eichler.de>
......
FindPROJ4.patch
FindQuaZip5.patch
spelling-errors.patch
This diff is collapsed.
---
Bug-Database: https://bitbucket.org/maproom/qmapshack/issues
Bug-Database: https://github.com/Maproom/qmapshack/issues
Bug-Submit: https://github.com/Maproom/qmapshack/issues/new
Contact: Oliver Eichler <oliver.eichler@gmx.de>
Name: QMapShack
Repository: https://bitbucket.org/maproom/qmapshack
Repository-Browse: https://bitbucket.org/maproom/qmapshack/src
Repository: https://github.com/Maproom/qmapshack.git
Repository-Browse: https://github.com/Maproom/qmapshack
......@@ -3,5 +3,5 @@ opts=\
dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\
uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/,\
filenamemangle=s/(?:.*?)?(?:rel|v|V|qmapshack)?[\-\_]?(?:%20)?(\d+\.\d\S+)\.(tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))/qmapshack-$1.$2/ \
https://bitbucket.org/maproom/qmapshack/downloads/ \
(?:.*?/)?(?:rel|v|V|qmapshack)?[\-\_]?(?:%20)?(\d+\.\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
https://github.com/Maproom/qmapshack/releases \
(?:.*?/archive/)?(?:rel|v|V|qmapshack)?[\-\_]?(?:%20)?(\d+\.\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
......@@ -23,6 +23,7 @@
; Note: the command line parameter "--style fusion" for qmapshack.exe switches to a GUI appearance which is perceived as less antique than the default
; See https://doc.qt.io/qt-5/qstyle.html https://doc.qt.io/qt-5/qstylefactory.html https://forum.qt.io/topic/23978/qfusionstyle https://forum.qt.io/topic/23978/qfusionstyle)
; 08-Apr-2019 Adapt to use of PROJ4 version 6.0
; 27-Sep-2019 Adapt start menue links from bitbucket to github
;=================== BEGIN SCRIPT ====================
; Include for nice Setup UI, see http://nsis.sourceforge.net/Docs/Modern%20UI%202/Readme.html
......@@ -276,8 +277,8 @@ Section "StartMenue" StartMenue
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapShack.lnk" "$INSTDIR\qmapshack.exe" "--style fusion" "$INSTDIR\QMapShack.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapTool.lnk" "$INSTDIR\qmaptool.exe" "--style fusion" "$INSTDIR\QMapTool.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\qmapshack.org.lnk" "https://bitbucket.org/maproom/qmapshack/wiki/Home" "" "$INSTDIR\kfm_home.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Help.lnk" "https://bitbucket.org/maproom/qmapshack/wiki/DocMain" "" "$INSTDIR\Help.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\qmapshack.org.lnk" "https://github.com/Maproom/qmapshack/wiki" "" "$INSTDIR\kfm_home.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Help.lnk" "https://github.com/Maproom/qmapshack/wiki/DocMain" "" "$INSTDIR\Help.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\gdal.org.lnk" "http://www.gdal.org/" "" "$INSTDIR\gdalicon.ico"
CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GDAL shell.lnk" %COMSPEC% "/k $\"$INSTDIR\gdal_shell.bat$\"" "" "" "" "" "GDAL shell"
!insertmacro MUI_STARTMENU_WRITE_END
......
......@@ -928,7 +928,7 @@ void CMainWindow::slotAbout()
void CMainWindow::slotHelp()
{
QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocMain"));
QDesktopServices::openUrl(QUrl("https://github.com/Maproom/qmapshack/wiki/DocMain"));
}
void CMainWindow::slotQuickstart()
......@@ -940,24 +940,24 @@ void CMainWindow::slotQuickstart()
locale = locale.left(2).toLower();
if(locale == "de")
{
QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocQuickStartGerman"));
QDesktopServices::openUrl(QUrl("https://github.com/Maproom/qmapshack/wiki/DocQuickStartGerman"));
}
else if(locale == "ru")
{
QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocQuickStartRussian"));
QDesktopServices::openUrl(QUrl("https://github.com/Maproom/qmapshack/wiki/DocQuickStartRussian"));
}
else if(locale == "es")
{
QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocQuickStartSpanish"));
QDesktopServices::openUrl(QUrl("https://github.com/Maproom/qmapshack/wiki/DocQuickStartSpanish"));
}
else
{
QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocQuickStartEnglish"));
QDesktopServices::openUrl(QUrl("https://github.com/Maproom/qmapshack/wiki/DocQuickStartEnglish"));
}
}
else
{
QDesktopServices::openUrl(QUrl("https://bitbucket.org/maproom/qmapshack/wiki/DocQuickStartEnglish"));
QDesktopServices::openUrl(QUrl("https://github.com/Maproom/qmapshack/wiki/DocQuickStartEnglish"));
}
}
......