Skip to content

Commit

Permalink
Added comments to functions, menu link to online manual, updated vers…
Browse files Browse the repository at this point in the history
…ion number location
  • Loading branch information
alanspencer committed Oct 16, 2018
1 parent f948e83 commit 3ea1b0e
Show file tree
Hide file tree
Showing 14 changed files with 739 additions and 225 deletions.
3 changes: 1 addition & 2 deletions SPIERSalign.pro
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ HEADERS += src/mainwindowimpl.h \
src/globals.h \
src/scene.h \
src/darkstyletheme.h \
src/version.h \
src/about.h \
../SPIERScommon/netmodule.h \
../SPIERScommon/semanticversion.h \
../SPIERScommon/semanticglobals.h \
../SPIERScommon/prereleasecomponent.h

SOURCES += src/mainwindowimpl.cpp \
Expand Down
19 changes: 15 additions & 4 deletions src/about.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
* @file
* About Dialog
*
* All REvoSim code is released under the GNU General Public License.
* All SPIERSview code is released under the GNU General Public License.
* See LICENSE.md files in the programme directory.
*
* All REvoSim code is Copyright 2008-2018 by Mark D. Sutton, Russell J. Garwood,
* All SPIERSview code is Copyright 2008-2018 by Russell J. Garwood, Mark D. Sutton,
* and Alan R.T. Spencer.
*
* This program is free software; you can redistribute it and/or modify
Expand All @@ -16,11 +16,15 @@
*/

#include "about.h"
#include "version.h"
#include "globals.h"
#include "mainwindowimpl.h"

#include <QString>

/**
* @brief About::About
* @param parent
*/
About::About(QWidget *parent) :
QDialog(parent),
ui(new Ui::About)
Expand All @@ -41,7 +45,7 @@ About::About(QWidget *parent) :
ui->textLabel_2->setWordWrap(true);
ui->textLabel_2->setText("This software is " + QString(PRODUCTNAME) +
". It was coded by"
" Russell Garwood (russell.garwood@gmail.com), with advice and assistance from Mark Sutton (m.sutton@imperial.ac.uk) and a GUI theme by Alan R.T. Spencer (alan.spencer@imperial.ac.uk)"
" Russell Garwood (russell.garwood@gmail.com), with advice and assistance from Mark Sutton (m.sutton@imperial.ac.uk) and additional code by Alan R.T. Spencer (alan.spencer@imperial.ac.uk)"
"<br><br>Reports are appreciated, and comments, suggestions, and feature requests are welcome.");
ui->textLabel_2->setAlignment(Qt::AlignCenter);

Expand All @@ -67,11 +71,18 @@ About::About(QWidget *parent) :
ui->buttonBox->setStandardButtons(QDialogButtonBox::Close);
}

/**
* @brief About::~About
*/
About::~About()
{
delete ui;
}

