Merge branch 'master' into 'main'HEADmain

abc

See merge request wujiating/detection!1

5 files changed, 292 insertions, 0 deletions

diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..abf7b39
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<project version="4">

+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />

+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..9d12d68
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<project version="4">

+  <component name="ProjectModuleManager">

+    <modules>

+      <module fileurl="file://$PROJECT_DIR$/.idea/traffic_detection.iml" filepath="$PROJECT_DIR$/.idea/traffic_detection.iml" />

+    </modules>

+  </component>

+</project>
\ No newline at end of file
diff --git a/.idea/traffic_detection.iml b/.idea/traffic_detection.iml
new file mode 100644
index 0000000..9574148
--- /dev/null
+++ b/.idea/traffic_detection.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<module type="PYTHON_MODULE" version="4">

+  <component name="NewModuleRootManager">

+    <content url="file://$MODULE_DIR$" />

+    <orderEntry type="inheritedJdk" />

+    <orderEntry type="sourceFolder" forTests="false" />

+  </component>

+  <component name="PyDocumentationSettings">

+    <option name="format" value="NUMPY" />

+    <option name="myDocStringFormat" value="NumPy" />

+  </component>

+  <component name="TestRunnerService">

+    <option name="PROJECT_TEST_RUNNER" value="pytest" />

+  </component>

