Added:
- AMLightweightScanInfoCollection::getScanIdFromThumbnailId(int) ~
Helper function which, when passed a thumbnailId, will return the scan
which this thumbnail belongs to (returns -1 if thumbnail does not belong
to a scan)

Altered:
- AMLightweightScanInfoCollection::onDbItemAdded() ~ Now includes check
for db item added to thumbnails table. If it is it obtains the relevant
scanId from the getScanIdFromThumbnailId() and emits the signal:
- scanThumbnailAdded(int) ~ Signal to indicate a thumbnail has been
added to the scan with the provided id.
- AMLightweightScanInfoModel ~ Now connects its collections
scanThumbnailAdded() signal to the scanUpdated slot.
Altered:
- Moved private member variables for widget
ui_AMExporterOptionGeneralAsciiView.h to
AMExporterOptionGeneralAsciiView
- Moved initialization code from ui_AMExporterOptionGeneralAsciiView.h
to AMExporterOptionGeneralAsciiView::AMExporterOptionGeneralAsciiView()
Removed:
- AMExporterOptionGeneralAsciiView.ui

Altered:
-AMExporterOptionGeneralAsciiView ~ Changed some of the variable names
for the widgets that escaped the first set of changes.
Added:
- QLayouts to AMSamplePositionPre2013ViewActionsWidget which didn't come
across in the transfer of member variables. I've noticed these don't
seem to end up in the ui_xxxx.h file. Just another reason why torching
these things is a good idea.

Altered:
-
AMSamplePositionPre2013ViewActionsWidget::AMSamplePositionPre2013ViewActionsWidget()
~ Brought across the setupUi and translateUi code from the original
ui_xxxx.h file.
Altered:
- AMExporterOptionGeneralAsciiView::AMExporterOptionGeneralAsciiView() ~
Changed default displated tab to be "Data Sets" (index 1)
- AMExporterOptionGeneralAsciiView.h ~ Moved member variables from
private to protected
Added:
- AMExportController::scanFromUrl() ~ Function which takes a scan URL
and returns the scan (or 0 if no scan can be loaded from that URL)

Altered:
- AMExportController::AMExportController() ~ Now both constructors
determine the default export option by checking the default for the
first scan. (Assumes that all the scans are the same as the first one)
- AMExportWizardOptionPage::populateOptionSelector() ~ Now selects the
option for the combo box depending on the export controller's current
default option.
Merge branch 'Issue881' into Issue823
Iain's additions to get thumbnail drawing working when a scan finishes. There's a leftover blank thumbnail from when the scan is started that still needs to be removed. There also appears to be an edge case where updates don't happen properly if you have the dataview open when the scan finishes.
Iain's additional updates to the thumbnail adding (and removing) issue.
Altered:
- AMLightweightScanInfoCollection::onDbItemRemoved() ~ Now properly removed thumbnails for the last updated scan
- AMLightweightScanInfoCollection::onDbItemAdded() ~ Partially complete re-adding thumbnails for the last updated scan, doesn't work yet
Altered:
- AMLightweightScanInfo::resetThumbnails() to clearThumbnails() ~ Now
simply clears the thumbnails collection for the scan.
- AMLightweightScanInfoCollection::onDbItemAdded() ~ Now emits a
scanInfoUpdated signal whenever a scan had a thumbnail added.
- AMLightweightScanInfoCollection::onDbItemRemoved() ~ Now calls the
scan info's clearThumbnails() function when a scan's thumbnail is
removed and emits a scanUpdated() signal afterwards.
- AMLightweightScanInfoModel::onScanThumbnailAboutToBeAdded() ~ Calls
beginResetModel() instead of beginInsertRows()
- AMLightweightScanInfoModel::onScanThumbnailAdded() ~ Calls
endResetModel() instead of endInsertRows()
- AMScanThumbnailView::rowsAboutToBeRemoved() ~ Changed from
rowsRemoved() to conform with the structure of QAbstractItemView.
Altered:
- The scanThumbnailAboutToBeAdded() signal chain to remove the passing
of the indices as it is not needed by the final call to the model (which
now uses beginResetModel() instead of beginInsertRows(...)
- Removed calls to qDebug()
Fixed minor merge conflict over blank line.
Merge branch 'master' into Issue823
Merge pull request #934 from acquaman/Issue823

Tested on my computer using SXRMB Acquaman and appears to be working. Good work @iainworkman
Fixed minor merge conflict. Removed annoying direct use of pragma warning system in AMExporterOptionGeneralAsciiView.h
Merge pull request #855 from acquaman/Issue854

Fixed one minor merge conflict with master. Tested. Builds and appears to be working for exporter.
Quick fix to get DESTDIR in the right place for AMCrashReporter. Moved one to AMCommon.pri, which is where it should be. Need to remove other instances.
Merge branch 'master' of github.com:acquaman/acquaman