/**
* @brief About::returnLicense
* @return
*/
QString About::returnLicense()
{
QString license;
Expand Down
18 changes: 18 additions & 0 deletions src/about.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,25 @@
/**
* @file
* Header: About
*
* All SPIERSview code is released under the GNU General Public License.
* See LICENSE.md files in the programme directory.
*
* All SPIERSview code is Copyright 2008-2018 by Russell J. Garwood, Mark D. Sutton,
* and Alan R.T. Spencer.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version. This program is distributed in the
* hope that it will be useful, but WITHOUT ANY WARRANTY.
*/

#ifndef ABOUT_H
#define ABOUT_H

#include <QDialog>

#include "ui_about.h"

namespace Ui {
Expand Down
4 changes: 2 additions & 2 deletions src/darkstyletheme.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
* @file
* Dark Style Theme
*
* All REvoSim code is released under the GNU General Public License.
* All SPIERSview code is released under the GNU General Public License.
* See LICENSE.md files in the programme directory.
*
* All REvoSim code is Copyright 2008-2018 by Mark D. Sutton, Russell J. Garwood,
* All SPIERSview code is Copyright 2008-2018 by Russell J. Garwood, Mark D. Sutton,
* and Alan R.T. Spencer.
*
* This program is free software; you can redistribute it and/or modify
Expand Down
4 changes: 2 additions & 2 deletions src/darkstyletheme.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
* @file
* Header: Dark Style Theme
*
* All REvoSim code is released under the GNU General Public License.
* All SPIERSview code is released under the GNU General Public License.
* See LICENSE.md files in the programme directory.
*
* All REvoSim code is Copyright 2008-2018 by Mark D. Sutton, Russell J. Garwood,
* All SPIERSview code is Copyright 2008-2018 by Russell J. Garwood, Mark D. Sutton,
* and Alan R.T. Spencer.
*
* This program is free software; you can redistribute it and/or modify
Expand Down
27 changes: 26 additions & 1 deletion src/globals.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,36 @@
/**
* @file
* Globals
*
* All SPIERSview code is released under the GNU General Public License.
* See LICENSE.md files in the programme directory.
*
* All SPIERSview code is Copyright 2008-2018 by Russell J. Garwood, Mark D. Sutton,
* and Alan R.T. Spencer.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version. This program is distributed in the
* hope that it will be useful, but WITHOUT ANY WARRANTY.
*/

#include "globals.h"

//ImageData Constructor
/**
* @brief ImageData::ImageData
* @param fn
*/
ImageData::ImageData(QString fn)
{
fileName = fn;
}

/**
* @brief MarkerData::MarkerData
* @param startRectangle
* @param shp
*/
MarkerData::MarkerData(QRectF *startRectangle, int shp)
{
markerRect = startRectangle;
Expand Down
44 changes: 44 additions & 0 deletions src/globals.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/**
* @file
* Header: Globals
*
* All SPIERSview code is released under the GNU General Public License.
* See LICENSE.md files in the programme directory.
*
* All SPIERSview code is Copyright 2008-2018 by Russell J. Garwood, Mark D. Sutton,
* and Alan R.T. Spencer.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version. This program is distributed in the
* hope that it will be useful, but WITHOUT ANY WARRANTY.
*/

#ifndef __GLOBALS_H__
#define __GLOBALS_H__

Expand All @@ -13,6 +30,27 @@
#include <QString>
#include <QTransform>

//Legal Stuff
#define COPYRIGHT "Copyright © 2018 Mark D. Sutton, Russell J. Garwood, Alan R.T.Spencer"
#define LICENCE "This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under the conditions of the GPL v3 license"

//Programme Name
#define PRODUCTNAME "SPIERSalign"

//Email
#define EMAIL "palaeoware@gmail.com"

//Github
#define GITURL "https://github.com/"
#define GITREPOSITORY "palaeoware/SPIERSalign"
#define GITISSUE "/issues"

//Readthedocs
#define READTHEDOCS "https://spiersalign.readthedocs.io/en/latest/"

/**
* @brief The ImageData class
*/
class ImageData
{
public:
Expand All @@ -23,13 +61,19 @@ class ImageData
int format;
};

/**
* @brief The PropogationData class
*/
class PropogationData
{
public:
int transformation;
qreal value;
};

/**
* @brief The MarkerData class
*/
class MarkerData
{
public:
Expand Down
26 changes: 24 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/**
* @file
* Main
*
* All SPIERSview code is released under the GNU General Public License.
* See LICENSE.md files in the programme directory.
*
* All SPIERSview code is Copyright 2008-2018 by Russell J. Garwood, Mark D. Sutton,
* and Alan R.T. Spencer.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or (at
* your option) any later version. This program is distributed in the
* hope that it will be useful, but WITHOUT ANY WARRANTY.
*/

#include <QApplication>
#include <QDesktopWidget>
#include <QSplashScreen>
Expand All @@ -6,10 +23,15 @@

#include "darkstyletheme.h"
#include "mainwindowimpl.h"
#include "version.h"
#include "globals.h"
#include "../SPIERScommon/netmodule.h"


/**
* @brief qMain
* @param argc
* @param argv
* @return
*/
int main(int argc, char **argv)
{
//This has the app draw at HiDPI scaling on HiDPI displays, usually two pixels for every one logical pixel
Expand Down

0 comments on commit 3ea1b0e

Please sign in to comment.