Moved some installation files around and fixed libpng CRC error.

CMakeLists.txt

@@ -18,7 +18,7 @@ set( APP_SOURCE        "https://github.com/frontiersi/${PROJECT_NAME}/releases")
 # D: APP_BUILD_DTSTAMP - Date-time stamp of build (coordinated universal time).
 set( APP_VERSION_MAJOR 4)
 set( APP_VERSION_MINOR 0)
-set( APP_VERSION_PATCH 1)
+set( APP_VERSION_PATCH 2)
 string( TIMESTAMP APP_BUILD_DTSTAMP "%y%m%d" UTC)
 set( APP_VERSION_STRING "${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}.${APP_VERSION_PATCH}.${APP_BUILD_DTSTAMP}")
 
@@ -172,11 +172,11 @@ if ( WIN32)
         set( _rootPackageXML "${_packageRoot}/meta/package.xml")
 
         # Copy over the base directory structure for the config and packages folders from the source directory.
-        #install( DIRECTORY "installer/" DESTINATION "${PROJECT_BINARY_DIR}" PATTERN "*.py" EXCLUDE PATTERN "*.xml.in" EXCLUDE)
-        install( DIRECTORY "installer/" DESTINATION "${CMAKE_INSTALL_PREFIX}" PATTERN "*.py" EXCLUDE PATTERN "*.xml.in" EXCLUDE)
+        #install( DIRECTORY "install/windows/" DESTINATION "${PROJECT_BINARY_DIR}" PATTERN "*.py" EXCLUDE PATTERN "*.xml.in" EXCLUDE)
+        install( DIRECTORY "install/windows/" DESTINATION "${CMAKE_INSTALL_PREFIX}" PATTERN "*.py" EXCLUDE PATTERN "*.xml.in" EXCLUDE)
         # Configure the required package installer configuration files
-        configure_file( "installer/${_rootPackageXML}.in" "${CMAKE_INSTALL_PREFIX}/${_rootPackageXML}")
-        configure_file( "installer/${_configXML}.in"      "${CMAKE_INSTALL_PREFIX}/${_configXML}")
+        configure_file( "install/windows/${_rootPackageXML}.in" "${CMAKE_INSTALL_PREFIX}/${_rootPackageXML}")
+        configure_file( "install/windows/${_configXML}.in"      "${CMAKE_INSTALL_PREFIX}/${_configXML}")
 
         # Create the package directories with required structure
         set( _packageRootData "${_packageRoot}/data")
@@ -239,8 +239,8 @@ elseif(UNIX)
     # NB ENSURE THAT LD_LIBRARY_PATH IS SET CORRECTLY TO FIND THE CORRECT LIBRARIES NEEDED!
     install( CODE "execute_process( COMMAND ${_linuxdeploy} --appdir=${_appdir}
                                              --executable=${_bin_dir}/${PROJECT_NAME}
-                                             --desktop-file=${PROJECT_SOURCE_DIR}/installer/linux/${PROJECT_NAME}.desktop
-                                             --icon-file=${PROJECT_SOURCE_DIR}/installer/linux/${PROJECT_NAME}.png
+                                             --desktop-file=${PROJECT_SOURCE_DIR}/install/linux/${PROJECT_NAME}.desktop
+                                             --icon-file=${PROJECT_SOURCE_DIR}/install/linux/${PROJECT_NAME}.png
                                     WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})")
     install( CODE "execute_process( COMMAND ${_appimagetool} ${_appdir}
                                     WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})")

include/ClinifaceMain.h

@@ -121,6 +121,7 @@ private slots:
     FaceAction *_actionInvertNormals;
     FaceAction *_actionAlignVertices;
     FaceAction *_actionSaveFaceModel;
+    FaceAction *_actionVisPolyLabels;
     FaceAction *_actionAlignLandmarks;
     FaceAction *_actionCloseFaceModel;
     FaceAction *_actionExportMetaData;

plugins/CurvatureVis/include/CurvatureVis.h

@@ -29,7 +29,7 @@ Q_PLUGIN_METADATA( IID QToolsPluginInterface_iid)
 Q_INTERFACES( QTools::PluginInterface)
 public:
     CurvatureVis();
-    std::string applicationCode() const { return "org.cliniface_4.0.1_plugin";}
+    std::string applicationCode() const { return "org.cliniface_4.0.2_plugin";}
 };  // end class
 
 }   // end namespace

plugins/SymmetryVis/include/SymmetryVis.h

@@ -29,7 +29,7 @@ Q_PLUGIN_METADATA( IID QToolsPluginInterface_iid)
 Q_INTERFACES( QTools::PluginInterface)
 public:
     SymmetryVis();
-    std::string applicationCode() const { return "org.cliniface_4.0.1_plugin";}
+    std::string applicationCode() const { return "org.cliniface_4.0.2_plugin";}
 };  // end class
 
 }   // end namespace

src/ClinifaceMain.cpp

@@ -63,6 +63,7 @@
 #include <FaceActionManager.h>
 
 #include <OutlinesVisualisation.h>
+#include <PolyLabelsVisualisation.h>
 #include <VertexLabelsVisualisation.h>
 
 #include <QLabel>
@@ -83,6 +84,16 @@ QAction* connectDialog( QAction* a, QDialog* d)
 }   // end connectDialog
 
 
