working
This commit is contained in:
5
.idea/JustTwerk.iml
generated
5
.idea/JustTwerk.iml
generated
@ -2,9 +2,12 @@
|
||||
<module type="PYTHON_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/.gpu" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/.gpu-3d" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/.venv" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/.venv1" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/.venv-2" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Python 3.14 virtualenv at C:\Users\Kajetan\PycharmProjects\JustTwerk\.venv-2" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
<component name="PyDocumentationSettings">
|
||||
|
||||
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@ -3,5 +3,5 @@
|
||||
<component name="Black">
|
||||
<option name="sdkName" value="Python 3.13 (JustTwerk)" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 virtualenv at C:\Users\Kajetan\PycharmProjects\JustTwerk\.gpu-3d" project-jdk-type="Python SDK" />
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.14 virtualenv at C:\Users\Kajetan\PycharmProjects\JustTwerk\.venv-2" project-jdk-type="Python SDK" />
|
||||
</project>
|
||||
122
.idea/workspace.xml
generated
122
.idea/workspace.xml
generated
@ -5,7 +5,12 @@
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="441a4e7b-d6ce-44cb-92c5-2f22f1b1874f" name="Changes" comment="working">
|
||||
<change afterPath="$PROJECT_DIR$/moves_dump.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/JustTwerk.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/JustTwerk.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/utils.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/video_methods.py" beforeDir="false" afterPath="$PROJECT_DIR$/video_methods.py" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
@ -32,46 +37,48 @@
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
||||
"Python.02_whole_body_from_image.executor": "Run",
|
||||
"Python.3d.executor": "Run",
|
||||
"Python.body3d.executor": "Run",
|
||||
"Python.body3d_pose_lifter_demo.executor": "Run",
|
||||
"Python.calculate.executor": "Run",
|
||||
"Python.checkpoint.executor": "Run",
|
||||
"Python.draw.executor": "Run",
|
||||
"Python.filter.executor": "Run",
|
||||
"Python.is_torch.executor": "Run",
|
||||
"Python.local_visualizer_3d.executor": "Run",
|
||||
"Python.main.executor": "Run",
|
||||
"Python.openpose.executor": "Run",
|
||||
"Python.receive_images.executor": "Run",
|
||||
"Python.receiver.executor": "Run",
|
||||
"Python.sender.executor": "Run",
|
||||
"Python.test.executor": "Run",
|
||||
"Python.ultralytics-test.executor": "Run",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
||||
"RunOnceActivity.git.unshallow": "true",
|
||||
"git-widget-placeholder": "main",
|
||||
"last_opened_file_path": "C:/Users/Kajetan/PycharmProjects/JustTwerk",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "configurable.group.editor",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
||||
"Python.02_whole_body_from_image.executor": "Run",
|
||||
"Python.3d.executor": "Run",
|
||||
"Python.body3d.executor": "Run",
|
||||
"Python.body3d_pose_lifter_demo.executor": "Run",
|
||||
"Python.calculate.executor": "Run",
|
||||
"Python.checkpoint.executor": "Run",
|
||||
"Python.draw.executor": "Run",
|
||||
"Python.filter.executor": "Run",
|
||||
"Python.is_torch.executor": "Run",
|
||||
"Python.local_visualizer_3d.executor": "Run",
|
||||
"Python.main.executor": "Run",
|
||||
"Python.moves_dump.executor": "Run",
|
||||
"Python.openpose.executor": "Run",
|
||||
"Python.receive_images.executor": "Run",
|
||||
"Python.receiver.executor": "Run",
|
||||
"Python.sender.executor": "Run",
|
||||
"Python.test.executor": "Run",
|
||||
"Python.ultralytics-test.executor": "Run",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
|
||||
"RunOnceActivity.git.unshallow": "true",
|
||||
"git-widget-placeholder": "main",
|
||||
"ignore.virus.scanning.warn.message": "true",
|
||||
"last_opened_file_path": "C:/Users/Kajetan/PycharmProjects/JustTwerk",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "configurable.group.editor",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}</component>
|
||||
}]]></component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="C:\Users\Kajetan\PycharmProjects\JustTwerk" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager" selected="Python.draw">
|
||||
<component name="RunManager" selected="Python.main">
|
||||
<configuration name="draw" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
|
||||
<module name="JustTwerk" />
|
||||
<option name="ENV_FILES" value="" />
|
||||
@ -95,6 +102,29 @@
|
||||
<option name="INPUT_FILE" value="" />
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<configuration name="main" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
|
||||
<module name="JustTwerk" />
|
||||
<option name="ENV_FILES" value="" />
|
||||
<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" />
|
||||
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
|
||||
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/main.py" />
|
||||
<option name="PARAMETERS" value="cam" />
|
||||
<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="test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
|
||||
<module name="JustTwerk" />
|
||||
<option name="ENV_FILES" value="" />
|
||||
@ -120,6 +150,7 @@
|
||||
</configuration>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="Python.main" />
|
||||
<item itemvalue="Python.draw" />
|
||||
<item itemvalue="Python.test" />
|
||||
</list>
|
||||
@ -128,8 +159,8 @@
|
||||
<component name="SharedIndexes">
|
||||
<attachedChunks>
|
||||
<set>
|
||||
<option value="bundled-js-predefined-d6986cc7102b-e03c56caf84a-JavaScript-PY-252.23892.515" />
|
||||
<option value="bundled-python-sdk-7e47963ff851-f0eec537fc84-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-252.23892.515" />
|
||||
<option value="bundled-js-predefined-d6986cc7102b-3aa1da707db6-JavaScript-PY-252.27397.106" />
|
||||
<option value="bundled-python-sdk-4e2b1448bda8-9a97661f3031-com.jetbrains.pycharm.pro.sharedIndexes.bundled-PY-252.27397.106" />
|
||||
</set>
|
||||
</attachedChunks>
|
||||
</component>
|
||||
@ -150,7 +181,9 @@
|
||||
<workItem from="1756053672258" duration="16821000" />
|
||||
<workItem from="1756216787734" duration="969000" />
|
||||
<workItem from="1756632365037" duration="26000" />
|
||||
<workItem from="1757522631129" duration="2261000" />
|
||||
<workItem from="1757522631129" duration="3558000" />
|
||||
<workItem from="1764254526843" duration="634000" />
|
||||
<workItem from="1764255184384" duration="6392000" />
|
||||
</task>
|
||||
<task id="LOCAL-00001" summary="initial commit">
|
||||
<option name="closed" value="true" />
|
||||
@ -184,7 +217,15 @@
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1757526984452</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="5" />
|
||||
<task id="LOCAL-00005" summary="working">
|
||||
<option name="closed" value="true" />
|
||||
<created>1757527150056</created>
|
||||
<option name="number" value="00005" />
|
||||
<option name="presentableId" value="LOCAL-00005" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1757527150056</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="6" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
@ -196,7 +237,7 @@
|
||||
<option name="LAST_COMMIT_MESSAGE" value="working" />
|
||||
</component>
|
||||
<component name="com.intellij.coverage.CoverageDataManagerImpl">
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$main.coverage" NAME="main Coverage Results" MODIFIED="1756143599014" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$main.coverage" NAME="main Coverage Results" MODIFIED="1764275198914" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$receiver.coverage" NAME="receiver Coverage Results" MODIFIED="1756142451233" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$filter.coverage" NAME="filter Coverage Results" MODIFIED="1755972211046" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$body3d_pose_lifter_demo.coverage" NAME="body3d_pose_lifter_demo Coverage Results" MODIFIED="1755937235510" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/mmpose/demo" />
|
||||
@ -210,8 +251,9 @@
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$draw.coverage" NAME="draw Coverage Results" MODIFIED="1756053706980" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$ultralytics_test.coverage" NAME="ultralytics-test Coverage Results" MODIFIED="1756116377896" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$3d.coverage" NAME="3d Coverage Results" MODIFIED="1756027604884" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$moves_dump.coverage" NAME="moves_dump Coverage Results" MODIFIED="1764275034611" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$local_visualizer_3d.coverage" NAME="local_visualizer_3d Coverage Results" MODIFIED="1755937454029" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/.gpu/Lib/site-packages/mmpose/visualization" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$is_torch.coverage" NAME="is_torch Coverage Results" MODIFIED="1755943611769" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$is_torch.coverage" NAME="is_torch Coverage Results" MODIFIED="1764256054151" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
<SUITE FILE_PATH="coverage/JustTwerk$test.coverage" NAME="test Coverage Results" MODIFIED="1756025632346" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
|
||||
</component>
|
||||
</project>
|
||||
15
main.py
15
main.py
@ -5,8 +5,10 @@ from ultralytics import YOLO
|
||||
import cv2
|
||||
import time
|
||||
|
||||
import utils
|
||||
from calculate import normalize_pose, compare_poses_boolean
|
||||
from draw import draw_new
|
||||
from utils import find_closest
|
||||
from video_methods import initialize_method
|
||||
|
||||
model = YOLO("yolo11x-pose.pt")
|
||||
@ -51,6 +53,8 @@ def main():
|
||||
for i, move in enumerate(moves):
|
||||
moves[i] = (move[0] - startValue, move[1], move[2])
|
||||
|
||||
print(moves)
|
||||
|
||||
while True:
|
||||
frame = method.receive_frame()
|
||||
|
||||
@ -74,9 +78,11 @@ def main():
|
||||
img = frame
|
||||
|
||||
normalized = normalize_pose(result.keypoints.xy.cpu().numpy()[0])
|
||||
cv2.imshow('you', draw_new(result.keypoints.xy.cpu()[0]))
|
||||
|
||||
if currTimeIndex != 0 and moves.index(find_closest(time.time() - currTimeIndex)) == len(moves) - 1:
|
||||
draw = utils.normalize(result.keypoints.xy.cpu().numpy()[0])
|
||||
cv2.imshow('you', draw_new(draw * 100 + 100))
|
||||
|
||||
if currTimeIndex != 0 and moves.index(find_closest(moves, time.time() - currTimeIndex)) == len(moves) - 1:
|
||||
mehCount = totalCount - failCount - goodCount
|
||||
|
||||
print(
|
||||
@ -96,7 +102,7 @@ def main():
|
||||
else:
|
||||
changed = False
|
||||
|
||||
closest = find_closest(time.time() - currTimeIndex)
|
||||
closest = find_closest(moves, time.time() - currTimeIndex)
|
||||
cv2.imshow('Dots', draw_new(closest[2]))
|
||||
|
||||
if abs((time.time() - currTimeIndex) - moves[currIndex][0]) > failRate:
|
||||
@ -130,7 +136,8 @@ def main():
|
||||
# moves.append((time.time() - startTime, normalize_pose(result.keypoints.xy.cpu().numpy()[0]), result.keypoints.xy.cpu()[0]))
|
||||
# elif len(moves) != 0:
|
||||
# with open('moves.pkl', 'wb') as f: # 'wb' = write binary
|
||||
# pickle.dump(moves, f)
|
||||
# pickle.dump
|
||||
# (moves, f)
|
||||
#
|
||||
# exit(1)
|
||||
|
||||
|
||||
42
moves_dump.py
Normal file
42
moves_dump.py
Normal file
@ -0,0 +1,42 @@
|
||||
import json
|
||||
import pickle
|
||||
import time
|
||||
|
||||
import cv2
|
||||
import numpy as np
|
||||
|
||||
import utils
|
||||
from draw import draw_new
|
||||
|
||||
moves = []
|
||||
better_moves = {}
|
||||
|
||||
with open('moves.pkl', 'rb') as f: # 'rb' = read binary
|
||||
moves = pickle.load(f)
|
||||
|
||||
startValue = moves[0][0]
|
||||
totalCount = len(moves)
|
||||
|
||||
for i, move in enumerate(moves):
|
||||
moves[i] = (move[0] - startValue, move[1], move[2])
|
||||
|
||||
# left_hip = move[2][11] # Left Hip
|
||||
# right_hip = move[2][12] # Right Hip
|
||||
# center = (left_hip + right_hip) / 2
|
||||
#
|
||||
# # Normalizacja względem środka ciała
|
||||
# normalized_keypoints = move[2] - center
|
||||
#
|
||||
# better_moves[round((move[0] - startValue) * 1000)] = normalized_keypoints.tolist()
|
||||
#
|
||||
# # scale = utils.distance(move[2][11], move[2][12])
|
||||
# # print(scale)
|
||||
# draw = normalized_keypoints + 200
|
||||
|
||||
|
||||
# Do rysowania (np. przesunięcie na ekran)
|
||||
draw = utils.normalize(move[2])
|
||||
|
||||
cv2.imshow('you', draw_new(draw))
|
||||
cv2.waitKey(1)
|
||||
time.sleep(0.1)
|
||||
25
utils.py
25
utils.py
@ -1,3 +1,5 @@
|
||||
import math
|
||||
|
||||
import cv2
|
||||
import numpy as np
|
||||
|
||||
@ -10,8 +12,27 @@ def recvall(sock, n):
|
||||
data += packet
|
||||
return data
|
||||
|
||||
def find_closest(target):
|
||||
global moves
|
||||
def distance(p1, p2):
|
||||
return math.sqrt((p2[0] - p1[0])**2 + (p2[1] - p1[1])**2)
|
||||
|
||||
def normalize(move):
|
||||
left_hip = move[11] # Left Hip
|
||||
right_hip = move[12] # Right Hip
|
||||
|
||||
center = (left_hip + right_hip) / 2
|
||||
|
||||
normalized_keypoints = move - center
|
||||
distances = np.linalg.norm(normalized_keypoints[:, :2], axis=1)
|
||||
max_dist = np.max(distances)
|
||||
|
||||
if max_dist > 0:
|
||||
normalized_keypoints[:, :2] /= max_dist
|
||||
|
||||
draw = normalized_keypoints[:, :2]
|
||||
|
||||
return draw
|
||||
|
||||
def find_closest(moves, target):
|
||||
return min(moves, key=lambda t: abs(t[0] - target))
|
||||
|
||||
def resize_with_padding(image, target_size=(640, 640)):
|
||||
|
||||
@ -34,7 +34,7 @@ class Method:
|
||||
self.start_time = time.time()
|
||||
|
||||
def receive_frame(self):
|
||||
if self.method_type is "cam":
|
||||
if self.method_type == "cam":
|
||||
_, frame = self.cap.read()
|
||||
|
||||
if not _:
|
||||
|
||||
Reference in New Issue
Block a user