Merge pull request #98 from orange-vertex/master

Change the versioning scheme to major.minor.revision

Author: Petros Koutsolampros

depthmapX/AboutDlg.cpp

@@ -21,7 +21,7 @@ CAboutDlg::CAboutDlg(QWidget *parent)
 {
 	setupUi(this);
 	QString m_version_info;
-    m_version_info = QString(tr("Version %1%2")).arg(DEPTHMAPX_VERSION).arg(DEPTHMAPX_MINOR_VERSION);
+    m_version_info = QString(tr("Version %1.%2.%3")).arg(DEPTHMAPX_MAJOR_VERSION).arg(DEPTHMAPX_MINOR_VERSION).arg(DEPTHMAPX_REVISION_VERSION);
 	QString m_copyright;
     m_copyright = QString(tr("(C) 2000-2010 University College London, Alasdair Turner, Eva Friedrich\n(C) 2011-2014 Tasos Varoudis\n(C) 2017 Christian Sailer, Petros Koutsolampros"));
 	QString m_agreement;

depthmapX/GraphDoc.cpp

@@ -87,7 +87,7 @@ QGraphDoc::QGraphDoc(const QString &author, const QString &organisation)
    m_num_records = 0;
 
    std::string date = ViewHelpers::getCurrentDate();
-   QString version = QString("depthmapX v%1.%2").arg(DEPTHMAPX_VERSION).arg(DEPTHMAPX_MINOR_VERSION);
+   QString version = QString(TITLE_BASE);
 
    m_meta_graph->setProperties(author.toStdString(),organisation.toStdString(),date,version.toStdString());
 

depthmapX/depthmapView.cpp

@@ -1688,7 +1688,7 @@ void QDepthmapView::OutputEPS( ofstream& stream, QGraphDoc *pDoc, bool includeSc
 
    stream << "%!PS-Adobe-3.0 EPSF-3.0\n"
           << "%%BoundingBox: 0 0 " << clrect.width() << " " << clrect.height() << "\n"
-          << "%%Creator: depthmapX " << DEPTHMAPX_VERSION << "." << DEPTHMAPX_MINOR_VERSION << endl;
+          << "%%Creator: " << TITLE_BASE << endl;
 
    // temporarily inflate resolution for EPS draw
    rect = QRect(clrect.left() * 10, clrect.top() * 10, clrect.width() * 10, clrect.height() * 10);
@@ -2495,7 +2495,7 @@ void QDepthmapView::OutputSVG( ofstream& stream, QGraphDoc *pDoc )
    stream << "\"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">" << endl;
    stream << "<svg width=\"24cm\" height=\"" << (h/200) << "cm\" viewBox=\"0 0 4800 " << h << "\"" << endl;
    stream << "xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\">" << endl;
-   stream << "<desc>depthmapX " << DEPTHMAPX_VERSION << "." << DEPTHMAPX_MINOR_VERSION << "</desc>" << endl;
+   stream << "<desc>" << TITLE_BASE << "</desc>" << endl;
 
    // note, SVG draw completely overrides standard draw physical units to achieve hi-res output
    // (EPS should probably follow this model too)

depthmapX/version.h

@@ -18,15 +18,15 @@
 #define VERSION_H
 
 // use these to define the depthmap versions
-#define DEPTHMAPX_VERSION 0
-#define DEPTHMAPX_MINOR_VERSION_RAW 60   // b Beta version, r is standard release, s is stable release, W - M - L for single OS
+#define DEPTHMAPX_MAJOR_VERSION 0
+#define DEPTHMAPX_MINOR_VERSION 6
+#define DEPTHMAPX_REVISION_VERSION 0
+
 #define DEPTHMAP_MODULE_VERSION 10.04
 
 // leave these alone - C Preprocessor magic to get stuff to the right format
 #define STRINGIFY(v) #v
-#define DEPTHMAPX_MINOR_VERSION_FORMAT(minor) STRINGIFY(minor)
-#define DEPTHMAPX_MINOR_VERSION DEPTHMAPX_MINOR_VERSION_FORMAT(DEPTHMAPX_MINOR_VERSION_RAW)
-#define TITLE_BASE_FORMAT(version, minor) "depthmapX " STRINGIFY(version) "." STRINGIFY(minor)
-#define TITLE_BASE TITLE_BASE_FORMAT(DEPTHMAPX_VERSION, DEPTHMAPX_MINOR_VERSION_RAW)
+#define TITLE_BASE_FORMAT(version, minor, revision) "depthmapX " STRINGIFY(version) "." STRINGIFY(minor) "." STRINGIFY(revision)
+#define TITLE_BASE TITLE_BASE_FORMAT(DEPTHMAPX_MAJOR_VERSION, DEPTHMAPX_MINOR_VERSION, DEPTHMAPX_REVISION_VERSION)
 
 #endif // VERSION_H