From 158b58a2e6fbb39ba05f722f4eca3652c6031749 Mon Sep 17 00:00:00 2001
From: tianxia798898 <849650215@qq.com>
Date: Wed, 20 Jul 2022 14:43:50 +0800
Subject: [PATCH 1/4] nothing
---
.idea/OpenCV-Python-Tutorial.iml | 12 ++++++
.idea/inspectionProfiles/Project_Default.xml | 18 +++++++++
.../inspectionProfiles/profiles_settings.xml | 6 +++
.idea/misc.xml | 4 ++
.idea/modules.xml | 8 ++++
.idea/vcs.xml | 6 +++
.idea/workspace.xml | 40 +++++++++++++++++++
...gr\345\244\232\351\200\232\351\201\223.py" | 1 +
8 files changed, 95 insertions(+)
create mode 100644 .idea/OpenCV-Python-Tutorial.iml
create mode 100644 .idea/inspectionProfiles/Project_Default.xml
create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
create mode 100644 .idea/misc.xml
create mode 100644 .idea/modules.xml
create mode 100644 .idea/vcs.xml
create mode 100644 .idea/workspace.xml
diff --git a/.idea/OpenCV-Python-Tutorial.iml b/.idea/OpenCV-Python-Tutorial.iml
new file mode 100644
index 00000000..8b8c3954
--- /dev/null
+++ b/.idea/OpenCV-Python-Tutorial.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..36267ef7
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,18 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 00000000..105ce2da
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..73c5b517
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..6e2d5cdb
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 00000000..f3ff96a5
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1658299384609
+
+
+ 1658299384609
+
+
+
+
\ No newline at end of file
diff --git "a/ch22-\347\233\264\346\226\271\345\233\276/hist-bgr\345\244\232\351\200\232\351\201\223.py" "b/ch22-\347\233\264\346\226\271\345\233\276/hist-bgr\345\244\232\351\200\232\351\201\223.py"
index ba3eeaec..572f6349 100755
--- "a/ch22-\347\233\264\346\226\271\345\233\276/hist-bgr\345\244\232\351\200\232\351\201\223.py"
+++ "b/ch22-\347\233\264\346\226\271\345\233\276/hist-bgr\345\244\232\351\200\232\351\201\223.py"
@@ -3,6 +3,7 @@
"""
create time:15-10-24 下午5:19
同时绘制多通道 BGR
+直方图
"""
import cv2
From 397b6fd8ae1f6087633279edf23ea33fa45ef123 Mon Sep 17 00:00:00 2001
From: tianxia798898 <849650215@qq.com>
Date: Tue, 20 Sep 2022 17:09:29 +0800
Subject: [PATCH 2/4] ok
---
.idea/workspace.xml | 96 ++++++++++++++++++++++++++++++++++++++++++---
README.md | 2 +-
2 files changed, 91 insertions(+), 7 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f3ff96a5..6cb1ed68 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,8 @@
-
+
+
@@ -20,12 +21,84 @@
- {
+ "keyToString": {
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true"
}
-}]]>
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -37,4 +110,15 @@
+
+
+
+
+ file://$PROJECT_DIR$/ch04-图片/4.1_imread_imshow.py
+ 18
+
+
+
+
+
\ No newline at end of file
diff --git a/README.md b/README.md
index 97aff671..2dd0218c 100755
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@
## 运行:官方samples/demo.py 会有很多有趣的例子,介绍你去了解OpenCV的功能。
-~~python 2.7 分支被废弃了,不再更新~~
+~~python 2.7 分支被废弃了,不再更新~~˙
~~# 添加了 Python3.6分支,
该分支是使用 opencv3.2+Python3.6~~
From 96760cd9a6dd8b8449b1244fbb9d20bd5d9c055b Mon Sep 17 00:00:00 2001
From: tianxia798898 <849650215@qq.com>
Date: Tue, 13 Dec 2022 15:31:25 +0800
Subject: [PATCH 3/4] test
test
---
.idea/workspace.xml | 106 +++++++++++++++---
.../.DS_Store" | Bin 0 -> 6148 bytes
2 files changed, 92 insertions(+), 14 deletions(-)
create mode 100644 "my02-\350\247\206\351\242\221-\345\257\271\350\261\241\350\267\237\350\270\252/.DS_Store"
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6cb1ed68..2fcef748 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,6 @@
-
@@ -13,6 +12,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -27,8 +41,8 @@
"RunOnceActivity.ShowReadmeOnStart": "true"
}
}
-
-
+
+
@@ -36,11 +50,11 @@
-
+
-
+
@@ -49,7 +63,7 @@
-
+
@@ -57,11 +71,11 @@
-
+
-
+
@@ -70,7 +84,7 @@
-
+
@@ -78,11 +92,53 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -93,9 +149,11 @@
-
-
-
+
+
+
+
+
@@ -118,6 +176,26 @@
18
+
+ file://$PROJECT_DIR$/my02-视频-对象跟踪/tracker.py
+ 15
+
+
+
+ file://$PROJECT_DIR$/ch49-计算摄影学-图像去噪/1-fastNlMeansDenoisingColored.py
+ 14
+
+
+
+ file://$PROJECT_DIR$/ch06-绘图函数/6.draw.py
+ 16
+
+
+
+ file://$PROJECT_DIR$/ch06-绘图函数/6.draw.py
+ 47
+
+
diff --git "a/my02-\350\247\206\351\242\221-\345\257\271\350\261\241\350\267\237\350\270\252/.DS_Store" "b/my02-\350\247\206\351\242\221-\345\257\271\350\261\241\350\267\237\350\270\252/.DS_Store"
new file mode 100644
index 0000000000000000000000000000000000000000..e03caf7b9317c14055abf7d87625bf9257fcf1e8
GIT binary patch
literal 6148
zcmeHKI|>3Z5S>vG!N$@uSMUZw^aOhW3q=G`P_*94b9pr1d>UQtw2?P3dC6p6LSC`6
zBO*G#tY;z<5gEY^sAlb|
WO>6_5j=0l-{24G^XjI_W3OoRHoE5VG
literal 0
HcmV?d00001
From 99e6194fecece8b31e32cebf4b05600e778db56e Mon Sep 17 00:00:00 2001
From: tianxia798898 <849650215@qq.com>
Date: Tue, 13 Dec 2022 21:53:42 +0800
Subject: [PATCH 4/4] Update workspace.xml
---
.idea/workspace.xml | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2fcef748..a56f76c5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -168,6 +168,17 @@
+
+
+