From 88f62e726ab8a8e3f43515e60c4f2fecde668682 Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Thu, 17 Sep 2020 21:12:51 +0200 Subject: [PATCH 1/2] add copyright --- lib/bids-matlab | 2 +- miss_hit.cfg | 2 +- src/checkCFG.m | 2 ++ src/convertSourceToRaw.m | 2 ++ src/createDataDictionary.m | 2 ++ src/createDatasetDescription.m | 2 ++ src/createFilename.m | 2 ++ src/createJson.m | 2 ++ src/miss_hit.cfg | 2 +- src/saveEventsFile.m | 2 ++ src/subfun/askForGroupAndOrSession.m | 2 ++ src/subfun/askUserCli.m | 2 ++ src/subfun/askUserGui.m | 2 ++ src/subfun/checkCppBidsDependencies.m | 2 ++ src/subfun/createQuestionList.m | 2 ++ src/subfun/createValidName.m | 2 ++ src/subfun/getIsQuestionToAsk.m | 2 ++ src/subfun/initializeExtraColumns.m | 2 ++ src/subfun/isPositiveInteger.m | 2 ++ src/subfun/printCreditsCppBids.m | 2 ++ src/subfun/removeAllDateSuffix.m | 2 ++ src/subfun/removeDateSuffix.m | 2 ++ src/subfun/returnHeaderName.m | 2 ++ src/subfun/returnNamesExtraColumns.m | 2 ++ src/subfun/returnNbColumns.m | 2 ++ src/subfun/setDefaultFields.m | 2 ++ src/subfun/setDefaultResponses.m | 2 ++ src/subfun/transferInfoToBids.m | 2 ++ src/userInputs.m | 2 ++ 29 files changed, 55 insertions(+), 3 deletions(-) diff --git a/lib/bids-matlab b/lib/bids-matlab index 71257b51..dd04a370 160000 --- a/lib/bids-matlab +++ b/lib/bids-matlab @@ -1 +1 @@ -Subproject commit 71257b51986f5075bb903eb090fe28b9b6dc3ebf +Subproject commit dd04a3709dcbfd04255cd43ef1caced94872ddc8 diff --git a/miss_hit.cfg b/miss_hit.cfg index f784081c..60976e52 100644 --- a/miss_hit.cfg +++ b/miss_hit.cfg @@ -1,8 +1,8 @@ # style guide (https://florianschanda.github.io/miss_hit/style_checker.html) line_length: 100 regex_function_name: "[a-z]+(([A-Z]){1}[A-Za-z]+)*" -suppress_rule: "copyright_notice" exclude_dir: "lib" +copyright_entity: "CPP_BIDS developers" # metrics limit for the code quality (https://florianschanda.github.io/miss_hit/metrics.html) metric "cnest": limit 4 diff --git a/src/checkCFG.m b/src/checkCFG.m index b6666647..3c3f0a05 100644 --- a/src/checkCFG.m +++ b/src/checkCFG.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function cfg = checkCFG(cfg) % cfg = checkCFG(cfg) % diff --git a/src/convertSourceToRaw.m b/src/convertSourceToRaw.m index bfc846ba..69caca0e 100644 --- a/src/convertSourceToRaw.m +++ b/src/convertSourceToRaw.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function convertSourceToRaw(cfg) % convertSourceToRaw(cfg) % diff --git a/src/createDataDictionary.m b/src/createDataDictionary.m index f424dfc4..f635f833 100644 --- a/src/createDataDictionary.m +++ b/src/createDataDictionary.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function createDataDictionary(cfg, logFile) % createDataDictionary(cfg, logFile) % diff --git a/src/createDatasetDescription.m b/src/createDatasetDescription.m index 4240d5ec..a65959d9 100644 --- a/src/createDatasetDescription.m +++ b/src/createDatasetDescription.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function createDatasetDescription(cfg) % createDatasetDescription(cfg) % diff --git a/src/createFilename.m b/src/createFilename.m index cf4e350f..1baa3511 100644 --- a/src/createFilename.m +++ b/src/createFilename.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function cfg = createFilename(cfg) % cfg = createFilename(cfg) % diff --git a/src/createJson.m b/src/createJson.m index 15bbbe1e..0f57b39b 100644 --- a/src/createJson.m +++ b/src/createJson.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function createJson(varargin) % createBoldJson(cfg, varargin) % diff --git a/src/miss_hit.cfg b/src/miss_hit.cfg index 25cb5611..ef3d7017 100644 --- a/src/miss_hit.cfg +++ b/src/miss_hit.cfg @@ -1,7 +1,7 @@ # style guide (https://florianschanda.github.io/miss_hit/style_checker.html) line_length: 100 regex_function_name: "[a-z]+(([A-Z]){1}[A-Za-z]+)*" -suppress_rule: "copyright_notice" +copyright_entity: "CPP_BIDS developers" # metrics limit for the code quality (https://florianschanda.github.io/miss_hit/metrics.html) metric "cnest": limit 4 diff --git a/src/saveEventsFile.m b/src/saveEventsFile.m index 949161ff..e0b10873 100644 --- a/src/saveEventsFile.m +++ b/src/saveEventsFile.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function [logFile] = saveEventsFile(action, cfg, logFile) % [logFile] = saveEventsFile(action, cfg, logFile) % diff --git a/src/subfun/askForGroupAndOrSession.m b/src/subfun/askForGroupAndOrSession.m index faad823c..bac91022 100644 --- a/src/subfun/askForGroupAndOrSession.m +++ b/src/subfun/askForGroupAndOrSession.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function cfg = askForGroupAndOrSession(cfg) askGrpSess = [true true]; diff --git a/src/subfun/askUserCli.m b/src/subfun/askUserCli.m index a2222eef..46491136 100644 --- a/src/subfun/askUserCli.m +++ b/src/subfun/askUserCli.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function responses = askUserCli(questions, responses) % response = askUserCli(questions) % diff --git a/src/subfun/askUserGui.m b/src/subfun/askUserGui.m index ddf42103..b563cfa4 100644 --- a/src/subfun/askUserGui.m +++ b/src/subfun/askUserGui.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function responses = askUserGui(questions, responses) % boolean for which question should be asked diff --git a/src/subfun/checkCppBidsDependencies.m b/src/subfun/checkCppBidsDependencies.m index dc752114..43d01ecc 100644 --- a/src/subfun/checkCppBidsDependencies.m +++ b/src/subfun/checkCppBidsDependencies.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function checkCppBidsDependencies(cfg) % checkCppBidsDependencies() % diff --git a/src/subfun/createQuestionList.m b/src/subfun/createQuestionList.m index 8d3b55c9..fc2c43b0 100644 --- a/src/subfun/createQuestionList.m +++ b/src/subfun/createQuestionList.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function questions = createQuestionList(cfg) cfg = askForGroupAndOrSession(cfg); diff --git a/src/subfun/createValidName.m b/src/subfun/createValidName.m index ef216ef1..57b905d4 100644 --- a/src/subfun/createValidName.m +++ b/src/subfun/createValidName.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function [name, nameValid] = createValidName(name) % [taskName, taskNameValid] = createTaskName(taskName) % diff --git a/src/subfun/getIsQuestionToAsk.m b/src/subfun/getIsQuestionToAsk.m index 8da55b03..a8446235 100644 --- a/src/subfun/getIsQuestionToAsk.m +++ b/src/subfun/getIsQuestionToAsk.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function isQuestionToAsk = getIsQuestionToAsk(questions, responses) isQuestionToAsk = cell2mat(questions.questionsToAsk(:, 2)); diff --git a/src/subfun/initializeExtraColumns.m b/src/subfun/initializeExtraColumns.m index cfbb1c34..2797b937 100644 --- a/src/subfun/initializeExtraColumns.m +++ b/src/subfun/initializeExtraColumns.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function logFile = initializeExtraColumns(logFile) % logFile = initializeExtraColumns(logFile) % initialize the fields for the extra columns diff --git a/src/subfun/isPositiveInteger.m b/src/subfun/isPositiveInteger.m index f44bc872..6178b16b 100644 --- a/src/subfun/isPositiveInteger.m +++ b/src/subfun/isPositiveInteger.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function trueOrFalse = isPositiveInteger(input2check) % trueOrFalse = isPositiveInteger(input2check) % diff --git a/src/subfun/printCreditsCppBids.m b/src/subfun/printCreditsCppBids.m index e9ff763a..172ab9b3 100644 --- a/src/subfun/printCreditsCppBids.m +++ b/src/subfun/printCreditsCppBids.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function printCreditsCppBids(cfg) try diff --git a/src/subfun/removeAllDateSuffix.m b/src/subfun/removeAllDateSuffix.m index 1f0bf0c3..7c64ab64 100644 --- a/src/subfun/removeAllDateSuffix.m +++ b/src/subfun/removeAllDateSuffix.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function removeAllDateSuffix(rawDir, subjName, sesName) % removeAllDateSuffix(rawDir, subjName, sesName) % diff --git a/src/subfun/removeDateSuffix.m b/src/subfun/removeDateSuffix.m index d06af305..eb8ca73e 100644 --- a/src/subfun/removeDateSuffix.m +++ b/src/subfun/removeDateSuffix.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function removeDateSuffix(filenames, subjectPath) % removeDateSuffix(filenames, subjectPath) % diff --git a/src/subfun/returnHeaderName.m b/src/subfun/returnHeaderName.m index e78865f1..fe59cbc3 100644 --- a/src/subfun/returnHeaderName.m +++ b/src/subfun/returnHeaderName.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function headerName = returnHeaderName(columnName, nbCol, iCol) % headerName = returnHeaderName(columnName, nbCol, iCol) % diff --git a/src/subfun/returnNamesExtraColumns.m b/src/subfun/returnNamesExtraColumns.m index ada0791c..39b17629 100644 --- a/src/subfun/returnNamesExtraColumns.m +++ b/src/subfun/returnNamesExtraColumns.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function [namesExtraColumns, logFile] = returnNamesExtraColumns(logFile) % [namesExtraColumns, logFile] = returnNamesExtraColumns(logFile) % diff --git a/src/subfun/returnNbColumns.m b/src/subfun/returnNbColumns.m index 1a603bb4..18234a7d 100644 --- a/src/subfun/returnNbColumns.m +++ b/src/subfun/returnNbColumns.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function nbCol = returnNbColumns(logFile, nameExtraColumn) % nbCol = returnNbColumns(logFile, nameExtraColumn) % diff --git a/src/subfun/setDefaultFields.m b/src/subfun/setDefaultFields.m index e54f805f..490b7cbd 100644 --- a/src/subfun/setDefaultFields.m +++ b/src/subfun/setDefaultFields.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function structure = setDefaultFields(structure, fieldsToSet) % structure = setDefaultFields(structure, fieldsToSet) % diff --git a/src/subfun/setDefaultResponses.m b/src/subfun/setDefaultResponses.m index 1d8074ea..d9814c45 100644 --- a/src/subfun/setDefaultResponses.m +++ b/src/subfun/setDefaultResponses.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function [cfg, responses] = setDefaultResponses(cfg) if nargin < 1 diff --git a/src/subfun/transferInfoToBids.m b/src/subfun/transferInfoToBids.m index c2267e41..f21950fd 100644 --- a/src/subfun/transferInfoToBids.m +++ b/src/subfun/transferInfoToBids.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function fieldsToSet = transferInfoToBids(fieldsToSet, cfg) % fieldsToSet = transferInfoToBids(fieldsToSet, cfg) % diff --git a/src/userInputs.m b/src/userInputs.m index 1d9c3481..9264bf8b 100644 --- a/src/userInputs.m +++ b/src/userInputs.m @@ -1,3 +1,5 @@ +% (C) Copyright 2020 CPP_BIDS developers + function cfg = userInputs(cfg) % cfg = userInputs(cfg) % From 270e750b672950c06b400f34c4b900060fcb088e Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Thu, 17 Sep 2020 21:15:46 +0200 Subject: [PATCH 2/2] rm extra mh cfg file --- src/miss_hit.cfg | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 src/miss_hit.cfg diff --git a/src/miss_hit.cfg b/src/miss_hit.cfg deleted file mode 100644 index ef3d7017..00000000 --- a/src/miss_hit.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# style guide (https://florianschanda.github.io/miss_hit/style_checker.html) -line_length: 100 -regex_function_name: "[a-z]+(([A-Z]){1}[A-Za-z]+)*" -copyright_entity: "CPP_BIDS developers" - -# metrics limit for the code quality (https://florianschanda.github.io/miss_hit/metrics.html) -metric "cnest": limit 4 -metric "file_length": limit 500 -metric "cyc": limit 15 -metric "parameters": limit 6 \ No newline at end of file