From a2bac9eeaa26468427e53291ed1bf8eff04b8ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=BCller?= <j.mueller@vr.rwth-aachen.de> Date: Fri, 7 Sep 2018 04:33:35 -0700 Subject: [PATCH] Add readme for Demo Installation --- conanfile.py | 1 - demos/QVTK-Demo/CMakeLists.txt | 2 +- demos/QVTK-Demo/Readme.txt | 36 +++++++++++++++++++++++++ demos/QVTK-Demo/qvtk-app/CMakeLists.txt | 10 +++---- 4 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 demos/QVTK-Demo/Readme.txt diff --git a/conanfile.py b/conanfile.py index 8118356..351bf6a 100644 --- a/conanfile.py +++ b/conanfile.py @@ -28,7 +28,6 @@ class nest(ConanFile): requires = (("contra/18.07@RWTH-VR/develop"), ("nesci/18.07@RWTH-VR/develop"), - # ("Qt/5.11.1@bincrafters/stable"), ("conduit/0.3.1@RWTH-VR/thirdparty")) generators = "cmake" diff --git a/demos/QVTK-Demo/CMakeLists.txt b/demos/QVTK-Demo/CMakeLists.txt index 64ab48d..492be44 100644 --- a/demos/QVTK-Demo/CMakeLists.txt +++ b/demos/QVTK-Demo/CMakeLists.txt @@ -1,7 +1,7 @@ #------------------------------------------------------------------------------- # QVTK-Demo # -# Copyright (c) 2018 RWTH Aachen University, Germany, +# Copyright (c) 2017-2018 RWTH Aachen University, Germany, # Virtual Reality & Immersive Visualization Group. #------------------------------------------------------------------------------- # License diff --git a/demos/QVTK-Demo/Readme.txt b/demos/QVTK-Demo/Readme.txt new file mode 100644 index 0000000..8602ac1 --- /dev/null +++ b/demos/QVTK-Demo/Readme.txt @@ -0,0 +1,36 @@ +#------------------------------------------------------------------------------- +# QVTK-Demo +# +# Copyright (c) 2017-2018 RWTH Aachen University, Germany, +# Virtual Reality & Immersive Visualization Group. +#------------------------------------------------------------------------------- +# License +# +# 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 +# +# 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. +#------------------------------------------------------------------------------- + +This is a brief summary on how to get the QVTK-Demo running. + +Prerequisites: + -QT (Version 5.9 or higher is advised! -older versions might work aswell but havent been tested). + -Get this first and build it. + -The Visualization Toolkit(VTK) (The demo was originally build with version 8.0.1. Newer versions should work too but havent been tested). + -Ŵhen building VTK with CMake make sure you enable VTK_BUILD_QT_DESIGNER_PLUGIN, VTK_Group_Qt and set VTK_QT_VERSION to 5. + +Installing: +When running CMake enable BUILD_QVTK_DEMO and BUILD_BRUNEL_SIMULATION. + +Running the Demo: +To run the Demo start both, the QVTK-Demo(qvtk-app) and the Brunel Simulation(run_sim.sh) from your build folder. + + diff --git a/demos/QVTK-Demo/qvtk-app/CMakeLists.txt b/demos/QVTK-Demo/qvtk-app/CMakeLists.txt index 00d7cbc..aa8b8c9 100644 --- a/demos/QVTK-Demo/qvtk-app/CMakeLists.txt +++ b/demos/QVTK-Demo/qvtk-app/CMakeLists.txt @@ -44,11 +44,11 @@ target_include_directories( ${CMAKE_BINARY_DIR} ) -#add_test_cpplint(NAME "qt_app--cpplint" -# ${QP_APP_SOURCES} -# ${QP_APP_HEADERS} -# ${QP_APP_API_HEADERS} -# ${QP_APP_SUPPRESS_WARNING_HEADERS} +#add_test_cpplint(NAME "qvtk_app--cpplint" +# ${QVTK_APP_SOURCES} +# ${QVTK_APP_HEADERS} +# ${QVTK_APP_API_HEADERS} +# ${QVTK_APP_SUPPRESS_WARNING_HEADERS} #) set_warning_levels_RWTH(qvtk_app -- GitLab