Loads of small changes

* Nitpicky style changes
* Improvements to scroll wheel zooming
* libusb init error dialog
* Moved all cutting parameters into single struct.
* Get version code from qmake project file.
* Disable Reload when no file is open.
* Use C++11.
* Ignore .user files in git.

Author: Timmmm

.gitignore

@@ -26,3 +26,4 @@ ui_CutDialog.h
 ui_CuttingDialog.h
 ui_MainWindow.h
 .gitignore
+*.user

Common.h

@@ -52,31 +52,31 @@ class Error
 const Error Success(true);
 const Error Failure(false);
 
-/** Integer to string. */
+// Integer to string.
 inline string ItoS(int I)
 {
 	std::stringstream S;
 	S << I;
 	return S.str();
 }
 
-/** Unsigned integer to string. */
+// Unsigned integer to string.
 inline string UItoS(unsigned int I)
 {
 	std::stringstream S;
 	S << I;
 	return S.str();
 }
 
-/** Unsigned long long to string. */
+// Unsigned long long to string.
 inline string ULLtoS(unsigned long long I)
 {
 	char out[128];
 	sprintf(out, "%lld", I);
 	return out;
 }
 
-/** String to integer, returns Fail on fail. */
+// String to integer, returns Fail on fail.
 inline int StoI(const string& S, int Fail = 0)
 {
 	char* EP;
@@ -87,7 +87,7 @@ inline int StoI(const string& S, int Fail = 0)
 	return R;
 }
 
-/** String to unsigned integer, returns Fail on fail. */
+// String to unsigned integer, returns Fail on fail.
 inline unsigned int StoUI(const string& S, unsigned int Fail = 0)
 {
 	char* EP;
@@ -98,7 +98,7 @@ inline unsigned int StoUI(const string& S, unsigned int Fail = 0)
 	return R;
 }
 
-/** String to unsigned integer, returns Fail on fail. */
+// String to unsigned integer, returns Fail on fail.
 inline unsigned int StoULL(const string& S, unsigned long long Fail = 0)
 {
 	char* EP;
@@ -109,7 +109,7 @@ inline unsigned int StoULL(const string& S, unsigned long long Fail = 0)
 	return R;
 }
 
-/** Get an environmental variable. */
+// Get an environmental variable.
 inline string GetEnv(const string& Var)
 {
 	char* V = getenv(Var.c_str());

CutDialog.h

@@ -19,8 +19,7 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef CUTDIALOG_H
-#define CUTDIALOG_H
+#pragma once
 
 #include <QDialog>
 
@@ -43,10 +42,12 @@ class CutDialog : public QDialog
 	int speed() const;
 	// The cutting pressure (1-33).
 	int pressure() const;
-	// Track enhancing.
+	// Track enhancing. This is when the cutter rolls the media backwards and forwards
+	// a few times before cutting in order to indent it with tracks where the rollors are.
+	// The idea is that it will slip less after that is done.
 	bool trackEnhancing() const;
 
-	// Whether to search
+	// Whether to search.
 	bool regMark() const;
 	bool regSearch() const; 
 	// Positions of the registration marks.
@@ -57,10 +58,8 @@ class CutDialog : public QDialog
 	void changeEvent(QEvent *e);
 
 private slots:
-	// When they change the media, update the default speed and pressure.
+	// When they change the media selection, update the default speed and pressure.
 	void onMediaChanged(int idx);
 private:
     Ui::CutDialog *ui;
 };
-
-#endif // CUTDIALOG_H

CuttingDialog.cpp

@@ -59,9 +59,7 @@ void CuttingDialog::changeEvent(QEvent *e)
 }
 
 
