From 67405ffbcb881915f7272cabf8fc7a9757d5fbb4 Mon Sep 17 00:00:00 2001 From: Efi Fogel Date: Wed, 30 Aug 2023 16:15:11 +0300 Subject: [PATCH] Removed obsolete demo 'globus' --- .../demo/globus/CMakeLists.txt | 107 ---- .../demo/globus/CombinedUtils.cpp | 0 .../demo/globus/Globus.qrc | 18 - .../demo/globus/Globus_window.cpp | 166 ------ .../demo/globus/Globus_window.h | 59 --- .../demo/globus/Globus_window.ui | 152 ------ .../globus/cmake/modules/FindFileGDBAPI.cmake | 84 --- .../demo/globus/globus.cpp | 490 ------------------ .../demo/globus/resources/about.html | 10 - .../globus/resources/icons/arrow_down.xpm | 42 -- .../demo/globus/resources/icons/arrow_up.xpm | 42 -- .../demo/globus/resources/icons/blue_icon.xpm | 23 - .../demo/globus/resources/icons/colors.xpm | 51 -- .../demo/globus/resources/icons/delete.bmp | Bin 630 -> 0 bytes .../demo/globus/resources/icons/delete.xpm | 45 -- .../demo/globus/resources/icons/draw.xpm | 76 --- .../globus/resources/icons/green_icon.xpm | 23 - .../demo/globus/resources/icons/hand.xpm | 43 -- .../demo/globus/resources/icons/none.xpm | 44 -- .../demo/globus/resources/icons/pink_icon.xpm | 23 - .../demo/globus/resources/icons/red_icon.xpm | 23 - .../globus/resources/icons/yellow_icon.xpm | 23 - .../demo/globus/resources/icons/zoomin.bmp | Bin 630 -> 0 bytes .../demo/globus/resources/icons/zoomin.xpm | 47 -- .../demo/globus/resources/icons/zoomout.bmp | Bin 630 -> 0 bytes .../demo/globus/resources/icons/zoomout.xpm | 47 -- .../demo/globus/resources/icons/zoomreset.xpm | 47 -- 27 files changed, 1685 deletions(-) delete mode 100644 Arrangement_on_surface_2/demo/globus/CMakeLists.txt delete mode 100644 Arrangement_on_surface_2/demo/globus/CombinedUtils.cpp delete mode 100644 Arrangement_on_surface_2/demo/globus/Globus.qrc delete mode 100644 Arrangement_on_surface_2/demo/globus/Globus_window.cpp delete mode 100644 Arrangement_on_surface_2/demo/globus/Globus_window.h delete mode 100644 Arrangement_on_surface_2/demo/globus/Globus_window.ui delete mode 100755 Arrangement_on_surface_2/demo/globus/cmake/modules/FindFileGDBAPI.cmake delete mode 100644 Arrangement_on_surface_2/demo/globus/globus.cpp delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/about.html delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/arrow_down.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/arrow_up.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/blue_icon.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/colors.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/delete.bmp delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/delete.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/draw.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/green_icon.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/hand.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/none.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/pink_icon.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/red_icon.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/yellow_icon.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/zoomin.bmp delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/zoomin.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/zoomout.bmp delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/zoomout.xpm delete mode 100644 Arrangement_on_surface_2/demo/globus/resources/icons/zoomreset.xpm diff --git a/Arrangement_on_surface_2/demo/globus/CMakeLists.txt b/Arrangement_on_surface_2/demo/globus/CMakeLists.txt deleted file mode 100644 index 0cf12dfef430..000000000000 --- a/Arrangement_on_surface_2/demo/globus/CMakeLists.txt +++ /dev/null @@ -1,107 +0,0 @@ -# This is the CMake script for compiling a CGAL application. - -cmake_minimum_required(VERSION 3.1...3.23) -project(Globus_demo) - -if(NOT POLICY CMP0070 AND POLICY CMP0053) - # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning. - cmake_policy(SET CMP0053 OLD) -endif() - -if(POLICY CMP0071) - cmake_policy(SET CMP0071 NEW) -endif() - -# General -set(GLOBUS_MODULES_REL_DIR cmake/modules) -set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/${GLOBUS_MODULES_REL_DIR}) - -find_package(CGAL QUIET COMPONENTS Qt5 OPTIONAL_COMPONENTS Core) -find_package(Qt5 QUIET COMPONENTS Gui Widgets) -# find_package(FileGDBAPI REQUIRED) - -################################################################################ -include(FetchContent) -FetchContent_Declare(json URL https://github.com/nlohmann/json/releases/download/v3.11.2/json.tar.xz) -FetchContent_MakeAvailable(json) -# find_package(nlohmann_json 3.2.0 REQUIRED) -################################################################################ - -if (CGAL_FOUND AND CGAL_Qt5_FOUND AND Qt5_FOUND) - include(${CGAL_USE_FILE}) - add_compile_definitions(QT_NO_KEYWORDS) - include_directories( BEFORE ./ ) - # include_directories(${FileGDBAPI_INCLUDE_DIR}) - - # Arrangement package includes - add_definitions(-DQT_NO_KEYWORDS) - option(COMPILE_UTILS_INCREMENTALLY - "Compile files in Utils directory incrementally, or compile them all as a unit. \ - Incremental compilation will be better for development and consume less \ - memory while compiling but will take longer to compile." - OFF) - - set(UTILS_SOURCE_FILES "") - - if (COMPILE_UTILS_INCREMENTALLY) - set(UTILS_COMPILE_FILES ${UTILS_SOURCE_FILES}) - else() - set(UTILS_CPP_FILES_INCLUDES "") - foreach(utils_src IN LISTS UTILS_SOURCE_FILES) - string(APPEND UTILS_CPP_FILES_INCLUDES "#include \"${utils_src}\"\n") - endforeach() - file(WRITE "${CMAKE_BINARY_DIR}/CombinedUtils.cpp" ${UTILS_CPP_FILES_INCLUDES}) - set(UTILS_COMPILE_FILES "${CMAKE_BINARY_DIR}/CombinedUtils.cpp") - endif() - - - qt5_wrap_ui(globus_uis - Globus_window.ui) - - qt5_wrap_cpp(CGAL_Qt5_MOC_FILES - Globus_window.h) - - qt5_add_resources(CGAL_Qt5_RESOURCE_FILES Globus.qrc) - - add_executable(globus - globus.cpp - Globus_window.cpp - ${UTILS_COMPILE_FILES} - ${globus_uis} - ${CGAL_Qt5_RESOURCE_FILES} - ${CGAL_Qt5_MOC_FILES}) - - # target_link_libraries(globus ${FileGDBAPI_LIBRARY}) - # target_link_libraries(globus PUBLIC CGAL::CGAL CGAL::CGAL_Qt5) - # target_link_libraries(globus Qt5::Core Qt5::Gui Qt5::Widgets) - target_link_libraries(globus CGAL::CGAL_Basic_viewer) - target_link_libraries(globus nlohmann_json::nlohmann_json) - if(CGAL_Core_FOUND) - target_link_libraries(globus CGAL::CGAL_Core) - endif() - - add_to_cached_list(CGAL_EXECUTABLE_TARGETS globus) - - include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake) - cgal_add_compilation_test(globus) - - # set_property(TARGET globus PROPERTY INSTALL_RPATH "${FileGDBAPI_LIBRARY_DIR}") - set_property(TARGET globus PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) - - set_target_properties(globus PROPERTIES LINK_FLAGS "-Wl,--disable-new-dtags") - -else() - set(MISSING_DEPS "") - - if(NOT CGAL_FOUND) - set(MISSING_DEPS "CGAL, ${MISSING_DEPS}") - endif() - if(NOT CGAL_Qt5_FOUND) - set(MISSING_DEPS "the CGAL Qt5 library, ${MISSING_DEPS}") - endif() - if(NOT Qt5_FOUND) - set(MISSING_DEPS "Qt5, ${MISSING_DEPS}") - endif() - message(STATUS - "NOTICE: This demo requires ${MISSING_DEPS} and will not be compiled.") -endif() diff --git a/Arrangement_on_surface_2/demo/globus/CombinedUtils.cpp b/Arrangement_on_surface_2/demo/globus/CombinedUtils.cpp deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/Arrangement_on_surface_2/demo/globus/Globus.qrc b/Arrangement_on_surface_2/demo/globus/Globus.qrc deleted file mode 100644 index 217638373365..000000000000 --- a/Arrangement_on_surface_2/demo/globus/Globus.qrc +++ /dev/null @@ -1,18 +0,0 @@ - - - resources/icons/zoomin.xpm - resources/icons/zoomout.xpm - resources/icons/zoomreset.xpm - resources/icons/yellow_icon.xpm - resources/icons/red_icon.xpm - resources/icons/green_icon.xpm - resources/icons/blue_icon.xpm - resources/icons/pink_icon.xpm - resources/icons/hand.xpm - -resources/icons/delete.xpm - - - resources/about.html - - diff --git a/Arrangement_on_surface_2/demo/globus/Globus_window.cpp b/Arrangement_on_surface_2/demo/globus/Globus_window.cpp deleted file mode 100644 index e3b83a1c853f..000000000000 --- a/Arrangement_on_surface_2/demo/globus/Globus_window.cpp +++ /dev/null @@ -1,166 +0,0 @@ -// Copyright (c) 2022 Tel-Aviv University (Israel). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial -// -// Author(s): Efi Fogel - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "Globus_window.h" -#include "ui_Globus_window.h" - -//! \brief constructs -Globus_window::Globus_window(QWidget* parent) : - CGAL::Qt::DemosMainWindow(parent), ui(new Ui::Globus_window) { - this->setup_ui(); - // this->setupStatusBar(); - // this->setupOptionsMenu(); - this->addAboutDemo(":/cgal/Arrangement_on_surface_2/about.html"); - this->addAboutCGAL(); -} - -//! \brief destructs -Globus_window::~Globus_window() {} - -//! \brief -void Globus_window::setup_ui() { - this->ui->setupUi(this); - - this->mode_group = new QActionGroup(this); - this->mode_group->addAction(this->ui->action_drag); -} - -//! \brief -// void Globus_window::resetActionGroups(ArrangementDemoTab* tab, TraitsType tt) { -// this->hideInsertMethods(); -// this->ui->actionInsert->setChecked(false); -// this->ui->actionDrag->setChecked(false); -// this->ui->actionLowerEnvelope->setChecked(false); -// this->ui->actionUpperEnvelope->setChecked(false); -// this->ui->actionShowGrid->setChecked(tab->isGridVisible()); -// this->ui->actionGridSnapMode->setChecked(tab->isSnapToGridEnabled()); -// this->ui->actionArrangementSnapMode->setChecked( -// tab->isSnapToArrangementEnabled()); -// this->ui->actionLowerEnvelope->setChecked(tab->isLowerEnvelopeShown()); -// this->ui->actionUpperEnvelope->setChecked(tab->isUpperEnvelopeShown()); - -// if ( -// tt != TraitsType::SEGMENT_TRAITS && tt != TraitsType::POLYLINE_TRAITS && -// tt != TraitsType::LINEAR_TRAITS) -// this->ui->actionArrangementSnapMode->setVisible(false); -// else -// this->ui->actionArrangementSnapMode->setVisible(true); - -// // default action group is scrolling -// this->ui->actionDrag->activate(QAction::Trigger); -// } - -//! \brief -// void Globus_window::reset_callback_state(ArrangementDemoTab* tab) { -// if (tab) { -// tab->getView()->setDragMode(QGraphicsView::NoDrag); -// tab->unhookCallbacks(); -// } -// } - -//! \brief -void Globus_window::on_action_quit_triggered() { qApp->exit(); } - -//! \brief -void Globus_window::on_action_open_triggered() { - const QString filename = - QFileDialog::getOpenFileName(this, tr("Open file"), "", - "Globus files (*.gdb)"); - if (filename.isNull()) return; - - if (filename.endsWith(".gdb")) { - QMessageBox::information(this, "Oops", "Not implemented yet"); - // auto tab = this->openArrFile(filename); - // if (tab) { - // tab->setParent(this); - // this->addTab(tab, this->makeTabLabel(tab->traitsType())); - // tab->adjustViewport(); - // } - } - else { - QMessageBox::information(this, "Oops", "Unsupported file format"); - } -} - -//! \brief -void Globus_window::on_action_preferences_triggered() { - // ArrangementDemoPropertiesDialog dialog{this}; - - // if (dialog.exec() == QDialog::Accepted) { - // typedef ArrangementDemoPropertiesDialog Dialog; - // ArrangementDemoTab::Preferences pref; - - // pref.edgeColor = dialog.property(Dialog::EDGE_COLOR_KEY).value(); - // pref.edgeWidth = - // dialog.property(Dialog::EDGE_WIDTH_KEY).value(); - // pref.vertexColor = - // dialog.property(Dialog::VERTEX_COLOR_KEY).value(); - // pref.vertexRadius = - // dialog.property(Dialog::VERTEX_RADIUS_KEY).value(); - // pref.envelopeEdgeColor = - // dialog.property(Dialog::ENVELOPE_EDGE_COLOR_KEY).value(); - // pref.envelopeEdgeWidth = - // dialog.property(Dialog::ENVELOPE_EDGE_WIDTH_KEY).value(); - // pref.envelopeVertexColor = - // dialog.property(Dialog::ENVELOPE_VERTEX_COLOR_KEY).value(); - // pref.envelopeVertexRadius = - // dialog.property(Dialog::ENVELOPE_VERTEX_RADIUS_KEY).value(); - // pref.verticalRayEdgeColor = - // dialog.property(Dialog::VERTICAL_RAY_EDGE_COLOR_KEY).value(); - // pref.verticalRayEdgeWidth = - // dialog.property(Dialog::VERTICAL_RAY_EDGE_WIDTH_KEY) - // .value(); - // pref.axesColor = dialog.property(Dialog::GRID_COLOR_KEY).value(); - // pref.gridColor = pref.axesColor; - // pref.gridColor.setAlphaF(0.5); - // currentTab->updatePreferences(pref); - // } -} - -//! \brief -void Globus_window::on_action_save_as_triggered() { - QMessageBox::information(this, "Save as", "Not implemented yet"); -} - -//! \brief -void Globus_window::on_action_zoom_in_triggered() { - // QGraphicsView* view = currentTab->getView(); - // view->scale(2.0, 2.0); -} - -//! \brief -void Globus_window::on_action_zoom_out_triggered() { - // QGraphicsView* view = currentTab->getView(); - // view->scale(0.5, 0.5); -} - -//! \brief -void Globus_window::on_action_zoom_reset_triggered() { - // currentTab->adjustViewport(); -} - -void Globus_window::on_action_drag_toggled(bool checked) { - // TODO: Move this to DemoTab - // QGraphicsView* activeView = currentTab->getView(); - // if (!checked) - // activeView->setDragMode(QGraphicsView::NoDrag); - // else - // activeView->setDragMode(QGraphicsView::ScrollHandDrag); -} diff --git a/Arrangement_on_surface_2/demo/globus/Globus_window.h b/Arrangement_on_surface_2/demo/globus/Globus_window.h deleted file mode 100644 index 5670ef0f9c45..000000000000 --- a/Arrangement_on_surface_2/demo/globus/Globus_window.h +++ /dev/null @@ -1,59 +0,0 @@ -// Copyright (c) 2022 Tel-Aviv University (Israel). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial -// -// Author(s): Efi Fogel - -#ifndef GLOBUS_WINDOW_H -#define GLOBUS_WINDOW_H - -#include -#include - -#include - -#include -#include - -namespace Ui { class Globus_window; } - -namespace CGAL { -class Object; -namespace Qt { -class GraphicsViewNavigation; -} -} - -class QActionGroup; - -class Globus_window : public CGAL::Qt::DemosMainWindow { - Q_OBJECT - -public: - Globus_window(QWidget* parent = nullptr); - ~Globus_window(); - -public Q_SLOTS: - void on_action_quit_triggered(); - void on_action_open_triggered(); - void on_action_save_as_triggered(); - void on_action_preferences_triggered(); - void on_action_zoom_in_triggered(); - void on_action_zoom_out_triggered(); - void on_action_zoom_reset_triggered(); - void on_action_drag_toggled(bool); - -Q_SIGNALS: - -protected: - void setup_ui(); - -private: - Ui::Globus_window* ui; - QActionGroup* mode_group; -}; - -#endif diff --git a/Arrangement_on_surface_2/demo/globus/Globus_window.ui b/Arrangement_on_surface_2/demo/globus/Globus_window.ui deleted file mode 100644 index ea9091a857be..000000000000 --- a/Arrangement_on_surface_2/demo/globus/Globus_window.ui +++ /dev/null @@ -1,152 +0,0 @@ - - - Globus_window - - - - 0 - 0 - 946 - 600 - - - - Globus - - - - - toolBar - - - TopToolBarArea - - - false - - - - - - - - - - - 0 - 0 - 946 - 23 - - - - - &File - - - - - - - - - &Mode - - - - - - &Edit - - - - - - &Tools - - - - - - - - - - &Quit - - - - - true - - - - :/cgal/icons/hand.xpm:/cgal/icons/hand.xpm - - - Drag - - - - - &Preferences... - - - - - Save As... - - - Ctrl+S - - - - - Open... - - - Ctrl+O - - - - - - :/cgal/icons/zoomin.xpm:/cgal/icons/zoomin.xpm - - - Zoom In - - - Zoom In - - - - - - :/cgal/icons/zoomout.xpm:/cgal/icons/zoomout.xpm - - - Zoom Out - - - Zoom Out - - - - - - :/cgal/icons/zoomreset.xpm:/cgal/icons/zoomreset.xpm - - - Zoom Reset - - - Zoom Reset - - - - - - - - diff --git a/Arrangement_on_surface_2/demo/globus/cmake/modules/FindFileGDBAPI.cmake b/Arrangement_on_surface_2/demo/globus/cmake/modules/FindFileGDBAPI.cmake deleted file mode 100755 index 54358601b3a6..000000000000 --- a/Arrangement_on_surface_2/demo/globus/cmake/modules/FindFileGDBAPI.cmake +++ /dev/null @@ -1,84 +0,0 @@ -# - Try to find FileGDBAPI (FileGDBAPI.lib on Windows and v8_base.x64.a on Linux) -# Once done this will define -# FileGDBAPI_FOUND - System has FileGDBAPI -# FileGDBAPI_INCLUDE_DIR - The FileGDBAPI include directories -# FileGDBAPI_LIBRARY - The library needed to use FileGDBAPI -# FileGDBAPI_LIBRARY_DIR - The directory where lib files are. - -set(FileGDBAPI_NAMES_RELEASE FileGDBAPI) -set(FileGDBAPI_NAMES_DEBUG FileGDBAPId ${FileGDBAPI_NAMES_RELEASE}) - -find_path(FileGDBAPI_INCLUDE_DIR NAMES FileGDBAPI.h - PATH_SUFFIXES include FileGDBAPI include/FileGDBAPI - PATHS /opt/libvFileGDBAPI-$ENV{FileGDBAPI_VER} - HINTS ENV FileGDBAPI_INC_DIR ENV FileGDBAPI_DIR) - -# CMake>=2.6 supports the notation "debug XXd optimized XX" -set(FileGDBAPI_HINTS ENV FileGDBAPI_LIB_DIR ENV FileGDBAPI_DIR) -if (UNIX) - set(FileGDBAPI_HINTS_DEBUG ${FileGDBAPI_DIR}/out/x64.debug $ENV{FileGDBAPI_DIR}/out/x64.debug) - set(FileGDBAPI_HINTS_RELEASE ${FileGDBAPI_DIR}/out/x64.release $ENV{FileGDBAPI_DIR}/out/x64.release) - set(FileGDBAPI_PATHS /opt/libFileGDBAPI-$ENV{FileGDBAPI_VER}) -elseif(WIN32) - set(FileGDBAPI_HINTS_DEBUG ${FileGDBAPI_DIR}/build/Debug $ENV{FileGDBAPI_DIR}/build/Debug) - set(FileGDBAPI_HINTS_RELEASE ${FileGDBAPI_DIR}/out/build/Release $ENV{FileGDBAPI_DIR}/build/Release) -else() -endif() - -find_library(FileGDBAPI_LIBRARY_RELEASE - NAMES ${FileGDBAPI_NAMES_RELEASE} - PATH_SUFFIXES lib - HINTS ${FileGDBAPI_HINTS} ${FileGDBAPI_HINTS_RELEASE} - PATHS ${FileGDBAPI_PATHS} - DOC "Google FileGDBAPI JavaScript Engine Library (Release)") - -find_library(FileGDBAPI_LIBRARY_DEBUG - NAMES ${FileGDBAPI_NAMES_DEBUG} - PATH_SUFFIXES lib - HINTS ${FileGDBAPI_HINTS} ${FileGDBAPI_HINTS_DEBUG} - PATHS ${FileGDBAPI_PATHS} - DOC "Google FileGDBAPI JavaScript Engine Library (Debug)") - -if(CMAKE_BUILD_TYPE EQUAL "Release") - get_filename_component(FileGDBAPI_LIBRARY_DIR ${FileGDBAPI_LIBRARY_RELEASE} PATH) - set(FileGDBAPI_LIBRARY ${FileGDBAPI_LIBRARY_RELEASE}) -else() - get_filename_component(FileGDBAPI_LIBRARY_DIR ${FileGDBAPI_LIBRARY_DEBUG} PATH) - set(FileGDBAPI_LIBRARY_DEBUG ${FileGDBAPI_LIBRARY_RELEASE}) -endif() - -set(FileGDBAPI_LIBRARY - optimized ${FileGDBAPI_LIBRARY_RELEASE} debug ${FileGDBAPI_LIBRARY_DEBUG}) - -include(FindPackageHandleStandardArgs) - -# handle the QUIETLY and REQUIRED arguments and set FileGDBAPI_FOUND to TRUE -# if all listed variables are TRUE -find_package_handle_standard_args(FileGDBAPI DEFAULT_MSG - FileGDBAPI_LIBRARY - FileGDBAPI_INCLUDE_DIR) - -# Detect FileGDBAPI version -set(FileGDBAPI_VERSION_MAJOR "1") -set(FileGDBAPI_VERSION_MINOR "5") -set(FileGDBAPI_VERSION_PATCH "2") -set(FileGDBAPI_VERSION_TWEAK "") -set(FileGDBAPI_VERSION "${FileGDBAPI_VERSION_MAJOR}.${FileGDBAPI_VERSION_MINOR}.${FileGDBAPI_VERSION_PATCH}.${FileGDBAPI_VERSION_TWEAK}") - -set(FileGDBAPI_VERSION_HEX 0x0${FileGDBAPI_VERSION_MAJOR}${FileGDBAPI_VERSION_MINOR}${FileGDBAPI_VERSION_PATCH}${FileGDBAPI_VERSION_TWEAK}) -string(LENGTH "${FileGDBAPI_VERSION_HEX}" FileGDBAPI_VERSION_HEX_LENGTH) - -while(FileGDBAPI_VERSION_HEX_LENGTH LESS 8) - set(FileGDBAPI_VERSION_HEX "${FileGDBAPI_VERSION_HEX}0") - string(LENGTH "${FileGDBAPI_VERSION_HEX}" FileGDBAPI_VERSION_HEX_LENGTH) -endwhile() - -mark_as_advanced(FileGDBAPI_INCLUDE_DIR FileGDBAPI_LIBRARY FileGDBAPI_LIBRARY_DIR) - -if(FileGDBAPI_CMAKE_DEBUG) - message(STATUS "FileGDBAPI_INCLUDE_DIR: ${FileGDBAPI_INCLUDE_DIR}") - message(STATUS "FileGDBAPI_LIBRARY: ${FileGDBAPI_LIBRARY}") - message(STATUS "FileGDBAPI_LIBRARY_DEPENDS: ${FileGDBAPI_LIBRARY_DEPENDS}") - message(STATUS "FileGDBAPI_VERSION: ${FileGDBAPI_VERSION}") - message(STATUS "FileGDBAPI_VERSION_HEX: ${FileGDBAPI_VERSION_HEX}") -endif() diff --git a/Arrangement_on_surface_2/demo/globus/globus.cpp b/Arrangement_on_surface_2/demo/globus/globus.cpp deleted file mode 100644 index 722e2d5eb6ab..000000000000 --- a/Arrangement_on_surface_2/demo/globus/globus.cpp +++ /dev/null @@ -1,490 +0,0 @@ -// Copyright (c) 2022, 2020 Tel-Aviv University (Israel). -// All rights reserved. -// -// This file is part of CGAL (www.cgal.org). -// -// $URL$ -// $Id$ -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-Commercial -// -// Author(s): Efi Fogel - -#include -#include - -#include - -// #include -#include - -#include -#include -#include -#include -#include -#include -#include - -#include "Globus_window.h" - -enum Error_id { - FILE_NOT_FOUND, - ILLEGAL_EXTENSION, - UNABLE_TO_OPEN, - FILE_IS_EMPTY, - INVALID_INITIAL_POLYGON, - UNSUPPORTED, - INVALID_OUTPUT_FILE, - ILLEGAL_SOLUTION_FILE -}; - -struct Illegal_input : public std::logic_error { - Illegal_input(Error_id /* err */, const std::string &msg, - const std::string &filename) : - std::logic_error(std::string(msg).append(" (").append(filename). - append(")!")) - {} - - Illegal_input(Error_id /* err */, const std::string &msg) : - std::logic_error(std::string(msg).append("!")) - {} -}; - -struct Input_file_missing_error : public std::logic_error { - Input_file_missing_error(std::string &str) : std::logic_error(str) {} -}; - -// -struct country { - //! Constructor - country(std::string& name) : - m_name(std::move(name)) - {} - - std::string m_name; -}; - -// namespace FGA = FileGDBAPI; - -#if 0 -/*! - */ -int load_countries(std::vector& countries) { - // Open the geodatabase and the table. - fgdbError hr; - FGA::Geodatabase geodatabase; - hr = FGA::OpenGeodatabase(L"/home/efif/tmp/esri/19113835-45b5-40b9-989b-fd04aad324da.gdb", geodatabase); - if (hr != S_OK) return hr; - - // std::vector types; - // hr = geodatabase.GetDatasetTypes(types); - // if (hr != S_OK) return hr; - // std::cout << "Types:\n"; - // for (const auto& type : types) - // std::wcout << type << std::endl; - - FGA::Table table; - hr = geodatabase.OpenTable(L"World_Countries", table); - if (hr != S_OK) { - std::cerr << "Cannot open table!\n"; - return hr; - } - - // std::string doc; - // hr = table.GetDocumentation(doc); - // if (hr != S_OK) return hr; - // std::cout << "Table Information:\n"; - // std::cout << doc << std::endl; - - // FGA::fieldDefs field_defs; - // hr = table.GetFields(fields_defs); - // if (hr != S_OK) return hr; - // std::cout << "Fields:\n"; - // for (const auto& field : Fields) - // std::wcout << field << std::endl; - FGA::FieldInfo field_info; - hr = table.GetFieldInformation(field_info); - if (hr != S_OK) return hr; - int count; - hr = field_info.GetFieldCount(count); - std::cout << "Number of fileds: " << count << std::endl; - for (auto i = 0; i < count; ++i) { - std::wstring name; - hr = field_info.GetFieldName(i, name); - if (hr != S_OK) return hr; - std::wcout << "Name: " << name << std::endl; - } - - FGA::Envelope envelope; - FGA::EnumRows rows; - hr = table.Search(L"SHAPE, COUNTRY", L"", envelope, true, rows); - if (hr != S_OK) { - std::cerr << "Cannot find rows!\n"; - return hr; - } - - countries.clear(); - FGA::Row row; - while (rows.Next(row) == S_OK) { - std::wstring name; - row.GetString(L"COUNTRY", name); - std::string simple_name; - simple_name.assign(name.begin(), name.end()); - countries.emplace_back(simple_name); - } - - // Close the table - hr = geodatabase.CloseTable(table); - if (hr != S_OK) { - std::wcout << "An error occurred while closing Cities." << endl; - std::wcout << "Error code: " << hr << endl; - return -1; - } - - // Close the geodatabase - hr = FGA::CloseGeodatabase(geodatabase); - if (hr != S_OK) { - std::wcout << "An error occurred while closing the geodatabase." << endl; - std::wcout << "Error code: " << hr << endl; - return -1; - } - - return 0; -} -#endif - -/*! Read a json file. - */ -bool read_json(const std::string& filename, nlohmann::json& data) { - using json = nlohmann::json; - std::ifstream infile(filename); - if (! infile.is_open()) { - throw Illegal_input(UNABLE_TO_OPEN, "Cannot open file", filename); - return false; - } - data = json::parse(infile); - infile.close(); - if (data.empty()) { - throw Illegal_input(FILE_IS_EMPTY, "File is empty", filename); - return false; - } - return true; -} - -template -FT to_ft(const nlohmann::json& js_ft) { - using Exact_type = typename FT::Exact_type; - const std::string& js_num = js_ft["num"]; - const std::string& js_den = js_ft["den"]; - std::string str = js_num + "/" + js_den; - Exact_type eft(str); - return FT(eft); -} - -template -bool read_arrangement(const std::string& filename, Arrangement_& arr, - const Kernel_& kernel) { - using Arrangement = Arrangement_; - using Kernel = Kernel_; - - using json = nlohmann::json; - json data; - auto rc = read_json(filename, data); - if (! rc) return false; - - // points - auto it = data.find("points"); - if (it == data.end()) { - std::cerr << "The points item is missing " << " (" << filename << ")\n"; - return false; - } - const auto& js_points = it.value(); - - // curves - it = data.find("curves"); - if (it == data.end()) { - std::cerr << "The curves item is missing " << " (" << filename << ")\n"; - return false; - } - const auto& js_curves = it.value(); - - // vertices - it = data.find("vertices"); - if (it == data.end()) { - std::cerr << "The vertices item is missing " << " (" << filename << ")\n"; - return false; - } - const auto& js_vertices = it.value(); - - // edges - it = data.find("edges"); - if (it == data.end()) { - std::cerr << "The edges item is missing " << " (" << filename << ")\n"; - return false; - } - const auto& js_edges = it.value(); - - // faces - it = data.find("faces"); - if (it == data.end()) { - std::cerr << "The faces item is missing " << " (" << filename << ")\n"; - return false; - } - const auto& js_faces = it.value(); - - const std::size_t num_points = js_points.size(); - const std::size_t num_curves = js_curves.size(); - const std::size_t num_vertices = js_vertices.size(); - const std::size_t num_edges = js_edges.size(); - const std::size_t num_faces = js_faces.size(); - const std::size_t num_halfedges = num_edges * 2; - - if (num_points < num_vertices) { - std::cerr << "The no. of points (" << num_points - << ") is smaller than the no. of vertices (" << num_vertices - << ")\n"; - return false; - } - - if (num_curves < num_edges) { - std::cerr << "The no. of curves (" << num_curves - << ") is smaller than the no. of edge (" << num_edges << ")\n"; - return false; - } - - std::cout << "# points: " << num_points<< std::endl; - std::cout << "# curves: " << num_curves<< std::endl; - std::cout << "# vertices: " << num_vertices << std::endl; - std::cout << "# halfedges: " << num_halfedges << std::endl; - std::cout << "# faces: " << num_faces << std::endl; - - using Point = typename Arrangement::Point_2; - using X_monotone_curve = typename Arrangement::X_monotone_curve_2; - using FT = typename Kernel::FT; - using Exact_type = typename FT::Exact_type; - - std::vector points; - points.reserve(num_points); - for (const auto& js_pnt : js_points) { - using Direction_3 = typename Kernel::Direction_3; - using Location = typename Point::Location_type; - auto location = static_cast(js_pnt["location"]); - auto dx = to_ft(js_pnt["dx"]); - auto dy = to_ft(js_pnt["dy"]); - auto dz = to_ft(js_pnt["dz"]); - Direction_3 dir(dx, dy, dz); - Point pnt(dir, location); - points.push_back(pnt); - } - - std::vector xcurves; - xcurves.reserve(num_curves); - for (const auto& js_xcv : js_curves) { - using Direction_3 = typename Kernel::Direction_3; - std::size_t src_id = js_xcv["source"]; - std::size_t trg_id = js_xcv["target"]; - const auto& js_normal = js_xcv["normal"]; - auto dx = to_ft(js_normal["dx"]); - auto dy = to_ft(js_normal["dy"]); - auto dz = to_ft(js_normal["dz"]); - Direction_3 normal(dx, dy, dz); - bool is_vert = js_xcv["is_vertical"]; - bool is_directed_right = js_xcv["is_directed_right"]; - bool is_full = js_xcv["is_full"]; - const auto& src = points[src_id]; - const auto& trg = points[trg_id]; - X_monotone_curve xcv(src, trg, normal, is_vert, is_directed_right, is_full); - xcurves.push_back(xcv); - } - - using Arr_accessor = CGAL::Arr_accessor; - Arr_accessor arr_access(arr); - arr_access.clear_all(); - - // Vertices - using DVertex = typename Arr_accessor::Dcel_vertex; - std::vector vertices(num_vertices); - size_t k = 0; - for (const auto& js_vertex : js_vertices) { - std::size_t point_id = js_vertex["point"]; - const auto& point = points[point_id]; - CGAL::Arr_parameter_space ps_x, ps_y; - switch (point.location()) { - case Point::NO_BOUNDARY_LOC: ps_x = ps_y = CGAL::INTERIOR; break; - case Point::MIN_BOUNDARY_LOC: - ps_x = CGAL::INTERIOR; - ps_y = CGAL::ARR_BOTTOM_BOUNDARY; - break; - case Point::MID_BOUNDARY_LOC: - ps_x = CGAL::LEFT_BOUNDARY; - ps_y = CGAL::INTERIOR; - break; - case Point::MAX_BOUNDARY_LOC: - ps_x = CGAL::INTERIOR; - ps_y = CGAL::ARR_TOP_BOUNDARY; - break; - } - vertices[k++] = arr_access.new_vertex(&point, ps_x, ps_y); - } - - // Halfedges - using DHalfedge = typename Arr_accessor::Dcel_halfedge; - std::vector halfedges(num_halfedges); - k = 0; - for (const auto& js_edge : js_edges) { - std::size_t source_id = js_edge["source"]; - std::size_t target_id = js_edge["target"]; - std::size_t curve_id = js_edge["curve"]; - int direction = js_edge["direction"]; - DVertex* src_v = vertices[source_id]; - DVertex* trg_v = vertices[target_id]; - const auto& curve = xcurves[curve_id]; - DHalfedge* new_he = arr_access.new_edge(&curve); - trg_v->set_halfedge(new_he); - new_he->set_vertex(trg_v); - src_v->set_halfedge(new_he->opposite()); - new_he->opposite()->set_vertex(src_v); - new_he->set_direction(static_cast(direction)); - halfedges[k++] = new_he; - halfedges[k++] = new_he->opposite(); - } - - // Faces - using DFace = typename Arr_accessor::Dcel_face; - using DOuter_ccb = typename Arr_accessor::Dcel_outer_ccb; - using DInner_ccb = typename Arr_accessor::Dcel_inner_ccb; - using DIso_vert = typename Arr_accessor::Dcel_isolated_vertex; - const bool is_unbounded(false); - const bool is_valid(true); - for (const auto& js_face : js_faces) { - DFace* new_f = arr_access.new_face(); - - new_f->set_unbounded(is_unbounded); - new_f->set_fictitious(! is_valid); - new_f->set_data(js_face["name"]); - // Read the outer CCBs of the face. - auto oit = js_face.find("outer_ccbs"); - if (oit != js_face.end()) { - const auto& js_outer_ccbs = *oit; - for (const auto& js_ccb : js_outer_ccbs) { - // Allocate a new outer CCB record and set its incident face. - auto* new_occb = arr_access.new_outer_ccb(); - new_occb->set_face(new_f); - - // Read the current outer CCB. - auto bit = js_ccb.find("halfedges"); - if (bit == js_ccb.end()) { - std::cerr << "The halfedges item is missing " << " (" << filename - << ")\n"; - return false; - } - - const auto& js_halfedges = *bit; - auto hit = js_halfedges.begin(); - std::size_t first_idx = *hit; - DHalfedge* first_he = halfedges[first_idx]; - first_he->set_outer_ccb(new_occb); - DHalfedge* prev_he = first_he; - for (++hit; hit != js_halfedges.end(); ++hit) { - std::size_t curr_idx = *hit; - auto curr_he = halfedges[curr_idx]; - prev_he->set_next(curr_he); // connect - curr_he->set_outer_ccb(new_occb); // set the CCB - prev_he = curr_he; - } - prev_he->set_next(first_he); // close the loop - new_f->add_outer_ccb(new_occb, first_he); - } - } - - // Read the inner CCBs of the face. - auto iit = js_face.find("inner_ccbs"); - if (iit != js_face.end()) { - const auto& js_inner_ccbs = *iit; - for (const auto& js_ccb : js_inner_ccbs) { - // Allocate a new inner CCB record and set its incident face. - auto* new_iccb = arr_access.new_inner_ccb(); - new_iccb->set_face(new_f); - - // Read the current inner CCB. - auto bit = js_ccb.find("halfedges"); - if (bit == js_ccb.end()) { - std::cerr << "The halfedges item is missing " << " (" << filename - << ")\n"; - return false; - } - - const auto& js_halfedges = *bit; - auto hit = js_halfedges.begin(); - std::size_t first_idx = *hit; - DHalfedge* first_he = halfedges[first_idx]; - first_he->set_inner_ccb(new_iccb); - DHalfedge* prev_he = first_he; - for (++hit; hit != js_halfedges.end(); ++hit) { - std::size_t curr_idx = *hit; - auto curr_he = halfedges[curr_idx]; - prev_he->set_next(curr_he); // connect - curr_he->set_inner_ccb(new_iccb); // set the CCB - prev_he = curr_he; - } - prev_he->set_next(first_he); // close the loop - new_f->add_inner_ccb(new_iccb, first_he); - } - } - - // // Read the isolated vertices inside the face. - // Size n_isolated_vertices = - // formatter.read_size("number_of_isolated_vertices"); - // if (n_isolated_vertices) { - // formatter.read_isolated_vertices_begin(); - // Size k; - // for (k = 0; k < n_isolated_vertices; k++) { - // // Allocate a new isolated vertex record and set its incident face. - // DIso_vert* new_iso_vert = arr_access.new_isolated_vertex(); - // new_iso_vert->set_face(new_f); - // // Read the current isolated vertex. - // std::size_t v_idx = formatter.read_vertex_index(); - // DVertex* iso_v = m_vertices[v_idx]; - // iso_v->set_isolated_vertex(new_iso_vert); - // new_f->add_isolated_vertex(new_iso_vert, iso_v); - // } - // } - } - - return true; -} - -// -int main(int argc, char* argv[]) { - const char* filename = (argc > 1) ? argv[1] : "arr.json"; - - using Kernel = CGAL::Exact_predicates_exact_constructions_kernel; - using Geom_traits = CGAL::Arr_geodesic_arc_on_sphere_traits_2; - using Point = Geom_traits::Point_2; - using X_monotone_curve = Geom_traits::X_monotone_curve_2; - using Dcel = CGAL::Arr_face_extended_dcel; - using Topol_traits = CGAL::Arr_spherical_topology_traits_2; - using Arrangement = CGAL::Arrangement_on_surface_2; - - Kernel kernel; - Geom_traits traits; - Arrangement arr(&traits);; - auto rc = read_arrangement(filename, arr, kernel); - if (! rc) { - std::cerr << "Failed to load database!\n"; - return -1; - } - std::cout << arr << std::endl; - CGAL::draw(arr); - - QApplication app(argc, argv); - QCoreApplication::setOrganizationName("CGAL"); - QCoreApplication::setApplicationName("globus"); - - // Import resources from libCGAL (Qt5). - CGAL_QT_INIT_RESOURCES; - - Globus_window window; - window.show(); - return app.exec(); -} diff --git a/Arrangement_on_surface_2/demo/globus/resources/about.html b/Arrangement_on_surface_2/demo/globus/resources/about.html deleted file mode 100644 index 6cd0427df84c..000000000000 --- a/Arrangement_on_surface_2/demo/globus/resources/about.html +++ /dev/null @@ -1,10 +0,0 @@ - - -Globus - - -

