Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maintenance chores #97

Merged
merged 3 commits into from
Mar 30, 2022
+54 −255
Merged

maintenance chores #97

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1e3841
sync submodule
nim65s Mar 30, 2022
b6fc5d8
clang format defaults + pre-commit
nim65s Mar 30, 2022
0c1e6fb
pre-commit run -a
nim65s Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
203 changes: 0 additions & 203 deletions .clang-format
View file

This file was deleted.

21 changes: 21 additions & 0 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
repos:
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: v13.0.1
hooks:
- id: clang-format
args: [-i, --style=Google]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
hooks:
- id: trailing-whitespace
- id: check-added-large-files
- id: check-ast
- id: check-merge-conflict
- id: check-symlinks
- id: check-toml
- id: check-yaml
- id: debug-statements
- id: detect-private-key
- id: end-of-file-fixer
- id: mixed-line-ending
- id: trailing-whitespace
1 change: 0 additions & 1 deletion NEWS
View file
Original file line number Diff line number Diff line change
@@ -129,4 +129,3 @@ stasse (3):
Reinforce the dependant->dependent policy. Merge the florent branch. Makes the test_depend.cpp test works.
Reinforce the dependant->dependent policy.
Adding documentation to cmdPlug.

2 changes: 1 addition & 1 deletion cmake
Submodule cmake updated 10 files
+12 −10 Config.cmake.in
+1 −1 base.cmake
+25 −19 cxx-standard.cmake
+28 −13 cython/cython.cmake
+19 −2 cython/setup.in.py
+13 −7 distcheck.cmake
+3 −3 header.cmake
+15 −2 package-config.cmake
+1 −1 python.cmake
+44 −0 sdformat.cmake
4 changes: 2 additions & 2 deletions doc/Doxyfile.extra.in
View file
Original file line number Diff line number Diff line change
@@ -293,7 +293,7 @@ WARN_LOGFILE = @CMAKE_BINARY_DIR@/doc/doxygen.log

INPUT = @CMAKE_SOURCE_DIR@/include \
@CMAKE_SOURCE_DIR@/doc/additionalDoc


# The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO.
@@ -672,4 +672,4 @@ MATHJAX_FORMAT = SVG

ALIASES += "cheatsheet=\xrefitem cheatsheet \"Remarkable identity\" \"Cheat sheet\""

CITE_BIB_FILES += @CMAKE_SOURCE_DIR@/doc/sot.bib
CITE_BIB_FILES += @CMAKE_SOURCE_DIR@/doc/sot.bib
2 changes: 1 addition & 1 deletion doc/pictures/entity.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 26 additions & 43 deletions include/dynamic-graph/command-bind.h
View file
Original file line number Diff line number Diff line change
@@ -283,8 +283,8 @@ struct CommandVoid4 : public Command {
CommandVoid4(E &entity, function_t function, const std::string &docString)
: Command(entity,
boost::assign::list_of(ValueHelper<T1>::TypeID)(
ValueHelper<T2>::TypeID)(
ValueHelper<T3>::TypeID)(ValueHelper<T4>::TypeID),
ValueHelper<T2>::TypeID)(ValueHelper<T3>::TypeID)(
ValueHelper<T4>::TypeID),
docString),
fptr(function) {}

@@ -357,13 +357,11 @@ struct CommandVoid5 : public Command {
const T4 &, const T5 &);

CommandVoid5(E &entity, function_t function, const std::string &docString)
: Command(
entity,
boost::assign::list_of(ValueHelper<T1>::TypeID)(
ValueHelper<T2>::TypeID)(
ValueHelper<T3>::TypeID)(ValueHelper<T4>::TypeID)(ValueHelper<
T5>::TypeID),
docString),
: Command(entity,
boost::assign::list_of(ValueHelper<T1>::TypeID)(
ValueHelper<T2>::TypeID)(ValueHelper<T3>::TypeID)(
ValueHelper<T4>::TypeID)(ValueHelper<T5>::TypeID),
docString),
fptr(function) {}

protected:
@@ -444,15 +442,12 @@ struct CommandVoid6 : public Command {
const T4 &, const T5 &, const T6 &);

CommandVoid6(E &entity, function_t function, const std::string &docString)
: Command(
entity,
boost::assign::list_of(ValueHelper<T1>::TypeID)(
ValueHelper<T2>::TypeID)(
ValueHelper<T3>::TypeID)(ValueHelper<
T4>::TypeID)(ValueHelper<T5>::
TypeID)(ValueHelper<
T6>::TypeID),
docString),
: Command(entity,
boost::assign::list_of(ValueHelper<T1>::TypeID)(
ValueHelper<T2>::TypeID)(ValueHelper<T3>::TypeID)(
ValueHelper<T4>::TypeID)(ValueHelper<T5>::TypeID)(
ValueHelper<T6>::TypeID),
docString),
fptr(function) {}

protected:
@@ -536,17 +531,12 @@ struct CommandVoid7 : public Command {
const T7 &);

CommandVoid7(E &entity, function_t function, const std::string &docString)
: Command(
entity,
boost::assign::list_of(ValueHelper<T1>::TypeID)(
ValueHelper<T2>::TypeID)(
ValueHelper<T3>::
TypeID)(ValueHelper<
T4>::TypeID)(ValueHelper<T5>::
TypeID)(ValueHelper<T6>::
TypeID)(ValueHelper<
T7>::TypeID),
docString),
: Command(entity,
boost::assign::list_of(ValueHelper<T1>::TypeID)(
ValueHelper<T2>::TypeID)(ValueHelper<T3>::TypeID)(
ValueHelper<T4>::TypeID)(ValueHelper<T5>::TypeID)(
ValueHelper<T6>::TypeID)(ValueHelper<T7>::TypeID),
docString),
fptr(function) {}

protected:
@@ -633,20 +623,13 @@ struct CommandVoid8 : public Command {
const T7 &, const T8 &);

CommandVoid8(E &entity, function_t function, const std::string &docString)
: Command(
entity,
boost::assign::list_of(ValueHelper<T1>::TypeID)(
ValueHelper<T2>::TypeID)(
ValueHelper<T3>::
TypeID)(ValueHelper<T4>::
TypeID)(ValueHelper<T5>::
TypeID)(ValueHelper<T6>::
TypeID)(ValueHelper<
T7>::
TypeID)(ValueHelper<
T8>::
TypeID),
docString),
: Command(entity,
boost::assign::list_of(ValueHelper<T1>::TypeID)(
ValueHelper<T2>::TypeID)(ValueHelper<T3>::TypeID)(
ValueHelper<T4>::TypeID)(ValueHelper<T5>::TypeID)(
ValueHelper<T6>::TypeID)(ValueHelper<T7>::TypeID)(
ValueHelper<T8>::TypeID),
docString),
fptr(function) {}

protected:
7 changes: 3 additions & 4 deletions js/view_sot_dg.html
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<script>
function renderDOTFile() {
var fileInputElement = document.getElementById("fileInputElement");

var reader = new FileReader();
var graphtextres = ""
reader.onloadend = function(e) {
@@ -27,7 +27,7 @@
.catch(error => {
// Create a new Viz instance (@see Caveats page for more info)
viz = new Viz();

// Possibly display the error
console.error(error);
});
@@ -37,7 +37,7 @@


</script>
<input type="file" id="fileInputElement">
<input type="file" id="fileInputElement">
<input id="Rendering" type="button" value="Rendering" onclick="renderDOTFile();" />
<script>
var el = document.getElementById("Rendering");
@@ -49,4 +49,3 @@
</body>

</html>