-void CuttingDialog::startCut(QList<QPolygonF> cuts, double mediawidth, double mediaheight, int media, int speed,
-                             int pressure, bool trackenhancing,
-							 bool regmark, bool regsearch, double regwidth, double reglength)
+void CuttingDialog::startCut(const CutParams& params)
 {
 	if (thread)
 	{
@@ -73,8 +71,7 @@ void CuttingDialog::startCut(QList<QPolygonF> cuts, double mediawidth, double me
 	connect(thread, SIGNAL(success()), SLOT(onSuccess()));
 	connect(thread, SIGNAL(error(QString)), SLOT(onError(QString)));
 
-	thread->setParams(cuts, mediawidth, mediaheight, media, speed, pressure, trackenhancing,
-	                  regmark, regsearch, regwidth, reglength);
+	thread->setParams(params);
 
 	thread->start();
 }

CuttingDialog.h

@@ -41,9 +41,7 @@ class CuttingDialog : public QDialog
 
 	// Start the cutting thread. Call this only once, before the dialog is shown.
 	// It creates the thread, passes it the cutting details, and runs it.
-	void startCut(QList<QPolygonF> cuts, double mediawidth, double mediaheigt, int media, int speed,
-	              int pressure, bool trackenhancing, bool regmark, bool regsearch,
-	              double regwidth, double reglength);
+	void startCut(const CutParams& params);
 
 protected:
 	void changeEvent(QEvent *e);

CuttingThread.cpp

@@ -26,40 +26,19 @@
 CuttingThread::CuttingThread(QObject *parent) :
     QThread(parent)
 {
-	_media = 300;
-	_speed = 10;
-	_pressure = 10;
-	_trackenhancing = false;
-	_regmark = false;
-	_regsearch = false;
-	_regwidth = 0.0;
-	_reglength = 0.0;
+
 }
 
 
-void CuttingThread::setParams(QList<QPolygonF> cuts, double mediawidth, double mediaheight, int media,
-                              int speed, int pressure, bool trackenhancing,
-                              bool regmark, bool regsearch, float regwidth, float reglength)
+void CuttingThread::setParams(const CutParams& p)
 {
-	// TODO: Move all this into a structure.
-	_cuts = cuts;
-	_media = media;
-	_speed = speed;
-	_pressure = pressure;
-	_trackenhancing = trackenhancing;
-	_regmark = regmark;
-	_regsearch = regsearch;
-	_regwidth = regwidth;
-	_reglength = reglength;
-	_mediawidth = mediawidth;
-	_mediaheight = mediaheight;
+	params = p;
 }
 
 
 void CuttingThread::run()
 {
-	Error e = Cut(_cuts, _mediawidth, _mediaheight, _media, _speed, _pressure, _trackenhancing,
-	              _regmark, _regsearch, _regwidth, _reglength);
+	Error e = Cut(params);
 	if (e)
 		emit success();
 	else

CuttingThread.h

@@ -34,15 +34,29 @@
 // 4. Call start().
 // 5. Wait for success() or error().
 
+struct CutParams
+{
+	QList<QPolygonF> cuts;
+	double mediawidth = 0.0;
+	double mediaheight = 0.0;
+	int media = 300;
+	int speed = 10;
+	int pressure = 10;
+	bool trackenhancing = false;
+	bool regmark = false;
+	bool regsearch = false;
+	double regwidth = 0.0;
+	double regheight = 0.0;
+};
+
 class CuttingThread : public QThread
 {
 	Q_OBJECT
 public:
 	explicit CuttingThread(QObject *parent = 0);
 
 	// Set the parameters to use for the cut.
-	void setParams(QList<QPolygonF> cuts, double mediawidth, double mediaheight, int media, int speed, int pressure,
-	               bool trackenhancing, bool regmark, bool regsearch, float regwidth, float reglength);
+	void setParams(const CutParams& params);
 
 signals:
 	// Emitted if the cutting was (as far as we can tell) successful.
@@ -57,15 +71,6 @@ public slots:
 	void run();
 
 private:
-	QList<QPolygonF> _cuts;
-	double _mediawidth;
-	double _mediaheight;
-	int _media;
-	int _speed;
-	int _pressure;
-	bool _trackenhancing;
-	bool _regmark; 
-	bool _regsearch; 
-	double _regwidth;
-	double _reglength;
+	CutParams params;
+
 };

MainWindow.cpp

@@ -258,10 +258,21 @@ void MainWindow::on_actionCut_triggered()
 	// Create a new dialog and run the actual cutting in a different thread.
 
 	CuttingDialog* cuttingDlg = new CuttingDialog(this);
-	cuttingDlg->startCut(paths, mediaSize.width(), mediaSize.height(), cutDialog->media(), cutDialog->speed(),
-	                     cutDialog->pressure(), cutDialog->trackEnhancing(),
-	                     cutDialog->regMark(), cutDialog->regSearch(),
-	                     cutDialog->regWidth(), cutDialog->regHeight());
+
+	CutParams params;
+	params.cuts = paths;
+	params.mediawidth = mediaSize.width();
+	params.mediaheight = mediaSize.height();
+	params.media = cutDialog->media();
+	params.pressure = cutDialog->pressure();
+	params.regwidth = cutDialog->regWidth();
+	params.regheight = cutDialog->regHeight();
+	params.regmark = cutDialog->regMark();
+	params.regsearch = cutDialog->regSearch();
+	params.speed = cutDialog->speed();
+	params.trackenhancing = cutDialog->trackEnhancing();
+
+	cuttingDlg->startCut(params);
 	cuttingDlg->show();
 }
 
@@ -382,6 +393,7 @@ void MainWindow::setFileLoaded(QString filename)
 	ui->actionZoom_In->setEnabled(e);
 	ui->actionZoom_Out->setEnabled(e);
 	ui->actionCut->setEnabled(e);
+	ui->actionReload->setEnabled(e);
 
 }
 
@@ -391,9 +403,18 @@ bool MainWindow::eventFilter(QObject *o, QEvent *e)
 	{
 		if (e->type() == QEvent::Wheel)
 		{
+			// Anchor under the mouse pointer when using the mouse wheel.
+			// This doesn't quite work as nicely as I'd like because it clamps the scrolling
+			// precisely to the scene boundary. It's a bit hard to zoom to corners. Oh well.
+			ui->graphicsView->setTransformationAnchor(QGraphicsView::AnchorUnderMouse);
 			QWheelEvent *w = dynamic_cast<QWheelEvent*>(e);
-			if(w->delta() <= 0) on_actionZoom_In_triggered();
-			else on_actionZoom_Out_triggered();
+			if (w->delta() <= 0)
+				on_actionZoom_Out_triggered();
+			else
+				on_actionZoom_In_triggered();
+
+			// Anchor in view centre for keyboard shortcuts.
+			ui->graphicsView->setTransformationAnchor(QGraphicsView::AnchorViewCenter);
 			return true;
 		}
 	}

MainWindow.h

@@ -19,8 +19,7 @@
  *   51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.              *
  ***************************************************************************/
 
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
+#pragma once
 
 #include <QMainWindow>
 
@@ -99,5 +98,3 @@ private slots:
 	bool eventFilter(QObject *o, QEvent *e);
 	void loadFile();
 };
-
-#endif // MAINWINDOW_H

MainWindow.ui

@@ -164,6 +164,9 @@
    </property>
   </action>
   <action name="actionReload">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
    <property name="text">
     <string>Reload</string>
    </property>