Skip to content

Commit

Permalink
Fix a couple of typos detected after codespell upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
anlambert committed Sep 4, 2024
1 parent 0f1bd62 commit af20046
Show file tree
Hide file tree
Showing 20 changed files with 58 additions and 47 deletions.
12 changes: 9 additions & 3 deletions cmake/FindTalipot.cmake
Original file line number Diff line number Diff line change
@@ -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:.
Expand Down Expand Up @@ -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 _)
Expand Down Expand Up @@ -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)
Expand All @@ -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}/../)
Expand All @@ -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)
Expand Down Expand Up @@ -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})
Expand Down
6 changes: 3 additions & 3 deletions library/talipot-core/include/talipot/PropertyInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions library/talipot-core/src/AcyclicTest.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -202,7 +202,7 @@ bool AcyclicTest::acyclicTest(const Graph *graph, vector<edge> *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();
Expand Down
4 changes: 2 additions & 2 deletions library/talipot-gui/include/talipot/CSVParser.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions library/talipot-gui/include/talipot/Interactor.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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()
*/
Expand Down
20 changes: 10 additions & 10 deletions library/talipot-ogl/include/talipot/Curves.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -35,13 +35,13 @@ TLP_GL_SCOPE void polyLine(const std::vector<Coord> &, /* polyline vertices */
const Color &, /* start color */
const Color &); /* end color */
TLP_GL_SCOPE void
polyQuad(const std::vector<Coord> &, /* 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<Coord> &, /* 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 */
Expand All @@ -63,8 +63,8 @@ TLP_GL_SCOPE void splineQuad(const std::vector<Coord> &, /* 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<Coord> &, /* polyline vertces */
const Color &, /* start color */
const Color &); /* end color */
Expand Down
6 changes: 3 additions & 3 deletions library/talipot-ogl/include/talipot/GlAxis.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions library/talipot-ogl/include/talipot/GlBox.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion library/talipot-ogl/include/talipot/GlLabel.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions library/talipot-ogl/include/talipot/GlPolygon.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions library/talipot-python/plugins/layout/h3/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from .h3math import Point4d


"""
The node structure storing all attributes of a tree node.
"""
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion library/talipot-python/plugins/layout/h3/tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plugins/general/EdgeBundling/EdgeBundling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions plugins/layout/LinLog/LinLogLayout.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions plugins/layout/PlanarGraph.h
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -24,7 +24,7 @@ namespace tlp {
void triangulate(SuperGraph *map, std::vector<edge> &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<node> &order);
}
4 changes: 2 additions & 2 deletions plugins/metric/MCLClustering.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions plugins/view/SOMView/SOMLIB/SOMAlgorithm.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions software/talipot/src/TalipotMainWindow.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tests/library/talipot/PlanarityTestTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
10 changes: 8 additions & 2 deletions utils/scripts/deheader/deheader
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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
Expand Down

0 comments on commit af20046

Please sign in to comment.