renaming

AleksandrPanov · AleksandrPanov · commit eb231ea1bb00 · 2022-12-14T18:45:11.000+03:00
diff --git a/modules/aruco/include/opencv2/aruco/charuco.hpp b/modules/aruco/include/opencv2/aruco/charuco.hpp
@@ -91,7 +91,7 @@ CV_EXPORTS_W void detectCharucoDiamond(InputArray image, InputArrayOfArrays mark
                                        InputArray cameraMatrix = noArray(),
                                        InputArray distCoeffs = noArray(),
                                        Ptr<Dictionary> dictionary = makePtr<Dictionary>
-                                               (getPredefinedDictionary(PREDEFINED_DICTIONARY::DICT_4X4_50)));
+                                               (getPredefinedDictionary(PredefinedDictionaryType::DICT_4X4_50)));
 
 
 
diff --git a/modules/aruco/samples/aruco_dict_utils.cpp b/modules/aruco/samples/aruco_dict_utils.cpp
@@ -233,7 +233,7 @@ int main(int argc, char *argv[])
     aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
     if (parser.has("d")) {
         int dictionaryId = parser.get<int>("d");
-        dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+        dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
     }
     else if (parser.has("cd")) {
         FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);
diff --git a/modules/aruco/samples/calibrate_camera.cpp b/modules/aruco/samples/calibrate_camera.cpp
@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
     aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
     if (parser.has("d")) {
         int dictionaryId = parser.get<int>("d");
-        dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+        dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
     }
     else if (parser.has("cd")) {
         FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);
diff --git a/modules/aruco/samples/calibrate_camera_charuco.cpp b/modules/aruco/samples/calibrate_camera_charuco.cpp
@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
     aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
     if (parser.has("d")) {
         int dictionaryId = parser.get<int>("d");
-        dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+        dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
     }
     else if (parser.has("cd")) {
         FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);
diff --git a/modules/aruco/samples/create_board.cpp b/modules/aruco/samples/create_board.cpp
@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
     aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
     if (parser.has("d")) {
         int dictionaryId = parser.get<int>("d");
-        dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+        dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
     }
     else if (parser.has("cd")) {
         FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);
diff --git a/modules/aruco/samples/create_board_charuco.cpp b/modules/aruco/samples/create_board_charuco.cpp
@@ -96,7 +96,7 @@ int main(int argc, char *argv[]) {
     aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
     if (parser.has("d")) {
         int dictionaryId = parser.get<int>("d");
-        dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+        dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
     }
     else if (parser.has("cd")) {
         FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);
diff --git a/modules/aruco/samples/create_diamond.cpp b/modules/aruco/samples/create_diamond.cpp
@@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {
         return 0;
     }
 
-    aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+    aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
 
     istringstream ss(idsString);
     vector< string > splittedIds;
diff --git a/modules/aruco/samples/create_marker.cpp b/modules/aruco/samples/create_marker.cpp
@@ -87,7 +87,7 @@ int main(int argc, char *argv[]) {
     aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
     if (parser.has("d")) {
         int dictionaryId = parser.get<int>("d");
-        dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+        dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
     }
     else if (parser.has("cd")) {
         FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);
diff --git a/modules/aruco/samples/detect_board.cpp b/modules/aruco/samples/detect_board.cpp
@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) {
     aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
     if (parser.has("d")) {
         int dictionaryId = parser.get<int>("d");
-        dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+        dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
     }
     else if (parser.has("cd")) {
         FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);
diff --git a/modules/aruco/samples/detect_board_charuco.cpp b/modules/aruco/samples/detect_board_charuco.cpp
@@ -117,7 +117,7 @@ int main(int argc, char *argv[]) {
     aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
     if (parser.has("d")) {
         int dictionaryId = parser.get<int>("d");
-        dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+        dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
     }
     else if (parser.has("cd")) {
         FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);
diff --git a/modules/aruco/samples/detect_diamonds.cpp b/modules/aruco/samples/detect_diamonds.cpp
@@ -117,7 +117,7 @@ int main(int argc, char *argv[]) {
     aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
     if (parser.has("d")) {
         int dictionaryId = parser.get<int>("d");
-        dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+        dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
     }
     else if (parser.has("cd")) {
         FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);
diff --git a/modules/aruco/samples/detect_markers.cpp b/modules/aruco/samples/detect_markers.cpp
@@ -111,7 +111,7 @@ int main(int argc, char *argv[]) {
     aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);
     if (parser.has("d")) {
         int dictionaryId = parser.get<int>("d");
-        dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+        dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
     }
     else if (parser.has("cd")) {
         FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);
diff --git a/modules/aruco/test/test_charucodetection.cpp b/modules/aruco/test/test_charucodetection.cpp
@@ -548,7 +548,7 @@ TEST(Charuco, testCharucoCornersCollinear_true)
 
     Ptr<aruco::DetectorParameters> detectorParams = makePtr<aruco::DetectorParameters>();
 
-    aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+    aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
 
     Ptr<aruco::CharucoBoard> charucoBoard =
             aruco::CharucoBoard::create(squaresX, squaresY, squareLength, markerLength, dictionary);
@@ -589,7 +589,7 @@ TEST(Charuco, testCharucoCornersCollinear_false)
 
     Ptr<aruco::DetectorParameters> detectorParams = makePtr<aruco::DetectorParameters>();
 
-    aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));
+    aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));
 
     Ptr<aruco::CharucoBoard> charucoBoard =
             aruco::CharucoBoard::create(squaresX, squaresY, squareLength, markerLength, dictionary);
