From c1ffc601d63617c6710a8d2d3ac7ab0b1003a22d Mon Sep 17 00:00:00 2001 From: Iordan Iordanov Date: Wed, 10 Feb 2016 04:09:34 +0100 Subject: [PATCH] Modifications regarding AUTOUIC in CMakeFiles.txt --- .../Hyperbolic_triangulation_2/CMakeLists.txt | 3 +- ...perbolic_Delaunay_triangulation_2_demo.cpp | 2 +- .../Hyperbolic_Dirichlet_region_2_demo.cpp | 2 +- ...launay_hyperbolic_triangulation_2_demo.cpp | 2 +- .../ui/Hyperbolic_translations_2.ui | 427 ------------------ 5 files changed, 5 insertions(+), 431 deletions(-) delete mode 100644 Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/ui/Hyperbolic_translations_2.ui diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt index 6da4bbad157..8a0c9e64478 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt @@ -8,6 +8,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed. set(CMAKE_AUTOMOC ON) +SET(CMAKE_AUTOUIC ON) cmake_minimum_required(VERSION 2.8.11) if(POLICY CMP0043) @@ -19,7 +20,7 @@ include(${CGAL_USE_FILE}) find_package(Qt5 QUIET COMPONENTS Widgets) -include_directories (BEFORE ../../include include ui) +include_directories (BEFORE ../../include include) # ui files, created with Qt Designer qt5_wrap_ui( uis Hyperbolic_translations_2.ui ) diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Hyperbolic_Delaunay_triangulation_2_demo.cpp b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Hyperbolic_Delaunay_triangulation_2_demo.cpp index a325b47d95c..1bbce32e915 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Hyperbolic_Delaunay_triangulation_2_demo.cpp +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Hyperbolic_Delaunay_triangulation_2_demo.cpp @@ -34,7 +34,7 @@ #include // the two base classes -#include "ui_Delaunay_triangulation_2.h" +#include "ui_Hyperbolic_translations_2.h" #include typedef CGAL::Exact_predicates_exact_constructions_kernel R; diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Hyperbolic_Dirichlet_region_2_demo.cpp b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Hyperbolic_Dirichlet_region_2_demo.cpp index 08ce40e9a3b..a918085dead 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Hyperbolic_Dirichlet_region_2_demo.cpp +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Hyperbolic_Dirichlet_region_2_demo.cpp @@ -51,7 +51,7 @@ #include // the two base classes -#include "ui_Delaunay_triangulation_2.h" +#include "ui_Hyperbolic_translations_2.h" #include diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Periodic_2_Delaunay_hyperbolic_triangulation_2_demo.cpp b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Periodic_2_Delaunay_hyperbolic_triangulation_2_demo.cpp index d3363d4d2aa..73dd66dbf46 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Periodic_2_Delaunay_hyperbolic_triangulation_2_demo.cpp +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/Periodic_2_Delaunay_hyperbolic_triangulation_2_demo.cpp @@ -35,7 +35,7 @@ #include // the two base classes -#include "ui_Delaunay_triangulation_2.h" +#include "ui_Hyperbolic_translations_2.h" #include typedef CGAL::Exact_predicates_inexact_constructions_kernel R; diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/ui/Hyperbolic_translations_2.ui b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/ui/Hyperbolic_translations_2.ui deleted file mode 100644 index c968c78abbb..00000000000 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/ui/Hyperbolic_translations_2.ui +++ /dev/null @@ -1,427 +0,0 @@ - - - GeometryFactory - Delaunay_triangulation_2 - - - - 0 - 0 - 800 - 600 - - - - CGAL Delaunay Triangulation - - - - :/cgal/logos/cgal_icon:/cgal/logos/cgal_icon - - - - - - - Qt::StrongFocus - - - Qt::ScrollBarAlwaysOn - - - Qt::ScrollBarAlwaysOn - - - QGraphicsView::NoAnchor - - - - - - - - - File Tools - - - TopToolBarArea - - - false - - - - - - - - Visualization Tools - - - TopToolBarArea - - - false - - - - - - - - - - - - - - - - - - - 0 - 0 - 800 - 22 - - - - - &File - - - - - - - - - - - &Edit - - - - - - &Tools - - - - - - - - - - - - - - - - - - - - - - - - - - - &About - - - - - About &CGAL - - - - - &Quit - - - Ctrl+Q - - - - - &Insert random points - - - Ctrl+I - - - - - true - - - - :/cgal/Actions/icons/moving_point.png:/cgal/Actions/icons/moving_point.png - - - &Simulate insertion - - - Simulate Insertion - - - Move mouse with left button pressed to see where point would be inserted - - - whats this - - - - - true - - - false - - - - :/cgal/Input/inputPoint.png:/cgal/Input/inputPoint.png - - - &Insert Point - - - Insert Point - - - Left: Insert vtx - - - - - - :/cgal/fileToolbar/fileNew.png:/cgal/fileToolbar/fileNew.png - - - &Clear - - - Ctrl+C - - - - - true - - - false - - - - :/cgal/Triangulation_2/Voronoi_diagram_2.png:/cgal/Triangulation_2/Voronoi_diagram_2.png - - - Show &Voronoi Diagram - - - Ctrl+V - - - - - true - - - - :/cgal/Actions/icons/triangulation.png:/cgal/Actions/icons/triangulation.png - - - Show &Delaunay Triangulation - - - Ctrl+D - - - - - - :/cgal/fileToolbar/fileOpen.png:/cgal/fileToolbar/fileOpen.png - - - &Load Points... - - - Ctrl+L - - - - - - :/cgal/fileToolbar/fileSave.png:/cgal/fileToolbar/fileSave.png - - - &Save Points... - - - Ctrl+S - - - - - true - - - - :/cgal/Actions/icons/circumcenter.png:/cgal/Actions/icons/circumcenter.png - - - &Circumcenter - - - Draw circumcenter - - - - - - :/cgal/Input/zoom-best-fit:/cgal/Input/zoom-best-fit - - - Re&center the viewport - - - Ctrl+R - - - - - true - - - - :/cgal/Actions/icons/conflict_zone.png:/cgal/Actions/icons/conflict_zone.png - - - Show Conflict Zone - - - - - true - - - - :/cgal/Actions/icons/a.png:/cgal/Actions/icons/a.png - - - Do translation "a" - - - - - true - - - - :/cgal/Actions/icons/b.png:/cgal/Actions/icons/b.png - - - Do translation "b" - - - - - true - - - - :/cgal/Actions/icons/c.png:/cgal/Actions/icons/c.png - - - Do translation "c" - - - - - true - - - - :/cgal/Actions/icons/d.png:/cgal/Actions/icons/d.png - - - Do translation "d" - - - - - true - - - - :/cgal/Actions/icons/G.png:/cgal/Actions/icons/G.png - - - G - - - - - true - - - - :/cgal/Actions/icons/G2.png:/cgal/Actions/icons/G2.png - - - G2 - - - - - true - - - - :/cgal/Actions/icons/G4.png:/cgal/Actions/icons/G4.png - - - G4 - - - - - true - - - - :/cgal/Actions/icons/G8.png:/cgal/Actions/icons/G8.png - - - G8 - - - - - true - - - - :/cgal/Actions/icons/G16.png:/cgal/Actions/icons/G16.png - - - G16 - - - - - - - - - - - - -