Compare commits
No commits in common. "fe3f81b0cb4c91b111764509e687eb4d3702306d" and "4916198aab81339705dfadff2185e52ee1e46bd1" have entirely different histories.
fe3f81b0cb
...
4916198aab
@ -1,23 +1,24 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="main (check)" type="PythonConfigurationType" factoryName="Python">
|
<configuration default="false" name="main (check)" type="PythonConfigurationType" factoryName="Python">
|
||||||
<module name="VideoAnalysis" />
|
<module name="VideoAnalysis-dnn"/>
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
<option name="INTERPRETER_OPTIONS" value=""/>
|
||||||
<option name="PARENT_ENVS" value="true" />
|
<option name="PARENT_ENVS" value="true"/>
|
||||||
<envs>
|
<envs>
|
||||||
<env name="PYTHONUNBUFFERED" value="1" />
|
<env name="PYTHONUNBUFFERED" value="1"/>
|
||||||
</envs>
|
</envs>
|
||||||
<option name="SDK_HOME" value="" />
|
<option name="SDK_HOME" value=""/>
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"/>
|
||||||
<option name="IS_MODULE_SDK" value="true" />
|
<option name="IS_MODULE_SDK" value="true"/>
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
<option name="ADD_CONTENT_ROOTS" value="true"/>
|
||||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
<option name="ADD_SOURCE_ROOTS" value="true"/>
|
||||||
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
|
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py"/>
|
||||||
<option name="PARAMETERS" value="5cc5570b-6ed9-3b33-9db4-bdb8ecb9f890 "test-data/lectionAudi/2021-03-12 13-51-07.JPG"" />
|
<option name="PARAMETERS"
|
||||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
value="2d147dcb-9c45-310b-a3ae-67d35a141755 "test-data/lectionAudi/2021-03-12 13-51-07.JPG""/>
|
||||||
<option name="EMULATE_TERMINAL" value="false" />
|
<option name="SHOW_COMMAND_LINE" value="false"/>
|
||||||
<option name="MODULE_MODE" value="false" />
|
<option name="EMULATE_TERMINAL" value="false"/>
|
||||||
<option name="REDIRECT_INPUT" value="false" />
|
<option name="MODULE_MODE" value="false"/>
|
||||||
<option name="INPUT_FILE" value="" />
|
<option name="REDIRECT_INPUT" value="false"/>
|
||||||
<method v="2" />
|
<option name="INPUT_FILE" value=""/>
|
||||||
|
<method v="2"/>
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
@ -1,23 +1,24 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="main (empty)" type="PythonConfigurationType" factoryName="Python">
|
<configuration default="false" name="main (empty)" type="PythonConfigurationType" factoryName="Python">
|
||||||
<module name="VideoAnalysis" />
|
<module name="VideoAnalysis-dnn"/>
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
<option name="INTERPRETER_OPTIONS" value=""/>
|
||||||
<option name="PARENT_ENVS" value="true" />
|
<option name="PARENT_ENVS" value="true"/>
|
||||||
<envs>
|
<envs>
|
||||||
<env name="PYTHONUNBUFFERED" value="1" />
|
<env name="PYTHONUNBUFFERED" value="1"/>
|
||||||
</envs>
|
</envs>
|
||||||
<option name="SDK_HOME" value="" />
|
<option name="SDK_HOME" value=""/>
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"/>
|
||||||
<option name="IS_MODULE_SDK" value="true" />
|
<option name="IS_MODULE_SDK" value="true"/>
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
<option name="ADD_CONTENT_ROOTS" value="true"/>
|
||||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
<option name="ADD_SOURCE_ROOTS" value="true"/>
|
||||||
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
|
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py"/>
|
||||||
<option name="PARAMETERS" value="5cc5570b-6ed9-3b33-9db4-bdb8ecb9f890 "test-data/lectionAudi/2021-03-12 13-49-32.JPG"" />
|
<option name="PARAMETERS"
|
||||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
value="2d147dcb-9c45-310b-a3ae-67d35a141755 "test-data/lectionAudi/2021-03-12 13-49-32.JPG""/>
|
||||||
<option name="EMULATE_TERMINAL" value="false" />
|
<option name="SHOW_COMMAND_LINE" value="false"/>
|
||||||
<option name="MODULE_MODE" value="false" />
|
<option name="EMULATE_TERMINAL" value="false"/>
|
||||||
<option name="REDIRECT_INPUT" value="false" />
|
<option name="MODULE_MODE" value="false"/>
|
||||||
<option name="INPUT_FILE" value="" />
|
<option name="REDIRECT_INPUT" value="false"/>
|
||||||
<method v="2" />
|
<option name="INPUT_FILE" value=""/>
|
||||||
|
<method v="2"/>
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
@ -1,23 +1,24 @@
|
|||||||
<component name="ProjectRunConfigurationManager">
|
<component name="ProjectRunConfigurationManager">
|
||||||
<configuration default="false" name="main (not empty)" type="PythonConfigurationType" factoryName="Python">
|
<configuration default="false" name="main (not empty)" type="PythonConfigurationType" factoryName="Python">
|
||||||
<module name="VideoAnalysis" />
|
<module name="VideoAnalysis-dnn"/>
|
||||||
<option name="INTERPRETER_OPTIONS" value="" />
|
<option name="INTERPRETER_OPTIONS" value=""/>
|
||||||
<option name="PARENT_ENVS" value="true" />
|
<option name="PARENT_ENVS" value="true"/>
|
||||||
<envs>
|
<envs>
|
||||||
<env name="PYTHONUNBUFFERED" value="1" />
|
<env name="PYTHONUNBUFFERED" value="1"/>
|
||||||
</envs>
|
</envs>
|
||||||
<option name="SDK_HOME" value="" />
|
<option name="SDK_HOME" value=""/>
|
||||||
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$"/>
|
||||||
<option name="IS_MODULE_SDK" value="true" />
|
<option name="IS_MODULE_SDK" value="true"/>
|
||||||
<option name="ADD_CONTENT_ROOTS" value="true" />
|
<option name="ADD_CONTENT_ROOTS" value="true"/>
|
||||||
<option name="ADD_SOURCE_ROOTS" value="true" />
|
<option name="ADD_SOURCE_ROOTS" value="true"/>
|
||||||
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
|
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py"/>
|
||||||
<option name="PARAMETERS" value="5cc5570b-6ed9-3b33-9db4-bdb8ecb9f890 "test-data/lectionAudi/2021-03-12 13-48-31.JPG"" />
|
<option name="PARAMETERS"
|
||||||
<option name="SHOW_COMMAND_LINE" value="false" />
|
value="2d147dcb-9c45-310b-a3ae-67d35a141755 "test-data/lectionAudi/2021-03-12 13-48-31.JPG""/>
|
||||||
<option name="EMULATE_TERMINAL" value="false" />
|
<option name="SHOW_COMMAND_LINE" value="false"/>
|
||||||
<option name="MODULE_MODE" value="false" />
|
<option name="EMULATE_TERMINAL" value="false"/>
|
||||||
<option name="REDIRECT_INPUT" value="false" />
|
<option name="MODULE_MODE" value="false"/>
|
||||||
<option name="INPUT_FILE" value="" />
|
<option name="REDIRECT_INPUT" value="false"/>
|
||||||
<method v="2" />
|
<option name="INPUT_FILE" value=""/>
|
||||||
|
<method v="2"/>
|
||||||
</configuration>
|
</configuration>
|
||||||
</component>
|
</component>
|
12
main.py
12
main.py
@ -22,6 +22,7 @@ def analyse_file(uid, image_path):
|
|||||||
raise Exception(f'Изображение {image_path} не существует')
|
raise Exception(f'Изображение {image_path} не существует')
|
||||||
model = torch.hub.load('ultralytics/yolov5', 'yolov5s', pretrained=True)
|
model = torch.hub.load('ultralytics/yolov5', 'yolov5s', pretrained=True)
|
||||||
model.names = neuralNetwork.rename_entity(model.names)
|
model.names = neuralNetwork.rename_entity(model.names)
|
||||||
|
list_sqwrl = ontologyWorking.get_list_sqwrl(uid, url)
|
||||||
|
|
||||||
results = model(imageWorking.get_image_as_array(image_path))
|
results = model(imageWorking.get_image_as_array(image_path))
|
||||||
object_properties = list()
|
object_properties = list()
|
||||||
@ -45,16 +46,15 @@ def analyse_file(uid, image_path):
|
|||||||
'QueryGetCheck': '',
|
'QueryGetCheck': '',
|
||||||
'QueryGetEmpty': ''
|
'QueryGetEmpty': ''
|
||||||
}
|
}
|
||||||
params = '&'.join([f'names={query}' for query in result.keys()])
|
for sqwrl in list_sqwrl['response']:
|
||||||
response = requests.post(url + f'{uid}/query/multi?{params}', json=data).json()
|
response = requests.post(url + f'{uid}/query/{sqwrl["name"]}', json=data).json()
|
||||||
if response['error']:
|
if response['error']:
|
||||||
raise Exception(response['error'])
|
raise Exception(response['error'])
|
||||||
for query in response['response']:
|
result[sqwrl['name']] = [resultSQWRL['name']['value'] for resultSQWRL in response['response']['rows']]
|
||||||
result[query] = [resultSQWRL['name']['value'] for resultSQWRL in response['response'][query]['rows']]
|
print(f'Запрос {sqwrl["name"]} выполнен')
|
||||||
print(f'Запрос выполнен')
|
|
||||||
|
|
||||||
print()
|
print()
|
||||||
print('Результат:')
|
print('Результаты')
|
||||||
if result['QueryGetNotEmpty']:
|
if result['QueryGetNotEmpty']:
|
||||||
print('Аудитория занята')
|
print('Аудитория занята')
|
||||||
elif result['QueryGetCheck']:
|
elif result['QueryGetCheck']:
|
||||||
|
@ -9,6 +9,10 @@ def is_ontology_exists(uid, url):
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def get_list_sqwrl(uid, url):
|
||||||
|
return requests.get(url + f'{uid}/query/', verify=False).json()
|
||||||
|
|
||||||
|
|
||||||
def get_entity_square(results_ndarray_i):
|
def get_entity_square(results_ndarray_i):
|
||||||
square = float((results_ndarray_i[2] - results_ndarray_i[0]) *
|
square = float((results_ndarray_i[2] - results_ndarray_i[0]) *
|
||||||
(results_ndarray_i[3] - results_ndarray_i[1]))
|
(results_ndarray_i[3] - results_ndarray_i[1]))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user