Globus

-
-This program demonstrates the use of the geodesic traits if of the CGAL 2D Arrangements package. - - diff --git a/Arrangement_on_surface_2/demo/globus/resources/icons/arrow_down.xpm b/Arrangement_on_surface_2/demo/globus/resources/icons/arrow_down.xpm deleted file mode 100644 index cd5f097860bc..000000000000 --- a/Arrangement_on_surface_2/demo/globus/resources/icons/arrow_down.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *demo_arrow_down_xpm[] = { -/* width height ncolors chars_per_pixel */ -"32 32 3 1", -/* colors */ -" c #000000", -". c #808080", -"X c None", -/* pixels */ -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXX.XXX. .XXX.XXXXXXXXXX", -"XXXXXXXXXX..XX. .XX..XXXXXXXXXX", -"XXXXXXXXXXX. .. .. .XXXXXXXXXXX", -"XXXXXXXXXXXX.. .XXXXXXXXXXXX", -"XXXXXXXXXXXXX. .XXXXXXXXXXXXX", -"XXXXXXXXXXXXX. .XXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXX..XXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXX..XXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXX..XXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" -}; diff --git a/Arrangement_on_surface_2/demo/globus/resources/icons/arrow_up.xpm b/Arrangement_on_surface_2/demo/globus/resources/icons/arrow_up.xpm deleted file mode 100644 index 4b1ee76a1a05..000000000000 --- a/Arrangement_on_surface_2/demo/globus/resources/icons/arrow_up.xpm +++ /dev/null @@ -1,42 +0,0 @@ -/* XPM */ -static const char *demo_arrow_up_xpm[] = { -/* width height ncolors chars_per_pixel */ -"32 32 3 1", -/* colors */ -" c #000000", -". c #808080", -"X c None", -/* pixels */ -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXX..XXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXX..XXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXX..XXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXX. .XXXXXXXXXXXXX", -"XXXXXXXXXXXXX. .XXXXXXXXXXXXX", -"XXXXXXXXXXXX. . . .XXXXXXXXXXXX", -"XXXXXXXXXXX. .. .. .XXXXXXXXXXX", -"XXXXXXXXXX..XX. .XX..XXXXXXXXXX", -"XXXXXXXXXX.XXX. .XXX.XXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXX. .XXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", -"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" -}; diff --git a/Arrangement_on_surface_2/demo/globus/resources/icons/blue_icon.xpm b/Arrangement_on_surface_2/demo/globus/resources/icons/blue_icon.xpm deleted file mode 100644 index e4340c563307..000000000000 --- a/Arrangement_on_surface_2/demo/globus/resources/icons/blue_icon.xpm +++ /dev/null @@ -1,23 +0,0 @@ -/* XPM */ -const char* blue_icon[] = { -/* columns rows colors chars-per-pixel */ - "16 16 2 1", - "g c blue", - ". c None", -/* pixels */ - "................", - "................", - "..gggggggggggg..", - "..gggggggggggg..", - "..gggggggggggg..", - "..ggg......ggg..", - "..ggg......ggg..", - "..ggg......ggg..", - "..ggg......ggg..", - "..ggg......ggg..", - "..ggg......ggg..", - "..gggggggggggg..", - "..gggggggggggg..", - "..gggggggggggg..", - "................", - "................"}; diff --git a/Arrangement_on_surface_2/demo/globus/resources/icons/colors.xpm b/Arrangement_on_surface_2/demo/globus/resources/icons/colors.xpm deleted file mode 100644 index 6a2ee0047510..000000000000 --- a/Arrangement_on_surface_2/demo/globus/resources/icons/colors.xpm +++ /dev/null @@ -1,51 +0,0 @@ -/* XPM */ -static const char *demo_colors_xpm[] = { -/* width height ncolors chars_per_pixel */ -"32 32 12 1", -/* colors */ -" c #000000", -". c #800000", -"X c #C0C0C0", -"o c #008080", -"O c #FF00FF", -"+ c #FF0000", -"@ c #808080", -"# c #000080", -"% c #008000", -"& c #808000", -"* c #0000FF", -"$ c None", -/* pixels */ -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$ $$", -"$$ *******************ooooooo $$", -"$$ *******************o@@o@@o $$", -"$$ *******************o@@o@@o $$", -"$$ *******************ooooooo $$", -"$$ $$", -"$$ XXXXXXXXXXXXXXXXXXXXXXXXXX $$", -"$$ XXXXXXXXXXXXXXXXXXXXXXXXXX $$", -"$$ XXXXXXXXXXXXXXXXXXXXXXXXXX $$", -"$$ XX XX####XX****XXOOOOXX $$", -"$$ XX XX####XX****XXOOOOXX $$", -"$$ XX XX####XX****XXOOOOXX $$", -"$$ XX XX####XX****XXOOOOXX $$", -"$$ XXXXXXXXXXXXXXXXXXXXXXXXXX $$", -"$$ XXXXXXXXXXXXXXXXXXXXXXXXXX $$", -"$$ XXXXXXXXXXXXXXXXXXXXXXXXXX $$", -"$$ XX....XX++++XX%%%%XX&&&&XX $$", -"$$ XX....XX++++XX%%%%XX&&&&XX $$", -"$$ XX....XX++++XX%%%%XX&&&&XX $$", -"$$ XX....XX++++XX%%%%XX&&&&XX $$", -"$$ XXXXXXXXXXXXXXXXXXXXXXXXXX $$", -"$$ XXXXXXXXXXXXXXXXXXXXXXXXXX $$", -"$$ XXXXXXXXXXXXXXXXXXXXXXXXXX $$", -"$$ $$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$" -}; diff --git a/Arrangement_on_surface_2/demo/globus/resources/icons/delete.bmp b/Arrangement_on_surface_2/demo/globus/resources/icons/delete.bmp deleted file mode 100644 index d59564bbf9ffeba7b6c86a785eb576baaff25a23..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 630 zcmb`BJr2S!422Cs0x1%?0wd>O=Q@Rrj7S~0O2$YGWZ*#A7#PwQ|AdMaUSrqK`Q-R; z9G1iykoSn4#)4L;AlyH<64J07h;S$b`5~i31j;$%qVl0yTZO>aTFw8gtEkU8iEi2` zco6bu^_x2@ycBTaqXFg(FrO4KKPq58DPZ$Q1@!%OGQhoAt^*HNY`~>0IRkj-(t*f+ e2KX;P{0C6qC#dg$`Ql{q)SH!eU-(2L!X?J|7b8=;k-Dxaz%2o6M(1Nomgm@U z+T5L{ynjqS=+4bV|1E2g9HXpNS;%GRZdHlCkYP9xEF@w0GrifYRDs(oP~Fk%z?w1{ uCievuxLA8m@v3O(|Kzwoo*(ZYpAX^uVLKq)&!5IdcmI53xc~FTGtxJGH_?Fr diff --git a/Arrangement_on_surface_2/demo/globus/resources/icons/zoomin.xpm b/Arrangement_on_surface_2/demo/globus/resources/icons/zoomin.xpm deleted file mode 100644 index f765af053767..000000000000 --- a/Arrangement_on_surface_2/demo/globus/resources/icons/zoomin.xpm +++ /dev/null @@ -1,47 +0,0 @@ -/* XPM */ -static const char *zoomin_xpm[] = { -/* width height ncolors chars_per_pixel */ -"32 32 8 1", -/* colors */ -" c #000000", -". c #C0C0C0", -"X c #008080", -"o c #FF0000", -"O c #808080", -"+ c #000080", -"# c #0000FF", -"@ c None", -/* pixels */ -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@O O@@@@@@@@@@@@@@@", -"@@@@@@@@O O...O O@@@@@@@@@@@@@", -"@@@@@@@ O..@@@..O @@@@@@@@@@@@", -"@@@@@@ O..@@@@@@@..O @@@@@@@@@@@", -"@@@@@O ..@@@@@@@@@.. O@@@@@@@@@@", -"@@@@@ O.@@@@ooo@@@@.O @@@@@@@@@@", -"@@@@O .@@@@@ooo@@@@@. O@@@@@@@@@", -"@@@@ O.@@@@@ooo@@@@@.O @@@@@@@@@", -"@@@@ .@@@ooooooooo@@@. @@@@@@@@@", -"@@@@ .@@@ooooooooo@@@. @@@@@@@@@", -"@@@@ .@@@ooooooooo@@@. @@@@@@@@@", -"@@@@ O.@@@@@ooo@@@@@.O @@@@@@@@@", -"@@@@O .@@@@@ooo@@@@@. O@@@@@@@@@", -"@@@@@ O.@@@@ooo@@@@.O @@@@@@@@@@", -"@@@@@O ..@@@@@@@@@.. O@@@@@@@@@@", -"@@@@@@ O..@@@@@@@..O +@@@@@@@@@@", -"@@@@@@@ O..@@@..O ##+@@@@@@@@@", -"@@@@@@@@O O...O O+X##+@@@@@@@@", -"@@@@@@@@@@O O@@@+X##+@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@+X##+@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@+X##+@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@+X##+@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@+X##+@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@+X+@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@+@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", -"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@" -}; diff --git a/Arrangement_on_surface_2/demo/globus/resources/icons/zoomout.bmp b/Arrangement_on_surface_2/demo/globus/resources/icons/zoomout.bmp deleted file mode 100644 index 29c0d38189069c11248af0e03ed98a704de53eda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 630 zcmbtQF%H5o3^b@xI>8qhc?Sa<;uDMv8BoR6Z0*L(Z!&b`F&!!qCUZ$lOClj5)s3Ay zU+p;A9jYY-s}Q&Fjrf8JAQ<#+6+I?C(GX#gF>yl#gd4KfLg287*&{eUpYnW;9n<3B zl=A%}`C&MBiT+#GL^V&cR&7I