Re: problems compiling subsurface 4.4 on fedora 18
On Wed, Feb 18, 2015 at 12:36:01AM +0100, Michele Fabi wrote: 2015-02-17 23:14 GMT+01:00 Dirk Hohndel d...@hohndel.org: Hi and thanks for the script. It still exit because it can't find libssrfmarblewidget that is located here: /home/michele/testfordirk/install/lib/libssrfmarblewidget.so.0.19.2 /home/michele/testfordirk/install/lib/libssrfmarblewidget.so.19 /home/michele/testfordirk/install/lib/libssrfmarblewidget.so /home/michele/testfordirk/marble-source/build/src/lib/marble/libssrfmarblewidget.so.0.19.2 /home/michele/testfordirk/marble-source/build/src/lib/marble/libssrfmarblewidget.so.19 /home/michele/testfordirk/marble-source/build/src/lib/marble/libssrfmarblewidget.so I think I understand what went wrong. I just pushed one more commit. Can you do this? cd /home/michele/testfordirk/subsurface git pull cd .. subsurface/scripts/build.sh I'm reasonably optimistic that this will work better :-) /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: 4.4.1
On Wed, Feb 18, 2015 at 01:33:10AM +0200, Gehad Elrobey wrote: Tested it on opensuse 13.2 and it was very nice though building with four threads on my old single core machine was unnecessary. Yeah, I should parametrize this... it's just that building with one thread only on most current machines is unnecessarily slow. Even most laptops have at least 2 cores these days... /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: 4.4.1
Tested it on opensuse 13.2 and it was very nice though building with four threads on my old single core machine was unnecessary. On Wed, Feb 18, 2015 at 12:21 AM, Dirk Hohndel d...@hohndel.org wrote: So I picked what seemed like the sane patches and pushed them to the v4.4-branch. My goal is to release 4.4.1 tomorrow. Could people take a look to make sure I didn't break anything? The next part I just mentioned in another thread, but maybe more people will read this email, so I'll repeat it here: There's a new build script for people building on Linux and getting freaked out by the weird dependencies that we have... Obviously I want people to use our packages. But there are another 500 Linux distributions out there for which I don't have packages... so this should make things easier for people. if you feel like giving this a try, ideally start from a fresh checkout: mkdir ~/testfordirk cd ~/testfordirk git clone -b v4.4-branch git://subsurface-divelog.org/subsurface.git ./subsurface/scripts/build.sh now wait. possibly a while as it builds quite a few things if it fails, capture the bug and send it to the mailing list if it doesn't (YAY!) you can run Subsurface like this: ./subsurface/scripts/run.sh Note: this does NOT attempt to install prerequisits - you can find those in the INSTALL file. This also assumes that you have a Qt5 development devironment, it will not work on Qt4 based distros. /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface -- regards, Gehad From e7d9c041cfa652c0cd6d9579cf09525d73ec69ce Mon Sep 17 00:00:00 2001 From: Gehad elrobey gehadelro...@gmail.com Date: Wed, 18 Feb 2015 01:22:07 +0200 Subject: [PATCH] Add Make flag variable to control parallel execution Signed-off-by: Gehad elrobey gehadelro...@gmail.com --- scripts/build.sh | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index 44cf5d5..0e9f089 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -14,6 +14,8 @@ # to all kinds of unnecessary pain SRC=$(pwd) +MAKEFLAGS=-j4 + if [[ ! -d subsurface ]] ; then echo please start this script from the directory containing the Subsurface source directory exit 1 @@ -53,7 +55,7 @@ if [ ! -f configure ] ; then autoreconf --install ./configure --prefix=$SRC/install fi -make -j4 +make $MAKEFLAGS make install cd $SRC @@ -78,10 +80,10 @@ cmake -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE -DQT5BUILD=ON \ -DBUILD_MARBLE_APPS=NO \ $SRC/marble-source cd src/lib/marble -make -j4 +make $MAKEFLAGS make install cd $SRC/subsurface qmake-qt5 LIBDCDEVEL=1 LIBMARBLEDEVEL=$SRC/install SPECIAL_MARBLE_PREFIX=1 LIBGIT2DEVEL=$SRC/libgit2 subsurface.pro -make -j4 +make $MAKEFLAGS -- 2.1.0 ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: [RFC ]Dive site tags: my try
Davide, thank you so much for all the effort you are putting into this. While you were working on this, Tomaz and I were in a video call with a Luisa, a designer in Brazil who has helped us in the past and who wants to contribute more as well. It is very exciting to me to be going from no one with any decent design sense to having a diver with design ideas plus a designer who can help turn this into beautiful software... I believe Tomaz was planning to walk Luisa through some of your ideas today and tomorrow. On Wed, Feb 18, 2015 at 01:14:20AM +0100, Davide DB wrote: This is my try to define a workflow for this new amazing feature. Bear with me! I'll try to follow some use case and some excerpt from previous discussion. Precondition * V3 xml format removes location, latitude and longitude from the struct dive and replaces them with a dive_site_uuid. - V3 xml format uses the struct dive_site to hold that information . * V3 xml format is not compatible with previous version hence users have to migrate to V3 format to use Subsurface. * Once migrated you are not forced to explicitly use location structure. Yes. Use cases MIGRATION PROCESS Existing users must migrate to the new V2 xml format. Data migration and new dive creation behaviors are controlled via a Dive site management user preferences panel. Let's see how the migration process could be: Migration is triggered: - Opening a V2 logbook via File Open. - Importing a V2 logbook via Import Import log file. So basically the feature that I thought most people use (you have a default file that automatically opens when you start Subsurface) is something that you didn't consider? Or is it that if your default file is a V2 file it ISN'T just opened but instead the user gets presented with a dialog that asks them how they want to migrate their data? WELCOME A welcome dialog informs the user of what will going on in a minute (doomsday device). All instruction are given: http://i.imgur.com/sQ6NMdP.png I don't like the will delete your logbook language. It should say will save a backup of your unmodified logbook in _this_location_ and then migrate your data in place (or something along those lines). And you should get this dialog whenever a V2 file is opened. So open, import, and default file. CONFIGURATION Next step give the user the choice to configure the process: http://i.imgur.com/2myW9jj.png Here I imagined two options: dives with GPS data and dives without GPS data. User must opt-in both. User enable the reverse geocoding option for all the dives with GPS data. Once enabled he can choose which attributes (we could call them geo-tags) fit for him. For the UI I copied the nice idea from Miika for CSV file import but simpler approach could be used. Basically he can choose up to three geo-tags dragging them on the three boxes/area. The geo-tag list is what we can get from the reverse geocoding service we will use (I do not know if there is a standard) I like this. If user used some sort of structure in his dive locations he could eventually choose to parse dives without GPS data too. He could indicate which kind of structure he used. More or less as above (we should choose its separator). Yes, separators would have to be a user option. This might work for the very consistent crowd :-) I know, it's not perfect. In the above description dive location names with gps data are not touched so some redundancy could easily happen. We could use a mix of the two procedure described above. PREVIEW Next step is the import/migration process by itself. We need a progress bar nad we need a preview of what we are going to save (and eventually accept, reject, edit) http://i.imgur.com/2eJXqgo.png The procedure will show a table for GPS dives and manual dives showing names before/after. We could accept all with a global check-box or one by one and eventually edit the new name before saving. I did not show file open/save dialogs. I understand what accept means. But what happens if a user doesn't accept a dive? Is there a manual process to set geo tags? Or is just the site name used with no geo tags? In my opinion once we use the reverse geocoding service we should graba nd save into the xml ALL the attributes/geo-tags regardless of user choice. In other words: the user choose only what he will display later. This could be useful later for maximum compatibility when interfacing/exporting to other logbooks. Why would we? If we can get those data once, we can get them again... I see no reason to fill up the XML files with all that information if the user doesn't care about it... USER PREFERENCES --- User could decide to change dive site structure later. Configuration is made via a new option in the user preference dialog. In my
Re: [RFC ]Dive site tags: my try
On Wed, Feb 18, 2015 at 1:58 AM, Dirk Hohndel d...@hohndel.org wrote: Davide, It is very exciting to me to be going from no one with any decent design sense to having a diver with design ideas plus a designer who can help turn this into beautiful software... I believe Tomaz was planning to walk Luisa through some of your ideas today and tomorrow. Explosive mix :) Migration is triggered: - Opening a V2 logbook via File Open. - Importing a V2 logbook via Import Import log file. So basically the feature that I thought most people use (you have a default file that automatically opens when you start Subsurface) is something that you didn't consider? Or is it that if your default file is a V2 file it ISN'T just opened but instead the user gets presented with a dialog that asks them how they want to migrate their data? I simply forgot it. Yes, as you open Subsurface 4.5 you will prompted for data migration. WELCOME A welcome dialog informs the user of what will going on in a minute (doomsday device). All instruction are given: http://i.imgur.com/sQ6NMdP.png I don't like the will delete your logbook language. It should say will save a backup of your unmodified logbook in _this_location_ and then migrate your data in place (or something along those lines). You are right. I just wrote random thoughts. Of course a great care should be taken explainng the whole process. We don't want to loose our users. PREVIEW Next step is the import/migration process by itself. We need a progress bar nad we need a preview of what we are going to save (and eventually accept, reject, edit) http://i.imgur.com/2eJXqgo.png The procedure will show a table for GPS dives and manual dives showing names before/after. We could accept all with a global check-box or one by one and eventually edit the new name before saving. I did not show file open/save dialogs. I understand what accept means. But what happens if a user doesn't accept a dive? Is there a manual process to set geo tags? Or is just the site name used with no geo tags? I don't know exactly :) There will be no geo-tags. See my comment on the dive site tab: Maybe when I tried to use the service it was not available (network..) so I could imagine to have a special icon indicating that this dive site has not been correctly updated... So we could find a way to indicate missing info during the normal use. You suggested a proper dive site view and management. We should find a flag there. In my opinion once we use the reverse geocoding service we should graba nd save into the xml ALL the attributes/geo-tags regardless of user choice. In other words: the user choose only what he will display later. This could be useful later for maximum compatibility when interfacing/exporting to other logbooks. Why would we? If we can get those data once, we can get them again... I see no reason to fill up the XML files with all that information if the user doesn't care about it... Ok, you are right. USER PREFERENCES --- User could decide to change dive site structure later. Configuration is made via a new option in the user preference dialog. In my wireframe I slightly rearranged the current dialog (more idea to come...). http://i.imgur.com/RS5fjKJ.png Basically here there are more or less same options of the migration process. Dive site structure format for dives without gps data should be of help while creating a new dive manually or without companion app. [I'm not fully convinced here]. I'm not sure I understand what you are saying here. Me too. (I'm joking) Regarding dives without gps data: while in the migration process you choose which field will be assigned during location parsing, here you decide how your new dive names will be formatted. Actually the same thing. It's the manual procedure who scares me a bit. There will be a lot of user errors, duplicates, nonsense... When you add GPS data to an existing dive, reverse geocoding format would take precedence over previous data (aka overwrite). Really? Shouldn't there be a do you want to replace THIS with THAT dialog? Of course, In a hurry I just described the final effect. I was afraid that describing and drawing wireframes for everything I would have completed after the real implementation. NOTES TAB -- IMHO the new Location field into the Notes panel should be just a NOT editable texbox. That makes things easier. But if there is no site name, yet, that is a bit awkward. Unless you turn that field itself into the button and then if there is no site dat you turn the text into click here to add a dive site. Eventually near dive site name you have the geo-tags chosen (via reverse geocoding or manually added). In my wireframe I imagined a group box with geo-tags. In a hurry I did not draw all Notes controls.
[RFC ]Dive site tags: my try
This is my try to define a workflow for this new amazing feature. Bear with me! I'll try to follow some use case and some excerpt from previous discussion. Precondition * V3 xml format removes location, latitude and longitude from the struct dive and replaces them with a dive_site_uuid. - V3 xml format uses the struct dive_site to hold that information . * V3 xml format is not compatible with previous version hence users have to migrate to V3 format to use Subsurface. * Once migrated you are not forced to explicitly use location structure. Use cases MIGRATION PROCESS Existing users must migrate to the new V2 xml format. Data migration and new dive creation behaviors are controlled via a Dive site management user preferences panel. Let's see how the migration process could be: Migration is triggered: - Opening a V2 logbook via File Open. - Importing a V2 logbook via Import Import log file. WELCOME A welcome dialog informs the user of what will going on in a minute (doomsday device). All instruction are given: http://i.imgur.com/sQ6NMdP.png CONFIGURATION Next step give the user the choice to configure the process: http://i.imgur.com/2myW9jj.png Here I imagined two options: dives with GPS data and dives without GPS data. User must opt-in both. User enable the reverse geocoding option for all the dives with GPS data. Once enabled he can choose which attributes (we could call them geo-tags) fit for him. For the UI I copied the nice idea from Miika for CSV file import but simpler approach could be used. Basically he can choose up to three geo-tags dragging them on the three boxes/area. The geo-tag list is what we can get from the reverse geocoding service we will use (I do not know if there is a standard) If user used some sort of structure in his dive locations he could eventually choose to parse dives without GPS data too. He could indicate which kind of structure he used. More or less as above (we should choose its separator). I know, it's not perfect. In the above description dive location names with gps data are not touched so some redundancy could easily happen. We could use a mix of the two procedure described above. PREVIEW Next step is the import/migration process by itself. We need a progress bar nad we need a preview of what we are going to save (and eventually accept, reject, edit) http://i.imgur.com/2eJXqgo.png The procedure will show a table for GPS dives and manual dives showing names before/after. We could accept all with a global check-box or one by one and eventually edit the new name before saving. I did not show file open/save dialogs. In my opinion once we use the reverse geocoding service we should graba nd save into the xml ALL the attributes/geo-tags regardless of user choice. In other words: the user choose only what he will display later. This could be useful later for maximum compatibility when interfacing/exporting to other logbooks. USER PREFERENCES --- User could decide to change dive site structure later. Configuration is made via a new option in the user preference dialog. In my wireframe I slightly rearranged the current dialog (more idea to come...). http://i.imgur.com/RS5fjKJ.png Basically here there are more or less same options of the migration process. Dive site structure format for dives without gps data should be of help while creating a new dive manually or without companion app. [I'm not fully convinced here]. When you add GPS data to an existing dive, reverse geocoding format would take precedence over previous data (aka overwrite). NOTES TAB -- IMHO the new Location field into the Notes panel should be just a NOT editable texbox. Eventually near dive site name you have the geo-tags chosen (via reverse geocoding or manually added). In my wireframe I imagined a group box with geo-tags. In a hurry I did not draw all Notes controls. http://i.imgur.com/OphJsjy.png There's no manage button but there is a new tab named Dive site that is an extended view on the dive location. Dirk wrote about a dedicated view to manage all dive sites... I avoided it in my wireframes. It would be nice we could avoid another view. A prerequisite would be that a dive site does not exist by itself inside a logbook. You cannot create a new dive site. You simply create a new dive as usual and eventually a new dive site for it. In this way (I hope) everything it's simpler and we could have a design like mine. DIVE SITE TAB http://i.imgur.com/rxqX8Hv.png This is more or less the same as in the experimental build. There is a new group-box with the current geo-tags chosen (again: via reverse geocoding or manually added). In my wireframe they came from reverse geocoding because there are GPS data. There is an Update button near geo-tags: it queries again the reverse
[PATCH 1/2] XSLT to import MacDive logs
Signed-off-by: Miika Turkia miika.tur...@gmail.com --- xslt/DiveLog.xslt | 303 ++ 1 file changed, 303 insertions(+) create mode 100644 xslt/DiveLog.xslt diff --git a/xslt/DiveLog.xslt b/xslt/DiveLog.xslt new file mode 100644 index 000..579e177 --- /dev/null +++ b/xslt/DiveLog.xslt @@ -0,0 +1,303 @@ +xsl:stylesheet xmlns:xsl=http://www.w3.org/1999/XSL/Transform; version=1.0 + xsl:strip-space elements=*/ + xsl:output method=xml indent=yes/ + + xsl:template match=/ +divelog program='subsurface-import' version='2' + settings + divecomputerid deviceid= +xsl:attribute name=model + xsl:value-of select=logbook/@program/ +/xsl:attribute +xsl:attribute name=serial + xsl:value-of select=logbook/@serialNumber/ +/xsl:attribute + /divecomputerid + /settings + dives +xsl:apply-templates select=/logbook/ + /dives +/divelog + /xsl:template + + xsl:template match=dive +xsl:variable name=units select=/logbook/prefs/@units/ + +dive + xsl:attribute name=number +xsl:value-of select=@Number/ + /xsl:attribute + + xsl:attribute name=date +xsl:value-of select=concat(substring-after(substring-after(substring-before(@DateTime, ' '), '/'), '/'), '-', substring-before(@DateTime, '/'), '-', substring-before(substring-after(@DateTime, '/'), '/'))/ + /xsl:attribute + + xsl:attribute name=duration +xsl:call-template name=timeConvert + xsl:with-param name=timeSec select=@Duration/ + xsl:with-param name=units select=$units/ +/xsl:call-template + /xsl:attribute + + xsl:variable name=delta +xsl:value-of select=@SampleInterval/ + /xsl:variable + + location +xsl:value-of select=@Location/ +xsl:if test=@Location != '' and @Site != '' + xsl:text / /xsl:text +/xsl:if +xsl:value-of select=@Site/ + /location + + notes +xsl:value-of select=notes/ + /notes + + cylinder +xsl:if test=@StartPSI gt; 0 + xsl:attribute name=start +xsl:call-template name=pressureConvert + xsl:with-param name=number select=@StartPSI/ + xsl:with-param name=units select=$units/ +/xsl:call-template + /xsl:attribute +/xsl:if +xsl:if test=@EndPSI gt; 0 + xsl:attribute name=end +xsl:call-template name=pressureConvert + xsl:with-param name=number select=@EndPSI/ + xsl:with-param name=units select=$units/ +/xsl:call-template + /xsl:attribute +/xsl:if +xsl:if test=@TankSize gt; 0 + xsl:attribute name=size +xsl:call-template name=sizeConvert + xsl:with-param name=singleSize select=@TankSize/ + xsl:with-param name=double select='0'/ + xsl:with-param name=pressure select=@WorkingPressure/ + xsl:with-param name=units select=$units/ +/xsl:call-template + /xsl:attribute +/xsl:if +xsl:if test=@WorkingPressure gt; 0 + xsl:attribute name=workpressure +xsl:call-template name=pressureConvert + xsl:with-param name=number select=@WorkingPressure/ + xsl:with-param name=units select=$units/ +/xsl:call-template + /xsl:attribute +/xsl:if +xsl:if test=@Tank != '' + xsl:attribute name=description +xsl:value-of select=@Tank/ + /xsl:attribute +/xsl:if +xsl:if test=@NitroxEnrichment != '' and @NitroxEnrichment != 21 + xsl:attribute name=o2 +xsl:value-of select=concat(@NitroxEnrichment, '%')/ + /xsl:attribute +/xsl:if + /cylinder + + xsl:if test=@Weight != '' +weightsystem + xsl:attribute name=weight +xsl:call-template name=weightConvert + xsl:with-param name=weight select=translate(@Weight, ',', '.')/ + xsl:with-param name=units select=$units/ +/xsl:call-template + /xsl:attribute + xsl:attribute name=description +xsl:value-of select='unknown'/ + /xsl:attribute +/weightsystem + /xsl:if + + buddy +xsl:value-of select=@DiveBuddy/ + /buddy + + divemaster +xsl:value-of select=@DiveMaster/ + /divemaster + + divecomputer deviceid= +xsl:attribute name=model + xsl:value-of select=@Computer/ +/xsl:attribute + + depth +xsl:attribute name=max + xsl:call-template name=depthConvert +xsl:with-param name=depth + xsl:value-of select=@MaxDepth/ +/xsl:with-param +xsl:with-param name=units select=$units/ + /xsl:call-template
[PATCH 2/2] Hook up DiveLog import
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
parse-xml.c| 1 +
subsurface.qrc | 1 +
2 files changed, 2 insertions(+)
diff --git a/parse-xml.c b/parse-xml.c
index 1ac2b41..5a49e2a 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -3023,6 +3023,7 @@ static struct xslt_files {
{ sensuscsv, sensuscsv.xslt, NULL },
{ SubsurfaceCSV, subsurfacecsv.xslt, NULL },
{ manualcsv, manualcsv2xml.xslt, NULL },
+ { logbook, DiveLog.xslt, NULL },
{ NULL, }
};
diff --git a/subsurface.qrc b/subsurface.qrc
index 13e2229..2b07313 100644
--- a/subsurface.qrc
+++ b/subsurface.qrc
@@ -48,6 +48,7 @@
filexslt/subsurfacecsv.xslt/file
filexslt/manualcsv2xml.xslt/file
filexslt/shearwater.xslt/file
+filexslt/DiveLog.xslt/file
file alias=icon_lungicons/gas.png/file
file alias=icon_modicons/mod.png/file
file alias=icon_heicons/he.png/file
--
2.1.0
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
2015-02-17 12:50 GMT+01:00 Lubomir I. Ivanov neolit...@gmail.com: if you haven't updated yet, you can save locally the raw email / patch i've just sent to the mailing list: [PATCH] simplewidgets.cpp: QLineEdit::setClearButtonEnabled() is from Qt5.2 move it to the Subsurface source folder and do: git am patch-file then call 'make' again to see if the QLineEdit error is fixed. i'm assuming you have Qt 5.2.0 Thanks Lubomir for the help with the patch. Here it is the output: [michele@localhost subsurface]$ git am 0001-simplewidgets.cpp-QLineEdit-setClearButtonEnabled-is.patch Applying: simplewidgets.cpp: QLineEdit::setClearButtonEnabled() is from Qt5.2 [michele@localhost subsurface]$ make Checking /home/michele/src/subsurface/ssrf-version.h compiling version.c compiling qt-ui/simplewidgets.cpp compiling qt-ui/starwidget.cpp compiling qt-ui/subsurfacewebservices.cpp qt-ui/subsurfacewebservices.cpp: In member function ‘bool DivelogsDeWebServices::prepare_dives_for_divelogs(const QString, bool)’: qt-ui/subsurfacewebservices.cpp:129:85: error: invalid use of incomplete type ‘class QDebug’ In file included from /usr/include/qt5/QtCore/qglobal.h:990:0, from /usr/include/qt5/QtGui/qwindowdefs.h:45, from /usr/include/qt5/QtWidgets/qwidget.h:45, from /usr/include/qt5/QtWidgets/qdialog.h:45, from /usr/include/qt5/QtWidgets/QDialog:1, from qt-ui/subsurfacewebservices.h:4, from qt-ui/subsurfacewebservices.cpp:1: /usr/include/qt5/QtCore/qlogging.h:59:7: error: forward declaration of ‘class QDebug’ qt-ui/subsurfacewebservices.cpp:190:88: error: invalid use of incomplete type ‘class QDebug’ In file included from /usr/include/qt5/QtCore/qglobal.h:990:0, from /usr/include/qt5/QtGui/qwindowdefs.h:45, from /usr/include/qt5/QtWidgets/qwidget.h:45, from /usr/include/qt5/QtWidgets/qdialog.h:45, from /usr/include/qt5/QtWidgets/QDialog:1, from qt-ui/subsurfacewebservices.h:4, from qt-ui/subsurfacewebservices.cpp:1: /usr/include/qt5/QtCore/qlogging.h:59:7: error: forward declaration of ‘class QDebug’ qt-ui/subsurfacewebservices.cpp:210:87: error: invalid use of incomplete type ‘class QDebug’ In file included from /usr/include/qt5/QtCore/qglobal.h:990:0, from /usr/include/qt5/QtGui/qwindowdefs.h:45, from /usr/include/qt5/QtWidgets/qwidget.h:45, from /usr/include/qt5/QtWidgets/qdialog.h:45, from /usr/include/qt5/QtWidgets/QDialog:1, from qt-ui/subsurfacewebservices.h:4, from qt-ui/subsurfacewebservices.cpp:1: /usr/include/qt5/QtCore/qlogging.h:59:7: error: forward declaration of ‘class QDebug’ make: *** [.obj/subsurfacewebservices.o] Error 1 [michele@localhost subsurface]$ Michele ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
On 17 February 2015 at 16:01, Michele Fabi fabie...@gmail.com wrote: Done, and here the result. /usr/bin/ld: cannot find -lssrfmarblewidget collect2: error: ld returned 1 exit status make: *** [subsurface] Error 1 it says that a our localized version of the marblewidget cannot be found. instead of: qmake-qt5 SPECIAL_MARBLE_PREFIX=1 try: qmake-qt5 LIBMARBLEDEVEL=path-to-where-marble-is path-to-where-marble-is should contain: /include /src/lib/marble or: qmake-qt5 DEFINES += NO_MARBLE (but mind this will disable the marble globe) then do a: make clean make lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
On 17 February 2015 at 17:14, Dirk Hohndel d...@hohndel.org wrote: linking subsurface .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x188): undefined reference to `QWidget::styleChange(QStyle)' .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x190): undefined reference to `QWidget::enabledChange(bool)' .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x198): undefined reference to `QWidget::paletteChange(QPalette const)' .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x1a0): undefined reference to `QWidget::fontChange(QFont const)' .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x1a8): undefined reference to `QWidget::windowActivationChange(bool)' .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x1b0): undefined reference to `QWidget::languageChange()’ i think that marble is built with Qt4, while Subsurface with Qt5. could be wrong. .obj/save-git.o: In function `tree_insert': /home/michele/src/subsurface/save-git.c:458: undefined reference to `git_oid_nfmt' .obj/save-git.o: In function `create_new_commit': /home/michele/src/subsurface/save-git.c:989: undefined reference to `git_oid_strcmp’ these were added in libgit 0.19. lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
[PATCH 1/2] Add limits to cylinder maximum pressures on DM5 import
DM5 seems to have occasionally bogus data for cylinder start and end pressures. Need to validate that. Signed-off-by: Miika Turkia miika.tur...@gmail.com --- parse-xml.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parse-xml.c b/parse-xml.c index 5a49e2a..b119701 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -2220,11 +2220,11 @@ extern int dm5_dive(void *param, int columns, char **data, char **column) * TODO: handle multiple cylinders */ cylinder_start(); - if (data[22] atoi(data[22]) 0) + if (data[22] atoi(data[22]) 0 atoi(data[22]) 35) cur_dive-cylinder[cur_cylinder_index].start.mbar = atoi(data[22]); else if (data[10] atoi(data[10]) 0) cur_dive-cylinder[cur_cylinder_index].start.mbar = atoi(data[10]); - if (data[23] atoi(data[23]) 0) + if (data[23] atoi(data[23]) 0 atoi(data[23]) 35) cur_dive-cylinder[cur_cylinder_index].end.mbar = (atoi(data[23])); if (data[11] atoi(data[11]) 0) cur_dive-cylinder[cur_cylinder_index].end.mbar = (atoi(data[11])); -- 2.1.0 ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
RE: Suunto DM5 import to subsurface
Thank you for informing to use open instead of import. I managed to open the logs now. Sadly the windows build seems to be quite unstable at least in my computer. For example: * Every time I toggle the graph options (like Toggle calculating all tissues) or save settings (from imperial to metric for example) the program seems to hang. I can't reproduce this on OSX, so I am assuming some kind of glitch on the installation or in the windows port. * If I open my dm4.db and save it as test and then try to open that test.ssrf I get error Failed to parse. Very interesting project you have going on. Keep up the good work. I will promise to give Subsurface another try in the near future, but for now it seems like I will stay with Suunto DM5 for now. Oh, and feel free to use my dm4.db for debugging purposes in the future, if needed. -- Mika Tanninen gsm: +356 7 9996665 / +358 41 5055831 email: m...@tanninen.net www: http://mika.tanninen.net skype: MikaTanninen From: Martin de Weger [mailto:mar...@reef-it.nl] Sent: 17. helmikuuta 2015 16:05 To: Miika Turkia Cc: Mika Tanninen; Subsurface Mailing List Subject: Re: Suunto DM5 import to subsurface On my Mac this worked like a charm as well. You do have to make sure DM5 has been closed. Martin de Weger Op 17 feb. 2015, om 15:47 heeft Miika Turkia miika.tur...@gmail.com het volgende geschreven: Works like a charm on my Linux box with Subsurface v4.4.0-67. Cylinder pressures seem to require a bit of improvements, but otherwise this file opened up in less than a second. However, you need to OPEN it, not import. (When attempting to import, it hangs on me as well.) miika On Tue, Feb 17, 2015 at 10:20 AM, Mika Tanninen m...@tanninen.net wrote: Hi. I tried to test out the subsurface, but sadly it's not able to import my dive history from Suunto DM5. When I try to start the import (in Windows 7 64bit from Suunto DM5 1.2.37.5326 to the subsurface 4.4.0) the program just goes unresponsive and eventually hangs. In case you're interested to add the support, here is my Suunto DM5 db file containing 481 dives to be used for debugging: https://www.dropbox.com/s/9f8mair7lgz52bl/dm4.db -- Mika Tanninen gsm: +356 7 9996665 / +358 41 5055831 email: m...@tanninen.net www: http://mika.tanninen.net skype: MikaTanninen ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Suunto DM5 import to subsurface
On Tue, Feb 17, 2015 at 4:47 PM, Miika Turkia miika.tur...@gmail.com
wrote:
Works like a charm on my Linux box with Subsurface v4.4.0-67. Cylinder
pressures seem to require a bit of improvements, but otherwise this file
opened up in less than a second. However, you need to OPEN it, not import.
(When attempting to import, it hangs on me as well.)
A brief re-test showed that both open and import work properly for me.
However, when I close the DM5 opened/imported log file and try to
re-open/re-import, then it hangs on me.
I wonder if your initial issue was that the DB file was locked by DM5 as
suggested.
On Tue, Feb 17, 2015 at 10:20 AM, Mika Tanninen m...@tanninen.net wrote:
Hi.
I tried to test out the subsurface, but sadly it's not able to import my
dive history from Suunto DM5. When I try to start the import (in Windows 7
64bit from Suunto DM5 1.2.37.5326 to the subsurface 4.4.0) the program just
goes unresponsive and eventually hangs.
In case you're interested to add the support, here is my Suunto DM5 db file
containing 481 dives to be used for debugging:
https://www.dropbox.com/s/9f8mair7lgz52bl/dm4.db
This is really great, I can see that there are a few issues needing
improvements on the DM5 import. Will take a look into these.
* Every time I toggle the graph options (like Toggle calculating all
tissues) or save settings (from imperial to metric for example) the program
seems to hang. I can't reproduce this on OSX, so I am assuming some kind of
glitch on the installation or in the windows port
Takes forever on my Linux as well, but I have no idea of what is going on
here.
* If I open my dm4.db and save it as test and then try to open that
test.ssrf I get error Failed to parse.
This bug should be easy to fix. Seems to be that we do not escape tags
properly on export. I guess no-one used tick (') on their tag names before.
Thanks for reporting these, it really helps us to improve when we also get
the data to replicate the problems ourselves.
miika
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
On Feb 17, 2015, at 6:38 AM, Michele Fabi fabie...@gmail.com wrote: But first switch to the v4.4.0 tag, please /D Ok. Done. I noticied that /home/michele/src/marble-build/ does contain src/lib/marble but not an include directory. This is funny. In a sad way. I always felt that asking people to compile software from source was a no win approach. So once you switched to the v4.4.0 tag as I asked you, you need to re-apply the patches that Lubomir sent, but I haven’t had a chance to check if those apply to v4.4.0 as well. If you don’t mind waiting, I’m planning to tag v4.4.1 tonight or maybe tomorrow (depending on how my day goes, I’m traveling to the Bay Area today) and will include Lubomir’s patches in that. The second problem is that it’s a pain in the… to get the marble include files to the right place. So maybe you could build without Marble (that means you’ll lose the globe)? Or, time permitting, I’ll include a little script in the Subsurface sources for 4.4.1 that automates all this and makes it easier for people to build from source. At this point I’m making binaries for more than a dozen platforms available - and this is exactly the reason why. Subsurface has become so complex and has so many strange dependencies that building it from source is indeed non-trivial. Of course, you could always update to Fedora 20 or 21 and take advantage of one of those binaries :-) /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
2015-02-17 16:02 GMT+01:00 Dirk Hohndel d...@hohndel.org: On Feb 17, 2015, at 6:38 AM, Michele Fabi fabie...@gmail.com wrote: But first switch to the v4.4.0 tag, please /D Ok. Done. I noticied that /home/michele/src/marble-build/ does contain src/lib/marble but not an include directory. This is funny. In a sad way. I always felt that asking people to compile software from source was a no win approach. So once you switched to the v4.4.0 tag as I asked you, you need to re-apply the patches that Lubomir sent, but I haven’t had a chance to check if those apply to v4.4.0 as well. If you don’t mind waiting, I’m planning to tag v4.4.1 tonight or maybe tomorrow (depending on how my day goes, I’m traveling to the Bay Area today) and will include Lubomir’s patches in that. The second problem is that it’s a pain in the… to get the marble include files to the right place. So maybe you could build without Marble (that means you’ll lose the globe)? Or, time permitting, I’ll include a little script in the Subsurface sources for 4.4.1 that automates all this and makes it easier for people to build from source. At this point I’m making binaries for more than a dozen platforms available - and this is exactly the reason why. Subsurface has become so complex and has so many strange dependencies that building it from source is indeed non-trivial. Of course, you could always update to Fedora 20 or 21 and take advantage of one of those binaries :-) /D Thanks for your help Dirk. I have no hurry to use subsurface on this laptop so I can indifferently wait for a 4.4.1 version or upgrade my laptop, but I don't want to force the team to write a newer version, if it isn't already in your roadmap. It's been very interesting to talk with you guys. I have some new items to study :) Michele ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
On 17 February 2015 at 15:42, Michele Fabi fabie...@gmail.com wrote: DivelogsDeWebServices::prepare_dives_for_divelogs(const QString, bool)’: qt-ui/subsurfacewebservices.cpp:129:85: error: invalid use of incomplete type ‘class QDebug’ try applying this patch as well (attached): git am filename make lubomir -- 0002-subsurfacewebservices.cpp-add-QDebug-include.patch Description: Binary data ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
On Feb 17, 2015, at 6:09 AM, Lubomir I. Ivanov neolit...@gmail.com wrote: On 17 February 2015 at 16:01, Michele Fabi fabie...@gmail.com wrote: Done, and here the result. /usr/bin/ld: cannot find -lssrfmarblewidget collect2: error: ld returned 1 exit status make: *** [subsurface] Error 1 it says that a our localized version of the marblewidget cannot be found. instead of: qmake-qt5 SPECIAL_MARBLE_PREFIX=1 try: qmake-qt5 LIBMARBLEDEVEL=path-to-where-marble-is No, you need BOTH. qmake-qt5 SPECIAL_MARBLE_PREFIX=1 LIBMARBLEDEVEL=path-to-where-marble-install-directory-is or: qmake-qt5 DEFINES += NO_MARBLE (but mind this will disable the marble globe) then do a: make clean make But first switch to the v4.4.0 tag, please /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
2015-02-17 15:28 GMT+01:00 Dirk Hohndel d...@hohndel.org: On Feb 17, 2015, at 6:09 AM, Lubomir I. Ivanov neolit...@gmail.com wrote: On 17 February 2015 at 16:01, Michele Fabi fabie...@gmail.com wrote: Done, and here the result. /usr/bin/ld: cannot find -lssrfmarblewidget collect2: error: ld returned 1 exit status make: *** [subsurface] Error 1 it says that a our localized version of the marblewidget cannot be found. instead of: qmake-qt5 SPECIAL_MARBLE_PREFIX=1 try: qmake-qt5 LIBMARBLEDEVEL=path-to-where-marble-is No, you need BOTH. qmake-qt5 SPECIAL_MARBLE_PREFIX=1 LIBMARBLEDEVEL=path-to-where-marble-install-directory-is or: qmake-qt5 DEFINES += NO_MARBLE (but mind this will disable the marble globe) then do a: make clean make But first switch to the v4.4.0 tag, please /D Ok. Done. I noticied that /home/michele/src/marble-build/ does contain src/lib/marble but not an include directory. [michele@localhost subsurface]$ git checkout v4.4.0 Note: checking out 'v4.4.0'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by performing another checkout. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -b with the checkout command again. Example: git checkout -b new_branch_name HEAD is now at 22949a0... Update to pre-built user manuals [michele@localhost subsurface]$ qmake-qt5 SPECIAL_MARBLE_PREFIX=1 LIBMARBLEDEVEL=/home/michele/src/marble-build/ [michele@localhost subsurface]$ make clean rm -f ssrf-version.h rm -f translations/subsurface_source.qm translations/subsurface_bg_BG.qm translations/subsurface_cs.qm translations/subsurface_da_DK.qm translations/subsurface_de_CH.qm translations/subsurface_de_DE.qm translations/subsurface_en_GB.qm translations/subsurface_es_ES.qm translations/subsurface_et_EE.qm translations/subsurface_fi_FI.qm translations/subsurface_fr_FR.qm translations/subsurface_it_IT.qm translations/subsurface_lv_LV.qm translations/subsurface_nb_NO.qm translations/subsurface_nl_NL.qm translations/subsurface_pl_PL.qm translations/subsurface_pt_BR.qm translations/subsurface_pt_PT.qm translations/subsurface_ru_RU.qm translations/subsurface_sk_SK.qm translations/subsurface_sv_SE.qm translations/subsurface_tr.qm translations/subsurface_zh_TW.qm rm -f .rcc/qrc_subsurface.cpp rm -f .moc/moc_about.cpp .moc/moc_completionmodels.cpp .moc/moc_divecomputermanagementdialog.cpp .moc/moc_divelistview.cpp .moc/moc_divepicturewidget.cpp .moc/moc_diveplanner.cpp .moc/moc_downloadfromdivecomputer.cpp .moc/moc_globe.cpp .moc/moc_kmessagewidget.cpp .moc/moc_maintab.cpp .moc/moc_mainwindow.cpp .moc/moc_modeldelegates.cpp .moc/moc_models.cpp .moc/moc_preferences.cpp .moc/moc_printdialog.cpp .moc/moc_printlayout.cpp .moc/moc_printoptions.cpp .moc/moc_simplewidgets.cpp .moc/moc_starwidget.cpp .moc/moc_subsurfacewebservices.cpp .moc/moc_tableview.cpp .moc/moc_divelogimportdialog.cpp .moc/moc_tagwidget.cpp .moc/moc_groupedlineedit.cpp .moc/moc_usermanual.cpp .moc/moc_profilewidget2.cpp .moc/moc_diverectitem.cpp .moc/moc_divepixmapitem.cpp .moc/moc_divelineitem.cpp .moc/moc_divetextitem.cpp .moc/moc_divecartesianaxis.cpp .moc/moc_diveplotdatamodel.cpp .moc/moc_diveprofileitem.cpp .moc/moc_diveeventitem.cpp .moc/moc_divetooltipitem.cpp .moc/moc_ruleritem.cpp .moc/moc_tankitem.cpp .moc/moc_updatemanager.cpp .moc/moc_divelogexportdialog.cpp .moc/moc_usersurvey.cpp .moc/moc_configuredivecomputerdialog.cpp .moc/moc_configuredivecomputer.cpp .moc/moc_configuredivecomputerthreads.cpp .moc/moc_devicedetails.cpp .moc/moc_statisticswidget.cpp .moc/moc_diveshareexportdialog.cpp .moc/moc_filtermodels.cpp .moc/moc_socialnetworks.cpp rm -f .uic/ui_about.h .uic/ui_divecomputermanagementdialog.h .uic/ui_diveplanner.h .uic/ui_downloadfromdivecomputer.h .uic/ui_maintab.h .uic/ui_mainwindow.h .uic/ui_preferences.h .uic/ui_printoptions.h .uic/ui_renumber.h .uic/ui_setpoint.h .uic/ui_shifttimes.h .uic/ui_shiftimagetimes.h .uic/ui_webservices.h .uic/ui_tableview.h .uic/ui_divelogimportdialog.h .uic/ui_searchbar.h .uic/ui_divelogexportdialog.h .uic/ui_plannerSettings.h .uic/ui_usersurvey.h .uic/ui_divecomponentselection.h .uic/ui_configuredivecomputerdialog.h .uic/ui_listfilter.h .uic/ui_diveshareexportdialog.h .uic/ui_filterwidget.h .uic/ui_socialnetworksdialog.h rm -f .obj/cochran.o .obj/deco.o .obj/device.o .obj/dive.o .obj/divelist.o .obj/equipment.o .obj/file.o .obj/gettextfromc.o .obj/libdivecomputer.o .obj/liquivision.o .obj/load-git.o .obj/main.o .obj/membuffer.o .obj/parse-xml.o .obj/planner.o .obj/profile.o .obj/gaspressures.o .obj/divecomputer.o .obj/worldmap-save.o .obj/save-html.o .obj/qt-gui.o .obj/qthelper.o .obj/about.o .obj/completionmodels.o .obj/divecomputermanagementdialog.o .obj/divelistview.o .obj/divepicturewidget.o .obj/diveplanner.o .obj/downloadfromdivecomputer.o
Re: problems compiling subsurface 4.4 on fedora 18
On 17 February 2015 at 16:38, Michele Fabi fabie...@gmail.com wrote: qt-ui/simplewidgets.cpp:577:25: error: ‘class QLineEdit’ has no member named ‘setClearButtonEnabled’ make: *** [.obj/simplewidgets.o] Error 1 [michele@localhost subsurface]$ you need to apply the two patches i've sent again as you are on a new branch. out of interest why do you want to build Subsurface - are you an user or do you want to contribute to the source code? unfortunately building everything is not exactly an easy task for non-developers, no matter how well the instructions are written :-(... lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
2015-02-17 15:49 GMT+01:00 Lubomir I. Ivanov neolit...@gmail.com: On 17 February 2015 at 16:38, Michele Fabi fabie...@gmail.com wrote: qt-ui/simplewidgets.cpp:577:25: error: ‘class QLineEdit’ has no member named ‘setClearButtonEnabled’ make: *** [.obj/simplewidgets.o] Error 1 [michele@localhost subsurface]$ you need to apply the two patches i've sent again as you are on a new branch. out of interest why do you want to build Subsurface - are you an user or do you want to contribute to the source code? unfortunately building everything is not exactly an easy task for non-developers, no matter how well the instructions are written :-(... lubomir -- Just an user. I'd like to contribute, I usually compile programs from source code without too much problems and I compiled by myself previous versions of subsurface, but I'm completely new to git and patching code, so this time I have to give up. I will upgrade my Fedora before to retry. Thank you for your time (and mine, too). Here is the last output: [michele@localhost subsurface]$ git am 0001-simplewidgets.cpp-QLineEdit-setClearButtonEnabled-is.patch Applying: simplewidgets.cpp: QLineEdit::setClearButtonEnabled() is from Qt5.2 [michele@localhost subsurface]$ git am 0002-subsurfacewebservices.cpp-add-QDebug-include.patch Applying: subsurfacewebservices.cpp: add QDebug include [michele@localhost subsurface]$ make clean rm -f ssrf-version.h rm -f translations/subsurface_source.qm translations/subsurface_bg_BG.qm translations/subsurface_cs.qm translations/subsurface_da_DK.qm translations/subsurface_de_CH.qm translations/subsurface_de_DE.qm translations/subsurface_en_GB.qm translations/subsurface_es_ES.qm translations/subsurface_et_EE.qm translations/subsurface_fi_FI.qm translations/subsurface_fr_FR.qm translations/subsurface_it_IT.qm translations/subsurface_lv_LV.qm translations/subsurface_nb_NO.qm translations/subsurface_nl_NL.qm translations/subsurface_pl_PL.qm translations/subsurface_pt_BR.qm translations/subsurface_pt_PT.qm translations/subsurface_ru_RU.qm translations/subsurface_sk_SK.qm translations/subsurface_sv_SE.qm translations/subsurface_tr.qm translations/subsurface_zh_TW.qm rm -f .rcc/qrc_subsurface.cpp rm -f .moc/moc_about.cpp .moc/moc_completionmodels.cpp .moc/moc_divecomputermanagementdialog.cpp .moc/moc_divelistview.cpp .moc/moc_divepicturewidget.cpp .moc/moc_diveplanner.cpp .moc/moc_downloadfromdivecomputer.cpp .moc/moc_globe.cpp .moc/moc_kmessagewidget.cpp .moc/moc_maintab.cpp .moc/moc_mainwindow.cpp .moc/moc_modeldelegates.cpp .moc/moc_models.cpp .moc/moc_preferences.cpp .moc/moc_printdialog.cpp .moc/moc_printlayout.cpp .moc/moc_printoptions.cpp .moc/moc_simplewidgets.cpp .moc/moc_starwidget.cpp .moc/moc_subsurfacewebservices.cpp .moc/moc_tableview.cpp .moc/moc_divelogimportdialog.cpp .moc/moc_tagwidget.cpp .moc/moc_groupedlineedit.cpp .moc/moc_usermanual.cpp .moc/moc_profilewidget2.cpp .moc/moc_diverectitem.cpp .moc/moc_divepixmapitem.cpp .moc/moc_divelineitem.cpp .moc/moc_divetextitem.cpp .moc/moc_divecartesianaxis.cpp .moc/moc_diveplotdatamodel.cpp .moc/moc_diveprofileitem.cpp .moc/moc_diveeventitem.cpp .moc/moc_divetooltipitem.cpp .moc/moc_ruleritem.cpp .moc/moc_tankitem.cpp .moc/moc_updatemanager.cpp .moc/moc_divelogexportdialog.cpp .moc/moc_usersurvey.cpp .moc/moc_configuredivecomputerdialog.cpp .moc/moc_configuredivecomputer.cpp .moc/moc_configuredivecomputerthreads.cpp .moc/moc_devicedetails.cpp .moc/moc_statisticswidget.cpp .moc/moc_diveshareexportdialog.cpp .moc/moc_filtermodels.cpp .moc/moc_socialnetworks.cpp rm -f .uic/ui_about.h .uic/ui_divecomputermanagementdialog.h .uic/ui_diveplanner.h .uic/ui_downloadfromdivecomputer.h .uic/ui_maintab.h .uic/ui_mainwindow.h .uic/ui_preferences.h .uic/ui_printoptions.h .uic/ui_renumber.h .uic/ui_setpoint.h .uic/ui_shifttimes.h .uic/ui_shiftimagetimes.h .uic/ui_webservices.h .uic/ui_tableview.h .uic/ui_divelogimportdialog.h .uic/ui_searchbar.h .uic/ui_divelogexportdialog.h .uic/ui_plannerSettings.h .uic/ui_usersurvey.h .uic/ui_divecomponentselection.h .uic/ui_configuredivecomputerdialog.h .uic/ui_listfilter.h .uic/ui_diveshareexportdialog.h .uic/ui_filterwidget.h .uic/ui_socialnetworksdialog.h rm -f .obj/cochran.o .obj/deco.o .obj/device.o .obj/dive.o .obj/divelist.o .obj/equipment.o .obj/file.o .obj/gettextfromc.o .obj/libdivecomputer.o .obj/liquivision.o .obj/load-git.o .obj/main.o .obj/membuffer.o .obj/parse-xml.o .obj/planner.o .obj/profile.o .obj/gaspressures.o .obj/divecomputer.o .obj/worldmap-save.o .obj/save-html.o .obj/qt-gui.o .obj/qthelper.o .obj/about.o .obj/completionmodels.o .obj/divecomputermanagementdialog.o .obj/divelistview.o .obj/divepicturewidget.o .obj/diveplanner.o .obj/downloadfromdivecomputer.o .obj/globe.o .obj/graphicsview-common.o .obj/kmessagewidget.o .obj/maintab.o .obj/mainwindow.o .obj/modeldelegates.o .obj/models.o .obj/metrics.o .obj/preferences.o .obj/printdialog.o .obj/printlayout.o .obj/printoptions.o .obj/simplewidgets.o
Re: problems compiling subsurface 4.4 on fedora 18
2015-02-17 16:16 GMT+01:00 Dirk Hohndel d...@hohndel.org: On Feb 17, 2015, at 7:12 AM, Michele Fabi fabie...@gmail.com wrote: Thanks for your help Dirk. I have no hurry to use subsurface on this laptop so I can indifferently wait for a 4.4.1 version or upgrade my laptop, but I don't want to force the team to write a newer version, if it isn't already in your roadmap. Oh no, 4.4.1 is on the roadmap. It got delayed by a few days because I got distracted with fun new code I wanted to write instead, but this delay gives me a chance to make sure it’s easier to compile things from source. It's been very interesting to talk with you guys. I have some new items to study :) Again, thanks for your patience - normally it’s much easier to start using Subsurface :-) /D In fact usually it is. Glad to hear that from my old fedora it will comes out a script that will solve these problems. I'm more than happy to contribute to the project in every way it's possible. I have an old pc RH 8.0 pc somewhere, if you want to extensively test the new script :-) Michele ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Suunto DM5 import to subsurface
Hi. I tried to test out the subsurface, but sadly it's not able to import my dive history from Suunto DM5. When I try to start the import (in Windows 7 64bit from Suunto DM5 1.2.37.5326 to the subsurface 4.4.0) the program just goes unresponsive and eventually hangs. In case you're interested to add the support, here is my Suunto DM5 db file containing 481 dives to be used for debugging: https://www.dropbox.com/s/9f8mair7lgz52bl/dm4.db -- Mika Tanninen gsm: +356 7 9996665 / +358 41 5055831 email: m...@tanninen.net www: http://mika.tanninen.net skype: MikaTanninen ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Suunto DM5 import to subsurface
On my Mac this worked like a charm as well. You do have to make sure DM5 has been closed. Martin de Weger Op 17 feb. 2015, om 15:47 heeft Miika Turkia miika.tur...@gmail.com het volgende geschreven: Works like a charm on my Linux box with Subsurface v4.4.0-67. Cylinder pressures seem to require a bit of improvements, but otherwise this file opened up in less than a second. However, you need to OPEN it, not import. (When attempting to import, it hangs on me as well.) miika On Tue, Feb 17, 2015 at 10:20 AM, Mika Tanninen m...@tanninen.net mailto:m...@tanninen.net wrote: Hi. I tried to test out the subsurface, but sadly it's not able to import my dive history from Suunto DM5. When I try to start the import (in Windows 7 64bit from Suunto DM5 1.2.37.5326 to the subsurface 4.4.0) the program just goes unresponsive and eventually hangs. In case you're interested to add the support, here is my Suunto DM5 db file containing 481 dives to be used for debugging: https://www.dropbox.com/s/9f8mair7lgz52bl/dm4.db https://www.dropbox.com/s/9f8mair7lgz52bl/dm4.db -- Mika Tanninen gsm: +356 7 9996665 tel:%2B356%207%209996665 / +358 41 5055831 tel:%2B358%2041%205055831 email: m...@tanninen.net www: http://mika.tanninen.net http://mika.tanninen.net/ skype: MikaTanninen ___ subsurface mailing list subsurface@subsurface-divelog.org mailto:subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
On Feb 17, 2015, at 7:12 AM, Michele Fabi fabie...@gmail.com wrote: Thanks for your help Dirk. I have no hurry to use subsurface on this laptop so I can indifferently wait for a 4.4.1 version or upgrade my laptop, but I don't want to force the team to write a newer version, if it isn't already in your roadmap. Oh no, 4.4.1 is on the roadmap. It got delayed by a few days because I got distracted with fun new code I wanted to write instead, but this delay gives me a chance to make sure it’s easier to compile things from source. It's been very interesting to talk with you guys. I have some new items to study :) Again, thanks for your patience - normally it’s much easier to start using Subsurface :-) /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: Suunto DM5 import to subsurface
Works like a charm on my Linux box with Subsurface v4.4.0-67. Cylinder pressures seem to require a bit of improvements, but otherwise this file opened up in less than a second. However, you need to OPEN it, not import. (When attempting to import, it hangs on me as well.) miika On Tue, Feb 17, 2015 at 10:20 AM, Mika Tanninen m...@tanninen.net wrote: Hi. I tried to test out the subsurface, but sadly it's not able to import my dive history from Suunto DM5. When I try to start the import (in Windows 7 64bit from Suunto DM5 1.2.37.5326 to the subsurface 4.4.0) the program just goes unresponsive and eventually hangs. In case you're interested to add the support, here is my Suunto DM5 db file containing 481 dives to be used for debugging: https://www.dropbox.com/s/9f8mair7lgz52bl/dm4.db -- Mika Tanninen gsm: +356 7 9996665 / +358 41 5055831 email: m...@tanninen.net www: http://mika.tanninen.net skype: MikaTanninen ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
[PATCH 1/2] Add time to DiveLog import
I originally thought about converting the time as well, but my fingers were too slow and memory too short to actually do that :D Signed-off-by: Miika Turkia miika.tur...@gmail.com --- xslt/DiveLog.xslt | 4 1 file changed, 4 insertions(+) diff --git a/xslt/DiveLog.xslt b/xslt/DiveLog.xslt index 579e177..66a3fd0 100644 --- a/xslt/DiveLog.xslt +++ b/xslt/DiveLog.xslt @@ -32,6 +32,10 @@ xsl:value-of select=concat(substring-after(substring-after(substring-before(@DateTime, ' '), '/'), '/'), '-', substring-before(@DateTime, '/'), '-', substring-before(substring-after(@DateTime, '/'), '/'))/ /xsl:attribute + xsl:attribute name=time +xsl:value-of select=substring-after(@DateTime, ' ')/ + /xsl:attribute + xsl:attribute name=duration xsl:call-template name=timeConvert xsl:with-param name=timeSec select=@Duration/ -- 2.1.0 ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
[PATCH 2/2] Quote tags as attributes
We need to quote the tick char (') on tags as this is used as XML
attribute.
Signed-off-by: Miika Turkia miika.tur...@gmail.com
---
save-xml.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/save-xml.c b/save-xml.c
index d5f1e15..8366f87 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -285,7 +285,7 @@ static void save_tags(struct membuffer *b, struct tag_entry
*entry)
struct divetag *tag = entry-tag;
put_string(b, sep);
/* If the tag has been translated, write the source to
the xml file */
- quote(b, tag-source ?: tag-name, 0);
+ quote(b, tag-source ?: tag-name, 1);
sep = , ;
} while ((entry = entry-next) != NULL);
put_string(b, ');
--
2.1.0
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
On Tuesday 17 February 2015 18:11:46 Lubomir I. Ivanov wrote: .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x188): undefined reference to `QWidget::styleChange(QStyle)' .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x190): undefined reference to `QWidget::enabledChange(bool)' .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x198): undefined reference to `QWidget::paletteChange(QPalette const)' .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x1a0): undefined reference to `QWidget::fontChange(QFont const)' .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x1a8): undefined reference to `QWidget::windowActivationChange(bool)' .obj/moc_globe.o:(.data.rel.ro._ZTV8GlobeGPS[_ZTV8GlobeGPS]+0x1b0): undefined reference to `QWidget::languageChange()’ i think that marble is built with Qt4, while Subsurface with Qt5. could be wrong. Right, those are symbols removed from Qt 5. From Qt 4.8's qwidget.h: protected: virtual void styleChange(QStyle); // compat virtual void enabledChange(bool); // compat virtual void paletteChange(const QPalette ); // compat virtual void fontChange(const QFont ); // compat virtual void windowActivationChange(bool); // compat virtual void languageChange(); // compat -- Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org Software Architect - Intel Open Source Technology Center PGP/GPG: 0x6EF45358; fingerprint: E067 918B B660 DBD1 105C 966C 33F5 F005 6EF4 5358 ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
On 17 February 2015 at 03:27, Michele Fabi fabie...@gmail.com wrote: This is the laptop I use for work (and all the rest :) and I procrastinated the upgrade for lack of time and a bit of laziness. F18 is ok for all I need. (well, it was...) Another reason for using git version is that my dive computer is a Divesystem Orca (very similar to the iDive) that is currently supported by libdivecomputer but is not in the official list of supported computer by subsurface. Here the result of compiling following Lubomir suggestions. Ill'upgrade the machine as soon as possible. if you haven't updated yet, you can save locally the raw email / patch i've just sent to the mailing list: [PATCH] simplewidgets.cpp: QLineEdit::setClearButtonEnabled() is from Qt5.2 move it to the Subsurface source folder and do: git am patch-file then call 'make' again to see if the QLineEdit error is fixed. i'm assuming you have Qt 5.2.0 git-access.c: In function ‘update_local_repo’: git-access.c:87:2: warning: implicit declaration of function ‘git_remote_fetch’ [-Wimplicit-function-declaration] looks like libgit2 is very outdated and the build will also most likely fail because of it. git_remote_fetch() was added in fe3a40a4ff056400cde6 which is from 2013-09-16 (v0.20). we can probably make this work by sending patches for you to test, but instead a system update is much more viable. compiling libdivecomputer.c compiling liquivision.c liquivision.c: In function ‘try_to_open_liquivision’: liquivision.c:303:36: warning: ‘event.pressure.mbar’ may be used uninitialized in this function [-Wmaybe-uninitialized] liquivision.c:244:19: note: ‘event.pressure.mbar’ was declared here liquivision.c:301:27: warning: ‘event.time’ may be used uninitialized in this function [-Wmaybe-uninitialized] liquivision.c:244:19: note: ‘event.time’ was declared here liquivision.c:140:42: warning: ‘location’ may be used uninitialized in this function [-Wmaybe-uninitialized] snip qt-ui/diveplanner.cpp: In member function ‘void DivePlannerPointsModel::createSimpleDive()’: qt-ui/diveplanner.cpp:65:26: warning: missing braces around initializer for ‘fraction_t’ [-Wmissing-braces] qt-ui/diveplanner.cpp: In member function ‘virtual bool DivePlannerPointsModel::setData(const QModelIndex, const QVariant, int)’: qt-ui/diveplanner.cpp:660:26: warning: missing braces around initializer for ‘fraction_t’ [-Wmissing-braces] qt-ui/diveplanner.cpp: In member function ‘int DivePlannerPointsModel::addStop(int, int, gasmix*, int, bool)’: qt-ui/diveplanner.cpp:942:26: warning: missing braces around initializer for ‘fraction_t’ [-Wmissing-braces] qt-ui/diveplanner.cpp:943:26: warning: missing braces around initializer for ‘fraction_t’ [-Wmissing-braces] compiling qt-ui/downloadfromdivecomputer.cpp compiling qt-ui/globe.cpp qt-ui/globe.cpp: In member function ‘void GlobeGPS::changeDiveGeoPosition(qreal, qreal, Marble::GeoDataCoordinates::Unit)’: qt-ui/globe.cpp:321:20: warning: unused variable ‘ds’ [-Wunused-variable] snip qt-ui/printlayout.cpp: In member function ‘void PrintLayout::printTable()’: qt-ui/printlayout.cpp:394:4: warning: ‘headingRowHeight’ may be used uninitialized in this function [-Wmaybe-uninitialized] qt-ui/printlayout.cpp:382:83: note: ‘headingRowHeight’ was declared here In file included from /usr/include/qt5/QtCore/qrect.h:46:0, from /usr/include/qt5/QtCore/qmargins.h:45, from /usr/include/qt5/QtWidgets/qwidget.h:47, from /usr/include/qt5/QtWidgets/qdesktopwidget.h:45, from /usr/include/qt5/QtWidgets/QDesktopWidget:1, from qt-ui/printlayout.cpp:2: /usr/include/qt5/QtCore/qpoint.h:278:64: warning: ‘headingRowHeightD2’ may be used uninitialized in this function [-Wmaybe-uninitialized] qt-ui/printlayout.cpp:382:63: note: ‘headingRowHeightD2’ was declared here compiling qt-ui/printoptions.cpp compiling qt-ui/simplewidgets.cpp qt-ui/simplewidgets.cpp: In constructor ‘TagFilter::TagFilter(QWidget*)’: qt-ui/simplewidgets.cpp:509:25: error: ‘class QLineEdit’ has no member named ‘setClearButtonEnabled’ qt-ui/simplewidgets.cpp: In constructor ‘BuddyFilter::BuddyFilter(QWidget*)’: qt-ui/simplewidgets.cpp:536:25: error: ‘class QLineEdit’ has no member named ‘setClearButtonEnabled’ qt-ui/simplewidgets.cpp: In constructor ‘LocationFilter::LocationFilter(QWidget*)’: interesting warnings. i don't have these with -Wall on gcc 4.8.2. lubomir -- ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
[PATCH] Adding more Suunto events
Signed-off-by: Miika Turkia miika.tur...@gmail.com --- parse-xml.c | 27 +++ 1 file changed, 27 insertions(+) diff --git a/parse-xml.c b/parse-xml.c index b119701..3c5bfe0 100644 --- a/parse-xml.c +++ b/parse-xml.c @@ -2011,9 +2011,19 @@ extern int dm4_events(void *handle, int columns, char **data, char **column) strcpy(cur_event.name, deco); break; case 22: + case 32: /* 22 Mandatory safety stop violation */ + /* 32 Deep stop violation */ strcpy(cur_event.name, violation); break; + case 30: + /* Tissue level warning */ + strcpy(cur_event.name, tissue warning); + break; + case 37: + /* Tank pressure alarm */ + strcpy(cur_event.name, tank pressure); + break; case 257: /* 257 Dive active */ /* This seems to be given after surface @@ -2028,6 +2038,23 @@ extern int dm4_events(void *handle, int columns, char **data, char **column) strcpy(cur_event.name, bookmark); } break; + case 259: + /* Deep stop */ + strcpy(cur_event.name, Deep stop); + break; + case 260: + /* Deep stop */ + strcpy(cur_event.name, Deep stop cleared); + break; + case 266: + /* Mandatory safety stop activated */ + strcpy(cur_event.name, safety stop (mandatory)); + break; + case 267: + /* Mandatory safety stop deactivated */ + /* DM5 shows this only on event list, not on the +* profile so skipping as well for now */ + break; default: strcpy(cur_event.name, unknown); cur_event.value = atoi(data[2]); -- 2.1.0 ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
On Tue, Feb 17, 2015 at 04:28:43PM +0100, Michele Fabi wrote: 2015-02-17 16:16 GMT+01:00 Dirk Hohndel d...@hohndel.org: On Feb 17, 2015, at 7:12 AM, Michele Fabi fabie...@gmail.com wrote: Thanks for your help Dirk. I have no hurry to use subsurface on this laptop so I can indifferently wait for a 4.4.1 version or upgrade my laptop, but I don't want to force the team to write a newer version, if it isn't already in your roadmap. Oh no, 4.4.1 is on the roadmap. It got delayed by a few days because I got distracted with fun new code I wanted to write instead, but this delay gives me a chance to make sure it’s easier to compile things from source. It's been very interesting to talk with you guys. I have some new items to study :) Again, thanks for your patience - normally it’s much easier to start using Subsurface :-) /D In fact usually it is. Glad to hear that from my old fedora it will comes out a script that will solve these problems. I'm more than happy to contribute to the project in every way it's possible. OK, please do this: mkdir ~/testfordirk cd ~/testfordirk git clone -b v4.4-branch git://subsurface-divelog.org/subsurface.git ./subsurface/scripts/build.sh now wait. possibly a while as it builds quite a few things if it fails, capture the bug and send it to us if it doesn't (YAY!) you can run Subsurface like this: ./subsurface/scripts/run.sh Hopefully this will be a step in the right direction. Thanks /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
4.4.1
So I picked what seemed like the sane patches and pushed them to the v4.4-branch. My goal is to release 4.4.1 tomorrow. Could people take a look to make sure I didn't break anything? The next part I just mentioned in another thread, but maybe more people will read this email, so I'll repeat it here: There's a new build script for people building on Linux and getting freaked out by the weird dependencies that we have... Obviously I want people to use our packages. But there are another 500 Linux distributions out there for which I don't have packages... so this should make things easier for people. if you feel like giving this a try, ideally start from a fresh checkout: mkdir ~/testfordirk cd ~/testfordirk git clone -b v4.4-branch git://subsurface-divelog.org/subsurface.git ./subsurface/scripts/build.sh now wait. possibly a while as it builds quite a few things if it fails, capture the bug and send it to the mailing list if it doesn't (YAY!) you can run Subsurface like this: ./subsurface/scripts/run.sh Note: this does NOT attempt to install prerequisits - you can find those in the INSTALL file. This also assumes that you have a Qt5 development devironment, it will not work on Qt4 based distros. /D ___ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
[PATCH] simplewidgets.cpp: QLineEdit::setClearButtonEnabled() is from Qt5.2
From: Lubomir I. Ivanov neolit...@gmail.com
This could cause problems if the user tries to compile with
Qt versions between 5.0 and 5.2.
Reported-by: Michele Fabi fabie...@gmail.com
Signed-off-by: Lubomir I. Ivanov neolit...@gmail.com
---
qt-ui/simplewidgets.cpp | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/qt-ui/simplewidgets.cpp b/qt-ui/simplewidgets.cpp
index eda567a..f7944c9 100644
--- a/qt-ui/simplewidgets.cpp
+++ b/qt-ui/simplewidgets.cpp
@@ -505,7 +505,7 @@ TagFilter::TagFilter(QWidget *parent) : QWidget(parent)
{
ui.setupUi(this);
ui.label-setText(tr(Tags: ));
-#if QT_VERSION = 0x05
+#if QT_VERSION = 0x050200
ui.filterInternalList-setClearButtonEnabled(true);
#endif
QSortFilterProxyModel *filter = new QSortFilterProxyModel();
@@ -532,7 +532,7 @@ BuddyFilter::BuddyFilter(QWidget *parent) : QWidget(parent)
ui.setupUi(this);
ui.label-setText(tr(Person: ));
ui.label-setToolTip(tr(Searches for buddies and divemasters));
-#if QT_VERSION = 0x05
+#if QT_VERSION = 0x050200
ui.filterInternalList-setClearButtonEnabled(true);
#endif
QSortFilterProxyModel *filter = new QSortFilterProxyModel();
@@ -558,7 +558,7 @@ LocationFilter::LocationFilter(QWidget *parent) :
QWidget(parent)
{
ui.setupUi(this);
ui.label-setText(tr(Location: ));
-#if QT_VERSION = 0x05
+#if QT_VERSION = 0x050200
ui.filterInternalList-setClearButtonEnabled(true);
#endif
QSortFilterProxyModel *filter = new QSortFilterProxyModel();
@@ -584,7 +584,7 @@ SuitFilter::SuitFilter(QWidget *parent) : QWidget(parent)
{
ui.setupUi(this);
ui.label-setText(tr(Suits: ));
-#if QT_VERSION = 0x05
+#if QT_VERSION = 0x050200
ui.filterInternalList-setClearButtonEnabled(true);
#endif
QSortFilterProxyModel *filter = new QSortFilterProxyModel();
--
1.7.11.msysgit.0
___
subsurface mailing list
subsurface@subsurface-divelog.org
http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
Re: problems compiling subsurface 4.4 on fedora 18
I'm sorry for the wild quoting: @Dirk Can you send the output of qmake-qt5 -v I wonder if we use features that require 5.3 (that's the lowest that I have been compiling with, lately). Dirk, Here it is [michele@localhost subsurface]$ qmake-qt5 -v QMake version 3.0 Using Qt version 5.1.1 in /usr/lib64 [michele@localhost subsurface]$ @Lubomir I'm sorry Lubomir, this night I was very tired when I discovered that in the italian version of the page, intructions and requirements to compiling are not updated, so the output chat I sent you is probably not right. I tried the correct procedure but it gives a slightly different error. Here it is the output of the last compilation. ...first part of marble compilation lost, sorry, no errors anyway... [ 60%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/handlers/dgml/DgmlStorageLayoutTagHandler.o [ 60%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/handlers/dgml/DgmlFilterTagHandler.o [ 61%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/handlers/dgml/DgmlSectionTagHandler.o [ 61%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/handlers/dgml/DgmlDownloadPolicyTagHandler.o [ 61%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/handlers/dgml/DgmlElementDictionary.o [ 61%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/handlers/dgml/DgmlItemTagHandler.o [ 61%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/handlers/dgml/DgmlSettingsTagHandler.o [ 61%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlAnimatedUpdateTagWriter.o [ 62%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlBalloonStyleTagWriter.o [ 62%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlCameraTagWriter.o [ 62%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlColorStyleTagWriter.o [ 62%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlDataTagWriter.o [ 62%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlDocumentTagWriter.o [ 62%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlExtendedDataTagWriter.o [ 63%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlFeatureTagWriter.o [ 63%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlFolderTagWriter.o [ 63%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlFlyToTagWriter.o [ 63%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlGroundOverlayWriter.o [ 63%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlIconStyleTagWriter.o [ 63%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlLatLonAltBoxWriter.o [ 64%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlLatLonBoxWriter.o [ 64%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlLatLonQuadWriter.o [ 64%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlLinearRingTagWriter.o [ 64%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlLineStringTagWriter.o [ 64%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlLineStyleTagWriter.o [ 64%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlLinkTagWriter.o [ 65%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlListStyleTagWriter.o [ 65%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlLodTagWriter.o [ 65%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlLookAtTagWriter.o [ 65%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlModelTagWriter.o [ 65%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlMultiGeometryTagWriter.o [ 65%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlMultiTrackTagWriter.o [ 66%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlNetworkLinkTagWriter.o [ 66%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlNetworkLinkControlTagWriter.o [ 66%] Building CXX object src/lib/marble/CMakeFiles/ssrfmarblewidget.dir/geodata/writers/kml/KmlObjectTagWriter.o [ 66%] Building CXX object