+QString appName()
+{
+#ifdef NDEBUG
+    return APP_NAME;
+#else
+    return QString( "%1 (DEBUG)").arg(APP_NAME);
+#endif
+}   // end appName
+
+
 // Plugin help documentation is embedded within a single HTML page with header and footer defined by Cliniface.
 QString producePluginHelpContent( FaceAction* act)
 {
@@ -144,6 +155,7 @@ void ClinifaceMain::registerActions()
     FAM::registerAction( _actionVisOutlines);
     FAM::registerAction( _actionVisWireframe);
     FAM::registerAction( _actionVisTexture);
+    FAM::registerAction( _actionVisPolyLabels);
     FAM::registerAction( _actionVisVertexLabels);
 
     FAM::registerAction( new ActionMapCurvature);
@@ -239,6 +251,7 @@ void ClinifaceMain::createViewMenu()
     _ui->menu_View->addAction( _actionEditLandmarks->qaction());
     _ui->menu_View->addAction( _actionEditPaths->qaction());
     _ui->menu_View->addAction( _actionRadialSelect->qaction());
+    _ui->menu_View->addAction( _actionVisPolyLabels->qaction());
     _ui->menu_View->addAction( _actionVisVertexLabels->qaction());
 
     QMenu *surfaceMenu = _ui->menu_View->addMenu( "&Scalar Mapping...");
@@ -441,6 +454,7 @@ void ClinifaceMain::createActions()
     _actionVisTexture->addTriggerEvent( Event::LOADED_MODEL);
     _actionVisWireframe = new ActionVisualise( "Wireframe", QIcon(":/icons/WIREFRAME"), new WireframeVisualisation, Qt::Key_W);
     _actionVisOutlines = new ActionVisualise( "Outlines", QIcon(":/icons/OUTLINES"), new OutlinesVisualisation, Qt::Key_O);
+    _actionVisPolyLabels = new ActionVisualise( "Polygon Labels", QIcon(":/icons/NUMBERS"), new PolyLabelsVisualisation, Qt::SHIFT + Qt::Key_V);
     _actionVisVertexLabels = new ActionVisualise( "Vertex Labels", QIcon(":/icons/NUMBERS"), new VertexLabelsVisualisation, Qt::Key_V);
     _actionEditLandmarks = new ActionEditLandmarks( "Show Landmarks", QIcon(":/icons/MARKER"), Qt::Key_L);
 
@@ -577,12 +591,13 @@ void ClinifaceMain::createMetrics()
 }   // end createMetrics
 
 
+
 // public
 ClinifaceMain::ClinifaceMain()
     : QMainWindow(nullptr), _ui(new Ui::ClinifaceMain)
 {
     _ui->setupUi(this);
-    setWindowTitle( APP_NAME);
+    setWindowTitle( appName());
     setAcceptDrops(true);   // Accept dropping of files onto this widget
     setContextMenuPolicy(Qt::NoContextMenu);
 
@@ -616,7 +631,7 @@ ClinifaceMain::ClinifaceMain()
     Preferences::updateApplication();   // Initialise loaded preferences
 
     _ploader = new ClinifacePluginsLoader( this);
-    _ploader->dialog()->setWindowTitle( APP_NAME + QString(" | Plugins"));
+    _ploader->dialog()->setWindowTitle( appName() + QString(" | Plugins"));
 
     createToolBar();
     createFileMenu();
@@ -724,14 +739,14 @@ void ClinifaceMain::closeEvent( QCloseEvent* evt)
 
 void ClinifaceMain::_doOnUpdate( const FaceTools::FM* fm)
 {
-    QString wtitle = QString( "%1 %2").arg( APP_NAME, APP_VERSION_STRING);
+    QString wtitle = QString( "%1 %2").arg( appName(), APP_VERSION_STRING);
 
     if ( fm)
     {
         QString mfile = FaceTools::FileIO::FMM::filepath(fm).c_str();
         if ( !fm->isSaved())
             mfile += " (*)";
-        wtitle = QString("%1 | %2").arg( APP_NAME, mfile);
+        wtitle = QString("%1 | %2").arg( appName(), mfile);
     }   // end if
 
     setWindowTitle( wtitle);

src/ClinifacePluginsLoader.cpp

@@ -35,8 +35,7 @@ void ClinifacePluginsLoader::loadPlugins( const QString& dllsDir)
     QTools::PluginsLoader ploader( dllsDir.toStdString());
     connect( &ploader, &QTools::PluginsLoader::loadedPlugin, this, &ClinifacePluginsLoader::_addPlugin);
     const std::string pluginToken = QString( "org.cliniface_%1.%2.%3_plugin").arg(APP_VERSION_MAJOR).arg(APP_VERSION_MINOR).arg(APP_VERSION_PATCH).toStdString();
-    std::cerr << "Loading plugins from: " << ploader.pluginsDir().absolutePath().toStdString()
-              << " using compatibility code: " << pluginToken << std::endl;
+    std::cerr << "Looking for plugins in: " << ploader.pluginsDir().absolutePath().toStdString() << std::endl;
     ploader.loadPlugins( pluginToken);  // Actually load with _addPlugin called for each
     _pdialog->addPlugins( ploader); // Add plugins to the dialog
 }   // end loadPlugins
@@ -46,11 +45,15 @@ void ClinifacePluginsLoader::_addPlugin( QTools::PluginInterface* plugin, const
 {
     if ( !plugin)
     {
+#ifndef NDEBUG
         std::cerr << "Failed to load plugin from: " << pluginpath.toStdString() << std::endl;
         std::cerr << " >>> Might there be undefined functions on the class?" << std::endl;
+#endif
         return;
     }   // end if
 
+    std::cerr << "Loaded plugin: " << plugin->displayName().toStdString() << std::endl;
+
     for ( const QString& iid : plugin->interfaceIds())
     {
         FaceAction *act = qobject_cast<FaceAction*>( plugin->iface(iid));