Cleanup HAI build system

Author: finetjul

Applications/HAI/CMakeLists.txt

@@ -1,3 +1,23 @@
+###########################################################################
+#
+#  Library: MSVTK
+#
+#  Copyright (c) Kitware Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+###########################################################################
+
 set(KIT HAI)
 project(msv${KIT})
 
@@ -64,6 +84,11 @@ target_link_libraries(msv${KIT}
   msvQtWidgets
   )
 
+install(TARGETS msv${KIT}
+  RUNTIME DESTINATION ${MSVTK_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
+  LIBRARY DESTINATION ${MSVTK_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
+  ARCHIVE DESTINATION ${MSVTK_INSTALL_LIB_DIR} COMPONENT Development
+  )
 
 # --------------------------------------------------------------------------
 # Build the executable
@@ -72,7 +97,7 @@ target_link_libraries(msv${KIT}
 add_executable(${KIT}
   hai.cxx
   )
-set_target_properties(${KIT} PROPERTIES OUTPUT_NAME HAI)
+set_target_properties(${KIT} PROPERTIES OUTPUT_NAME hai)
 
 target_link_libraries(${KIT}
   msv${KIT}
@@ -99,3 +124,16 @@ set(dynamicHeaders
 if(BUILD_TESTING)
   add_subdirectory(Testing)
 endif()
+
+# --------------------------------------------------------------------------
+# Install
+# --------------------------------------------------------------------------
+if(NOT PACKAGE_WITH_BUNDLE)
+  set(${KIT}_INSTALL_DESTINATION_ARGS RUNTIME DESTINATION ${MSVTK_INSTALL_BIN_DIR})
+else()
+  set(${KIT}_INSTALL_DESTINATION_ARGS RUNTIME DESTINATION ".")
+endif()
+
+install(TARGETS ${KIT}
+  ${${KIT}_INSTALL_DESTINATION_ARGS}
+  COMPONENT Runtime)

Applications/HAI/Resources/UI/msvQHAIAboutDialog.ui

@@ -42,14 +42,10 @@
       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;MSVTK Library&lt;br /&gt;Copyright (c) Kitware Inc. &lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;VTK &lt;a href=&quot;http://www.vtk.org/copyright.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.vtk.org/copyright.php&lt;/span&gt;&lt;/a&gt; &lt;br /&gt;CTK &lt;a href=&quot;https://github.com/commontk/CTK/blob/master/LICENSE&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/commontk/CTK/blob/master/LICENSE&lt;/span&gt;&lt;/a&gt; &lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The application has been written by Michael Jeulin-Lagarrigue and Julien Finet.&lt;br /&gt;Funding for this work comes from the European Commission within the MSV project (FP7-IST-248032)&lt;br /&gt;Different spatial scales (Challenge #Ch1), heterogeneous data type (Challenge #Ch5) and time varying issues(Challenge #Ch9) are handled by the application.&lt;br /&gt;It uses Electro-physiological dataset structured as the following: &lt;/p&gt;
-&lt;ul style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;CartoDataFolder/CartoPoints: collection of .vtk files describing sparse 3D points localized on the heart surface for each time step. &lt;/li&gt;
-&lt;li style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;CartoDataFolder/CartoSignals: collection of .csv files corresponding to the entire HAI of a subset of points with each parameter being I, II, III, AvR, AvL, AvF, V1, V2, V3, V4, V5 and V6 derivations. &lt;/li&gt;&lt;/ul&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;It makes the usage of the new VTK pipeline architecture and its temporal pipeline extensions through new modules and widgets added in MSVTK. It also shows and implements the vtkButtons and vtkCharts widgets. &lt;/p&gt;
-&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The VTK (&amp;gt;5.0) pipeline architecture is needed in order to have time support. Utility classes have been added to MSVTK to ease the use of time in VTK. vtkButtons and vtkCharts widgets are also demo-ed. &lt;br /&gt;Time is represented differently depending on the data type: 3D point clouds are displayed in the VTK render window and animated depending on the HAI coupled time, while the HAIs are represented in a separate VTK chart view(s) as static representations. &lt;br /&gt;3D points for which HAI measurements are recorded are clickable through vtkButtons. vtkButtons are displayed in the VTK render window as cube and linked to the point cloud. Buttons are the connection between the 3D points and the HAI. They are used to display the HAI chart corresponding to the clicked point. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;MSVTK Library&lt;br /&gt;Copyright (c) Kitware Inc. &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;VTK &lt;/span&gt;&lt;a href=&quot;http://www.vtk.org/copyright.php&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.vtk.org/copyright.php&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt; &lt;br /&gt;CTK &lt;/span&gt;&lt;a href=&quot;https://github.com/commontk/CTK/blob/master/LICENSE&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt; text-decoration: underline; color:#0000ff;&quot;&gt;https://github.com/commontk/CTK/blob/master/LICENSE&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt; &lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:11pt;&quot;&gt;The application has been written by Julien Finet and Michael Jeulin-Lagarrigue.&lt;br /&gt;Funding for this work comes from the European Commission within the MSV project (FP7-IST-248032)&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
     </widget>
    </item>
@@ -70,6 +66,7 @@ p, li { white-space: pre-wrap; }
  </widget>
  <resources>
   <include location="../msvQHAI.qrc"/>
+  <include location="../msvQHAI.qrc"/>
  </resources>
  <connections>
   <connection>

Applications/HAI/Testing/CMakeLists.txt

@@ -1 +1,21 @@
+###########################################################################
+#
+#  Library: MSVTK
+#
+#  Copyright (c) Kitware Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+###########################################################################
+
 #add_subdirectory(Cpp)

Applications/HAI/Testing/Cpp/CMakeLists.txt

@@ -1,34 +1,44 @@
-set(KIT ECG)
+###########################################################################
+#
+#  Library: MSVTK
+#
+#  Copyright (c) Kitware Inc.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0.txt
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+###########################################################################
+
+set(KIT HAI)
 set(KIT_TEST_SRCS
-  ecgTest1.cxx
-  msvQECGMainWindowTest1.cxx
-  msvVTKECGButtonsManagerTest1.cxx
+  haiTest1.cxx
+  msvQHAIMainWindowTest1.cxx
   )
 
-create_test_sourcelist(Tests ${KIT}CxxTests.cxx
+create_test_sourcelist(Tests msv${KIT}CxxTests.cxx
   ${KIT_TEST_SRCS}
   )
 
 set(LIBRARY_NAME msv${KIT})
 
-add_executable(${KIT}CxxTests ${Tests})
-target_link_libraries(${KIT}CxxTests ${LIBRARY_NAME})
-
-macro(SIMPLE_TEST TESTNAME)
-  add_test(NAME ${TESTNAME} COMMAND $<TARGET_FILE:${KIT}CxxTests>
-    ${TESTNAME}
-    ${ARGN})
-endmacro()
+add_executable(msv${KIT}CxxTests ${Tests})
+target_link_libraries(msv${KIT}CxxTests ${LIBRARY_NAME})
 
 #
 # Add Tests
 #
 
-add_test(
-  NAME ecgTest1
-  COMMAND $<TARGET_FILE:${KIT}CxxTests> ecgTest1
-  --ecg $<TARGET_FILE_DIR:${KIT}CxxTests>
-)
-
-SIMPLE_TEST( msvQECGMainWindowTest1 )
-SIMPLE_TEST( msvVTKECGButtonsManagerTest1 )
+msv_test(ecgTest1
+  $<TARGET_FILE:msv${KIT}CxxTests> ecgTest1
+    --ecg $<TARGET_FILE_DIR:msv${KIT}CxxTests>
+  )
+simple_test( msvQHAIMainWindowTest1 )

Applications/HAI/Testing/Cpp/haiTest1.cxx

@@ -1,6 +1,6 @@
 /*==============================================================================
 
-  Program: MSVECG
+  Library: MSVTK
 
   Copyright (c) Kitware Inc.
 
@@ -18,7 +18,7 @@
 
 ==============================================================================*/
 
-// QT includes
+// Qt includes
 #include <QCoreApplication>
 #include <QProcess>
 
@@ -27,11 +27,11 @@
 #include <iostream>
 
 // -----------------------------------------------------------------------------
-int ecgTest1(int argc, char * argv[])
+int haiTest1(int argc, char * argv[])
 {
   QCoreApplication app(argc, argv);
   QString path = (argc > 2) ? ("\"" + QString(argv[2]) + "/") : "";
-  QString command = QString(path + "ecg\"");
+  QString command = QString(path + "hai\"");
   QProcess process;
   process.start(command);
   bool res = process.waitForStarted();

Applications/HAI/Testing/Cpp/msvQHAIMainWindowTest1.cxx

@@ -22,18 +22,18 @@
 #include <QApplication>
 #include <QTimer>
 
-// ECG includes
-#include "msvQECGMainWindow.h"
+// HAI includes
+#include "msvQHAIMainWindow.h"
 
 // STD includes
 #include <cstdlib>
 
 // -----------------------------------------------------------------------------
-int msvQECGMainWindowTest1(int argc, char * argv[] )
+int msvQHAIMainWindowTest1(int argc, char * argv[] )
 {
   QApplication app(argc, argv);
 
-  msvQECGMainWindow mainWindow;
+  msvQHAIMainWindow mainWindow;
   mainWindow.show();
 
   // Wait until the end of the player

CMakeLists.txt

@@ -350,10 +350,7 @@ option(MSVTK_USE_KWSTYLE     "Enable sourcecode-based style tests." OFF)
 # Will contain a list of sub-directory without option ON or OFF
 #
 set(MSVTK_PLUGINS_SUBDIRS )
-set(MSVTK_APPLICATIONS_SUBDIRS
-  ECG
-  HAI
-)
+set(MSVTK_APPLICATIONS_SUBDIRS )
 
 option(MSVTK_APP_ECG "ECG application to demonstrate vtkButtons" ON)
 option(MSVTK_APP_HAI "HAI application to demonstrate vtkPipeline architecture and composite data set" ON)