diff --git a/modules/aruco/tutorials/aruco_detection/aruco_detection.markdown b/modules/aruco/tutorials/aruco_detection/aruco_detection.markdown
@@ -404,7 +404,7 @@ From all the provided dictionaries, it is recommended to choose the smallest one
 For instance, if you need 200 markers of 6x6 bits, it is better to use `DICT_6X6_250` than `DICT_6X6_1000`.
 The smaller the dictionary, the higher the inter-marker distance.
 
-The list of available predefined dictionaries can be found in the documentation for the `PREDEFINED_DICTIONARY` enum.
+The list of available predefined dictionaries can be found in the documentation for the `PredefinedDictionaryType` enum.
 
 ### Automatic dictionary generation
 

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ int main(int argc, char *argv[])`
`233`	`233`	`aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);`
`234`	`234`	`if (parser.has("d")) {`
`235`	`235`	`int dictionaryId = parser.get<int>("d");`
`236`		`- dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));`
	`236`	`+ dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));`
`237`	`237`	`}`
`238`	`238`	`else if (parser.has("cd")) {`
`239`	`239`	`FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {`
`138`	`138`	`aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);`
`139`	`139`	`if (parser.has("d")) {`
`140`	`140`	`int dictionaryId = parser.get<int>("d");`
`141`		`- dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));`
	`141`	`+ dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));`
`142`	`142`	`}`
`143`	`143`	`else if (parser.has("cd")) {`
`144`	`144`	`FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {`
`99`	`99`	`aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);`
`100`	`100`	`if (parser.has("d")) {`
`101`	`101`	`int dictionaryId = parser.get<int>("d");`
`102`		`- dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));`
	`102`	`+ dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));`
`103`	`103`	`}`
`104`	`104`	`else if (parser.has("cd")) {`
`105`	`105`	`FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ int main(int argc, char *argv[]) {`
`96`	`96`	`aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);`
`97`	`97`	`if (parser.has("d")) {`
`98`	`98`	`int dictionaryId = parser.get<int>("d");`
`99`		`- dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));`
	`99`	`+ dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));`
`100`	`100`	`}`
`101`	`101`	`else if (parser.has("cd")) {`
`102`	`102`	`FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ int main(int argc, char *argv[]) {`
`86`	`86`	`return 0;`
`87`	`87`	`}`
`88`	`88`
`89`		`- aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));`
	`89`	`+ aruco::Dictionary dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));`
`90`	`90`
`91`	`91`	`istringstream ss(idsString);`
`92`	`92`	`vector< string > splittedIds;`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ int main(int argc, char *argv[]) {`
`87`	`87`	`aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);`
`88`	`88`	`if (parser.has("d")) {`
`89`	`89`	`int dictionaryId = parser.get<int>("d");`
`90`		`- dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));`
	`90`	`+ dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));`
`91`	`91`	`}`
`92`	`92`	`else if (parser.has("cd")) {`
`93`	`93`	`FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) {`
`121`	`121`	`aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);`
`122`	`122`	`if (parser.has("d")) {`
`123`	`123`	`int dictionaryId = parser.get<int>("d");`
`124`		`- dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));`
	`124`	`+ dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));`
`125`	`125`	`}`
`126`	`126`	`else if (parser.has("cd")) {`
`127`	`127`	`FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ int main(int argc, char *argv[]) {`
`117`	`117`	`aruco::Dictionary dictionary = aruco::getPredefinedDictionary(0);`
`118`	`118`	`if (parser.has("d")) {`
`119`	`119`	`int dictionaryId = parser.get<int>("d");`
`120`		`- dictionary = aruco::getPredefinedDictionary(aruco::PREDEFINED_DICTIONARY(dictionaryId));`
	`120`	`+ dictionary = aruco::getPredefinedDictionary(aruco::PredefinedDictionaryType(dictionaryId));`
`121`	`121`	`}`
`122`	`122`	`else if (parser.has("cd")) {`
`123`	`123`	`FileStorage fs(parser.get<std::string>("cd"), FileStorage::READ);`