diff --git a/cmake/FindTalipot.cmake b/cmake/FindTalipot.cmake index fbd10aac4a..61a1b8cb28 100644 --- a/cmake/FindTalipot.cmake +++ b/cmake/FindTalipot.cmake @@ -1,5 +1,5 @@ # The FindTalipot script can be used from any CMake-based project to set up -# environment variables poiting to Talipot libraries and headers directories. +# environment variables pointing to Talipot libraries and headers directories. # The FIND_PACKAGE command provides several arguments. While the COMPONENTS # argument will be ignored, you can tell FindTalipot to look for a specific # version of Talipot libraries:. @@ -36,6 +36,7 @@ # Define version separator (different for MSVC builds) SET(TalipotVersionSeparator .) + IF(${CMAKE_GENERATOR} MATCHES "Visual Studio" OR ${CMAKE_GENERATOR} MATCHES "NMake Makefiles") SET(TalipotVersionSeparator _) @@ -113,11 +114,13 @@ ENDMACRO(CHECK_VERSION) IF(NOT TALIPOT_INCLUDE_DIR) FIND_PATH(TALIPOT_INCLUDE_DIR talipot/Release.h PATHS ${TALIPOT_DIR}/include) + IF(NOT TALIPOT_INCLUDE_DIR) # Last resort: use - # CMAKE_MODULE_PATH/../../include/ + # CMAKE_MODULE_PATH/../../include/ FOREACH(prefix ${CMAKE_MODULE_PATH} ${CMAKE_PREFIX_PATH}) FIND_PATH(TALIPOT_INCLUDE_DIR talipot/Release.h PATHS "${prefix}/../../include") + IF(TALIPOT_INCLUDE_DIR) BREAK() ENDIF(TALIPOT_INCLUDE_DIR) @@ -128,7 +131,7 @@ ENDIF(NOT TALIPOT_INCLUDE_DIR) IF(NOT TALIPOT_INCLUDE_DIR) MESSAGE( FATAL_ERROR - "Auto-detecting your Talipot headers installation directory failed. Please try to provide the TALIPOT_DIR CMake variable poiting to your Talipot installation root directory" + "Auto-detecting your Talipot headers installation directory failed. Please try to provide the TALIPOT_DIR CMake variable pointing to your Talipot installation root directory" ) ELSE() SET(TALIPOT_DIR ${TALIPOT_INCLUDE_DIR}/../) @@ -151,11 +154,13 @@ INCLUDE(GNUInstallDirs) MARK_AS_ADVANCED(TALIPOT_DIR) MARK_AS_ADVANCED(TALIPOT_INCLUDE_DIR) + IF(WIN32) SET(TALIPOT_LIBRARIES_DIR ${TALIPOT_DIR}/${CMAKE_INSTALL_BINDIR}) ELSE() SET(TALIPOT_LIBRARIES_DIR ${TALIPOT_DIR}/${CMAKE_INSTALL_LIBDIR}) ENDIF() + MARK_AS_ADVANCED(TALIPOT_LIBRARIES_DIR) SET(TALIPOT_PLUGINS_DIR ${TALIPOT_DIR}/${CMAKE_INSTALL_LIBDIR}/talipot) SET(TALIPOT_SHARE_DIR ${TALIPOT_DIR}/${CMAKE_INSTALL_DATADIR}/talipot) @@ -218,6 +223,7 @@ IF((TALIPOT_OGL_LIBRARY AND NOT TALIPOT_CORE_LIBRARY) ENDIF() SET(TALIPOT_LIBRARIES) + IF(TALIPOT_CORE_LIBRARY) MARK_AS_ADVANCED(TALIPOT_CORE_LIBRARY) SET(TALIPOT_LIBRARIES ${TALIPOT_LIBRARIES} ${TALIPOT_CORE_LIBRARY}) diff --git a/library/talipot-core/include/talipot/PropertyInterface.h b/library/talipot-core/include/talipot/PropertyInterface.h index b01433e8f5..8284970301 100644 --- a/library/talipot-core/include/talipot/PropertyInterface.h +++ b/library/talipot-core/include/talipot/PropertyInterface.h @@ -560,7 +560,7 @@ class TLP_SCOPE VectorPropertyInterface : public PropertyInterface { * @param vect An output vector containing the string elements * @param openChar an optional character opening the list of elements. Default value is '('; when * set to '\0' it indicates that there is no opening character. - * @param sepChar an optional character separing the elements of the list. Default value is ','. + * @param sepChar an optional character separating the elements of the list. Default value is ','. * @param closeChar an optional character closing the list of elements. Default value is ')'; when * set to '\0' it indicates that there is no opening character. * @return Whether the string was a correct representation for this property's type. @@ -594,7 +594,7 @@ class TLP_SCOPE VectorPropertyInterface : public PropertyInterface { * @param value A string listing the elements of the vector to set on the node. * @param openChar an optional character opening the list of elements. Default value is '('; when * set to '\0' it indicates that there is no opening character. - * @param sepChar an optional character separing the elements of the list. Default value is ','. + * @param sepChar an optional character separating the elements of the list. Default value is ','. * @param closeChar an optional character closing the list of elements. Default value is ')'; when * set to '\0' it indicates that there is no opening character. * @return Whether the string was a correct representation for this property's type. If not, the @@ -610,7 +610,7 @@ class TLP_SCOPE VectorPropertyInterface : public PropertyInterface { * @param value A string listing the elements of the vector to set on the edge. * @param openChar an optional character opening the list of elements. Default value is '('; when * set to '\0' it indicates that there is no opening character. - * @param sepChar an optional character separing the elements of the list. Default value is ','. + * @param sepChar an optional character separating the elements of the list. Default value is ','. * @param closeChar an optional character closing the list of elements. Default value is ')'; when * set to '\0' it indicates that there is no opening character. * @return Whether the string was a correct representation for this property's type. If not, the diff --git a/library/talipot-core/src/AcyclicTest.cpp b/library/talipot-core/src/AcyclicTest.cpp index 2d60890fda..da2f8a43d1 100644 --- a/library/talipot-core/src/AcyclicTest.cpp +++ b/library/talipot-core/src/AcyclicTest.cpp @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2022 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -202,7 +202,7 @@ bool AcyclicTest::acyclicTest(const Graph *graph, vector *obstructionEdges // it may be finished if we don't need // to collect obstruction edges if ((!result) && (obstructionEdges == nullptr)) { - // don't froget to delete remaining iterators + // don't forget to delete remaining iterators while (!neighboursToVisit.empty()) { delete neighboursToVisit.top(); neighboursToVisit.pop(); diff --git a/library/talipot-gui/include/talipot/CSVParser.h b/library/talipot-gui/include/talipot/CSVParser.h index 5731871686..1036859802 100644 --- a/library/talipot-gui/include/talipot/CSVParser.h +++ b/library/talipot-gui/include/talipot/CSVParser.h @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2021 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -68,7 +68,7 @@ class TLP_QT_SCOPE CSVSimpleParser : public CSVParser { * @brief Construct a csv simple file parser. * @param filename The path to the file to import. * @param separator The separator to use. - * @param textDelimiter If a token is sourrounded by this character we ignore all the separators + * @param textDelimiter If a token is surrounded by this character we ignore all the separators *found in this token. Useful if a token contains the separator. * @param firstLine The number of the first line to read. The first line is 0. * @param lastLine The number of the last line to read. diff --git a/library/talipot-gui/include/talipot/Interactor.h b/library/talipot-gui/include/talipot/Interactor.h index 8ae9ee2c10..50d0c3c926 100644 --- a/library/talipot-gui/include/talipot/Interactor.h +++ b/library/talipot-gui/include/talipot/Interactor.h @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2021 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -50,7 +50,7 @@ static const std::string INTERACTOR_CATEGORY = "Interactor"; the view object to perform specific operations on user inputs. Methods listed above are only called once. Once the interactor is initialized, it may be - installed/removed several times on different QObjects. It will then repond to user inputs via the + installed/removed several times on different QObjects. It will then respond to user inputs via the eventFilter method @see QObject::eventFilter() */ diff --git a/library/talipot-ogl/include/talipot/Curves.h b/library/talipot-ogl/include/talipot/Curves.h index fb7cc8cc84..098dcf36fc 100644 --- a/library/talipot-ogl/include/talipot/Curves.h +++ b/library/talipot-ogl/include/talipot/Curves.h @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2023 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -35,13 +35,13 @@ TLP_GL_SCOPE void polyLine(const std::vector &, /* polyline vertices */ const Color &, /* start color */ const Color &); /* end color */ TLP_GL_SCOPE void -polyQuad(const std::vector &, /* polyline vertces */ - const Color &, /* start color */ - const Color &, /* end color */ - const float, /* start size */ - const float, /* end size */ - const Coord &, /* normal to the begin of the curve */ - const Coord &, /* normal to the end curve */ +polyQuad(const std::vector &, /* polyline vertces */ + const Color &, /* start color */ + const Color &, /* end color */ + const float, /* start size */ + const float, /* end size */ + const Coord &, /* normal to the begin of the curve */ + const Coord &, /* normal to the end curve */ bool, /* if true : use start and end color to border lines, if false : use borderColor*/ const Color &, /* border color */ const std::string &textureName = "", /* textureName */ @@ -63,8 +63,8 @@ TLP_GL_SCOPE void splineQuad(const std::vector &, /* polyline vertces */ const Color &, /* end color */ const float, /* start size */ const float, /* end size */ - const Coord &, /* nomal to the begin of the curve */ - const Coord &); /* nomal to the end curve */ + const Coord &, /* normal to the begin of the curve */ + const Coord &); /* normal to the end curve */ TLP_GL_SCOPE void splineLine(const std::vector &, /* polyline vertces */ const Color &, /* start color */ const Color &); /* end color */ diff --git a/library/talipot-ogl/include/talipot/GlAxis.h b/library/talipot-ogl/include/talipot/GlAxis.h index aa4b5f9482..43879d2616 100644 --- a/library/talipot-ogl/include/talipot/GlAxis.h +++ b/library/talipot-ogl/include/talipot/GlAxis.h @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -153,8 +153,8 @@ class TLP_GL_SCOPE GlAxis : public GlComposite { /** * @brief Method to update the axis drawing. * - * It has to be called when one (ore more) of the setters methods above has been used - * This method erase the whole axis drawing and redraw the axis line and the caption (if any) + * It has to be called when one (or more) of the setters methods above has been used. + * This method erase the whole axis drawing and redraw the axis line and the caption (if any). * The axis graduations have to be reset by calling setAxisGraduations */ virtual void updateAxis(); diff --git a/library/talipot-ogl/include/talipot/GlBox.h b/library/talipot-ogl/include/talipot/GlBox.h index 7d02d2aa9f..0e8e88626e 100644 --- a/library/talipot-ogl/include/talipot/GlBox.h +++ b/library/talipot-ogl/include/talipot/GlBox.h @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2023 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -149,7 +149,7 @@ class TLP_GL_SCOPE GlBox : public GlEntity { bool filled; /**< the box is filled ? */ bool outlined; /**< the box is outlined ? */ std::string textureName; - float outlineSize; /**< size of the ouline */ + float outlineSize; /**< size of the outline */ float *newCubeCoordArrays; bool generated; diff --git a/library/talipot-ogl/include/talipot/GlLabel.h b/library/talipot-ogl/include/talipot/GlLabel.h index 9f31e8b2a6..76d5130067 100644 --- a/library/talipot-ogl/include/talipot/GlLabel.h +++ b/library/talipot-ogl/include/talipot/GlLabel.h @@ -271,7 +271,7 @@ class TLP_GL_SCOPE GlLabel final : public GlEntity { } /** - * @brief Return if the label is otimized with the lod + * @brief Return if the label is optimized with the lod */ bool getUseLODOptimisation() const { return useLOD; diff --git a/library/talipot-ogl/include/talipot/GlPolygon.h b/library/talipot-ogl/include/talipot/GlPolygon.h index fbef0d9356..54c03cf8d1 100644 --- a/library/talipot-ogl/include/talipot/GlPolygon.h +++ b/library/talipot-ogl/include/talipot/GlPolygon.h @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2021 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -44,7 +44,7 @@ class TLP_GL_SCOPE GlPolygon : public GlAbstractPolygon { const std::string &textureName = "", const float outlineSize = 1); /** * @brief Constructor with a number of point, a number of fill color, a number of outline color - * and if the polygon is filled, outlined and the ouline size + * and if the polygon is filled, outlined and the outline size */ GlPolygon(const uint nbPoints, const uint nbFillColors, const uint nbOutlineColors, const bool filled = true, const bool outlined = true, diff --git a/library/talipot-python/plugins/layout/h3/node.py b/library/talipot-python/plugins/layout/h3/node.py index 347c32993f..82bd6adb1f 100644 --- a/library/talipot-python/plugins/layout/h3/node.py +++ b/library/talipot-python/plugins/layout/h3/node.py @@ -2,7 +2,6 @@ from .h3math import Point4d - """ The node structure storing all attributes of a tree node. """ @@ -16,7 +15,7 @@ class Node(object): :param int node_id: the id of node in the node lookup table in tree object :param int parent_id: the id of parent node in the node lookup table in tree object, default None - :param int depth: the depth of this node in the tree, deault 0 + :param int depth: the depth of this node in the tree, default 0 :param int tree_size: the subtree size of the node, ie. the number of nodes blow this node, default 1 :param float radius: the node's hemisphere radius, ie. the distance to its diff --git a/library/talipot-python/plugins/layout/h3/tree.py b/library/talipot-python/plugins/layout/h3/tree.py index 3039e62f82..3e650d3eff 100644 --- a/library/talipot-python/plugins/layout/h3/tree.py +++ b/library/talipot-python/plugins/layout/h3/tree.py @@ -246,7 +246,7 @@ def sort_children_by_tree_size(self): of nodes in subtree, in place sort is used. This is an alternative option to sort the tree before placing the nodes on the hemisphere. The original H3 algorithm set leaf node radius as math:: N / alpha - so the nodes with many sibilings can have a larger radius and nodes + so the nodes with many siblings can have a larger radius and nodes with a lot of children. """ depth = 0 diff --git a/plugins/general/EdgeBundling/EdgeBundling.cpp b/plugins/general/EdgeBundling/EdgeBundling.cpp index dd91cedad8..7fe74520c2 100644 --- a/plugins/general/EdgeBundling/EdgeBundling.cpp +++ b/plugins/general/EdgeBundling/EdgeBundling.cpp @@ -323,7 +323,7 @@ bool EdgeBundling::run() { } // Grid graph computation second step : generate a voronoi diagram - // from the original nodes positions and the centers of the previoulsy + // from the original nodes positions and the centers of the previously // computed quad-tree/octree cells tlp::DataSet voroDataSet; voroDataSet.set("connect", true); diff --git a/plugins/layout/LinLog/LinLogLayout.cpp b/plugins/layout/LinLog/LinLogLayout.cpp index 7cf32801dd..aa9a7bcf05 100644 --- a/plugins/layout/LinLog/LinLogLayout.cpp +++ b/plugins/layout/LinLog/LinLogLayout.cpp @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2022 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -799,7 +799,7 @@ void LinLogLayout::initWeights() { } OctTree *LinLogLayout::buildOctTree() { - // compute mimima and maxima of positions in each dimension + // compute minima and maxima of positions in each dimension Coord minPos = {100000.f, 100000.f, 100000.f}; Coord maxPos = {-100000.f, -100000.f, -100000.f}; Coord zero; diff --git a/plugins/layout/PlanarGraph.h b/plugins/layout/PlanarGraph.h index 953dbb9671..2e4ef58630 100644 --- a/plugins/layout/PlanarGraph.h +++ b/plugins/layout/PlanarGraph.h @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -24,7 +24,7 @@ namespace tlp { void triangulate(SuperGraph *map, std::vector &addedEdges); /** * Build the canonical ordering of a planar triangulated graph. For information - * about canonical ordering the user must reffer to the planar graph drawing book. + * about canonical ordering the user must refer to the planar graph drawing book. */ void canonicalOrdering(SuperGraph *graph, std::vector &order); } diff --git a/plugins/metric/MCLClustering.cpp b/plugins/metric/MCLClustering.cpp index b65c2f08f0..e1d3bdaa44 100644 --- a/plugins/metric/MCLClustering.cpp +++ b/plugins/metric/MCLClustering.cpp @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2021 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -364,7 +364,7 @@ bool MCLClustering::run() { } } - /* exact MCL should inflate after because we share the same graphs tructure, + /* exact MCL should inflate after because we share the same graphs structure, * or we should only remove edges created during the power and delay the * deletion of edge that does exist in the previous graph * however that impletenation doesn't change the result too much. diff --git a/plugins/view/SOMView/SOMLIB/SOMAlgorithm.cpp b/plugins/view/SOMView/SOMLIB/SOMAlgorithm.cpp index 79a962587e..6a3b6790d0 100644 --- a/plugins/view/SOMView/SOMLIB/SOMAlgorithm.cpp +++ b/plugins/view/SOMView/SOMLIB/SOMAlgorithm.cpp @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2023 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -78,7 +78,7 @@ void SOMAlgorithm::initMap(SOMMap *map, InputSample &inputSample, nodeIterator = inputSample.getRandomNodeOrder(); } - // Ramdom choice + // Random choice map->setWeight(n, inputSample.getWeight(nodeIterator->next())); if (pluginProgress) { diff --git a/software/talipot/src/TalipotMainWindow.cpp b/software/talipot/src/TalipotMainWindow.cpp index bcace2646a..1be82cc4f6 100644 --- a/software/talipot/src/TalipotMainWindow.cpp +++ b/software/talipot/src/TalipotMainWindow.cpp @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2019-2023 The Talipot developers + * Copyright (C) 2019-2024 The Talipot developers * * Talipot is a fork of Tulip, created by David Auber * and the Tulip development Team from LaBRI, University of Bordeaux @@ -251,7 +251,7 @@ TalipotMainWindow::TalipotMainWindow() "selected and select if not selected", "I"); setToolTipWithCtrlShortcut(_ui->actionCancel_selection, - "Deselect all selected elements of the current grap", "Shift+A"); + "Deselect all selected elements of the current graph", "Shift+A"); setToolTipWithCtrlShortcut(_ui->actionGroup_elements, "Create a meta-node representing a newly created subgraph " "containing all selected elements of the current graph", diff --git a/tests/library/talipot/PlanarityTestTest.cpp b/tests/library/talipot/PlanarityTestTest.cpp index 36ab739972..7de2329fe8 100644 --- a/tests/library/talipot/PlanarityTestTest.cpp +++ b/tests/library/talipot/PlanarityTestTest.cpp @@ -151,7 +151,7 @@ void PlanarityTestTest::planarMetaGraphsEmbedding() { graphMap->makePlanar();*/ /* * The number of faces must be adapted because the Planarity Test split the - * external face into several faces (one by connected componnent). + * external face into several faces (one by connected component). */ /* CPPUNIT_ASSERT_EQUAL(eulerIdentity(graph), graphMap->nbFaces() - (ConnectedTest::numberOfConnectedComponnents(graph) - 1)); diff --git a/utils/scripts/deheader/deheader b/utils/scripts/deheader/deheader index 6e8ed476c1..62f27431c6 100755 --- a/utils/scripts/deheader/deheader +++ b/utils/scripts/deheader/deheader @@ -34,7 +34,13 @@ The last line of the output is a statistical summary of operations. from __future__ import print_function -import sys, os, getopt, time, re, operator, subprocess +import getopt +import operator +import os +import re +import subprocess +import sys +import time version = "1.7" @@ -49,7 +55,7 @@ COMMAND_DEBUG = 3 # Difference in various compiler implementations and OSes mean that for cross- # platform compatibility you sometimes want to leave "unneeded" headers alone -# because they're required in order to satify dependencies on other platforms. +# because they're required in order to satisfy dependencies on other platforms. requirements = ( # Headers mandated by SuS Version 2 System Interfaces. # a64l, l64a - convert between a 32-bit integer and a radix-64 ASCII string