+</module>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..43d9f87
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="68d8e881-254e-40fb-8414-dbbac0e911ab" name="Default Changelist" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Python Script" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectId" id="22LaiY9jAJNWnm5Q5LA2KF29dDN" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+  </component>
+  <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="C:\Users\JiaTing\PycharmProjects\traffic_detection_research_point_2" />
+      <recent name="C:\Users\JiaTing\PycharmProjects\traffic_detection_research_point_2\result" />
+      <recent name="C:\Users\JiaTing\PycharmProjects\traffic_detection_research_point_2\data\OW" />
+      <recent name="C:\Users\JiaTing\PycharmProjects\traffic_detection_research_point_2\data" />
+    </key>
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\JiaTing\PycharmProjects\traffic_detection_research_point_2" />
+      <recent name="C:\Users\JiaTing\PycharmProjects\traffic_detection_research_point_2\result" />
+    </key>
+  </component>
+  <component name="RunManager" selected="Python.一键抠图更换证件照背景色">
+    <configuration name="一键抠图更换证件照背景色" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="traffic_detection_research_point_2" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$USER_HOME$/Desktop/PhotoPs-master" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$USER_HOME$/Desktop/PhotoPs-master/一键抠图更换证件照背景色.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <configuration name="binary_cross" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="traffic_detection_research_point_2" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/binary_cross.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <configuration name="cdf" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="traffic_detection_research_point_2" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/cdf.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <configuration name="cicflow" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="traffic_detection_research_point_2" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/cicflow.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <configuration name="compute" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="traffic_detection_research_point_2" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/compute.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <configuration name="feature_extra" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+      <module name="traffic_detection_research_point_2" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="C:\Users\JiaTing\PycharmProjects\traffic_detection_research_point_2\feature_extra.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python.一键抠图更换证件照背景色" />
+        <item itemvalue="Python.cdf" />
+        <item itemvalue="Python.cicflow" />
+        <item itemvalue="Python.compute" />
+        <item itemvalue="Python.binary_cross" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="68d8e881-254e-40fb-8414-dbbac0e911ab" name="Default Changelist" comment="" />
+      <created>1639619448963</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1639619448963</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="WindowStateProjectService">
+    <state x="1770" y="360" key="#com.intellij.fileTypes.FileTypeChooser" timestamp="1640261101554">
+      <screen x="0" y="0" width="2752" height="1112" />
+    </state>
+    <state x="1770" y="360" key="#com.intellij.fileTypes.FileTypeChooser/[email protected]" timestamp="1640261101554" />
+    <state x="291" y="260" key="FileChooserDialogImpl" timestamp="1645423813428">
+      <screen x="0" y="0" width="1707" height="920" />
+    </state>
+    <state x="291" y="260" key="FileChooserDialogImpl/[email protected]" timestamp="1645423813428" />
+    <state x="469" y="314" key="FileChooserDialogImpl/[email protected]" timestamp="1640237417479" />
+    <state width="1685" height="167" key="GridCell.Tab.0.bottom" timestamp="1646222744747">
+      <screen x="0" y="0" width="1707" height="920" />
+    </state>
+    <state width="1685" height="167" key="GridCell.Tab.0.bottom/[email protected]" timestamp="1646222744747" />
+    <state width="1353" height="213" key="GridCell.Tab.0.bottom/[email protected]" timestamp="1640650083418" />
+    <state width="1685" height="167" key="GridCell.Tab.0.center" timestamp="1646222744746">
+      <screen x="0" y="0" width="1707" height="920" />
+    </state>
+    <state width="1685" height="167" key="GridCell.Tab.0.center/[email protected]" timestamp="1646222744746" />
+    <state width="1353" height="213" key="GridCell.Tab.0.center/[email protected]" timestamp="1640650083418" />
+    <state width="1685" height="167" key="GridCell.Tab.0.left" timestamp="1646222744746">
+      <screen x="0" y="0" width="1707" height="920" />
+    </state>
+    <state width="1685" height="167" key="GridCell.Tab.0.left/[email protected]" timestamp="1646222744746" />
+    <state width="1353" height="213" key="GridCell.Tab.0.left/[email protected]" timestamp="1640650083418" />
+    <state width="1685" height="167" key="GridCell.Tab.0.right" timestamp="1646222744747">
+      <screen x="0" y="0" width="1707" height="920" />
+    </state>
+    <state width="1685" height="167" key="GridCell.Tab.0.right/[email protected]" timestamp="1646222744747" />
+    <state width="1353" height="213" key="GridCell.Tab.0.right/[email protected]" timestamp="1640650083418" />
+    <state width="1685" height="300" key="GridCell.Tab.1.bottom" timestamp="1645580041977">
+      <screen x="0" y="0" width="1707" height="920" />
+    </state>
+    <state width="1685" height="300" key="GridCell.Tab.1.bottom/[email protected]" timestamp="1645580041977" />
+    <state width="1685" height="300" key="GridCell.Tab.1.center" timestamp="1645580041977">
+      <screen x="0" y="0" width="1707" height="920" />
+    </state>
+    <state width="1685" height="300" key="GridCell.Tab.1.center/[email protected]" timestamp="1645580041977" />
+    <state width="1685" height="300" key="GridCell.Tab.1.left" timestamp="1645580041977">
+      <screen x="0" y="0" width="1707" height="920" />
+    </state>
+    <state width="1685" height="300" key="GridCell.Tab.1.left/[email protected]" timestamp="1645580041977" />
+    <state width="1685" height="300" key="GridCell.Tab.1.right" timestamp="1645580041977">
+      <screen x="0" y="0" width="1707" height="920" />
+    </state>
+    <state width="1685" height="300" key="GridCell.Tab.1.right/[email protected]" timestamp="1645580041977" />
+    <state x="1726" y="248" width="672" height="678" key="search.everywhere.popup" timestamp="1640246580918">
+      <screen x="0" y="0" width="2752" height="1112" />
+    </state>
+    <state x="1726" y="248" width="672" height="678" key="search.everywhere.popup/[email protected]" timestamp="1640246580918" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/main.py</url>
+          <line>15</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/occ.py</url>
+          <line>171</line>
+          <option name="timeStamp" value="3" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" suspend="THREAD" type="python-line">
+          <url>file://$PROJECT_DIR$/occ.py</url>
+          <line>111</line>
+          <option name="timeStamp" value="4" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
+</project>
\ No newline at end of file