change dress.html,css,js. add clothes_data

.gitignore

@@ -142,10 +142,10 @@ src/DressApp/dress_lib/images/*/*.png
 src/DressApp/dress_lib/materials/*/*.png
 src/DressApp/dress_lib/images/*/*.JPG
 src/DressApp/dress_lib/materials/*/*.JPG
-media/human_img/*.png
-media/human_img/*.JPG
-media/dress_images/*.png
-media/cut_images/*.png
+src/media/human_img/*.png
+src/media/human_img/*.JPG
+src/media/dress_images/*.png
+src/media/cut_images/*.png
 
 # json
 src/DressApp/dress_lib/materials/*/*.json

src/DressApp/dress_lib/clothes_datas/clothes_on_top/model_10/model_10.json

@@ -0,0 +1,11 @@
+{
+    "neck": {"right_point":[49,6],"left_point":[97,3],"height":[72,27]},
+    "right_shoulder": [45,15],
+    "right_elbow": [29,116],
+    "right_wrist": [16,190],
+    "left_shoulder": [155,15],
+    "left_elbow": [172,124],
+    "left_wrist": [184,195],
+    "right_arm": {"right_elbow":[24,133]},
+    "left_arm": {"left_elbow":[40,126]}
+}

src/DressApp/dress_lib/clothes_datas/clothes_on_top/model_6/model_6.json

@@ -0,0 +1,11 @@
+{
+    "neck": {"right_point":[68,36],"left_point":[259,43],"height":[170,84]},
+    "right_shoulder": [114,70],
+    "right_elbow": [65,305],
+    "right_wrist": [30,500],
+    "left_shoulder": [374,74],
+    "left_elbow": [414,320],
+    "left_wrist": [462,497],
+    "right_arm": {"right_elbow":[70,322]},
+    "left_arm": {"left_elbow":[118,317]}
+}

src/DressApp/dress_lib/clothes_datas/clothes_on_top/model_7/model_7.json

@@ -0,0 +1,11 @@
+{
+    "neck": {"right_point":[48,4],"left_point":[112,4],"height":[80,35]},
+    "right_shoulder": [45,19],
+    "right_elbow": [19,133],
+    "right_wrist": [25,200],
+    "left_shoulder": [160,20],
+    "left_elbow": [180,135],
+    "left_wrist": [178,223],
+    "right_arm": {"right_elbow":[17,144]},
+    "left_arm": {"left_elbow":[40,146]}
+}

src/DressApp/dress_lib/clothes_datas/clothes_on_top/model_8/model_8.json

@@ -0,0 +1,11 @@
+{
+    "neck": {"right_point":[19,11],"left_point":[113,16],"height":[69,50]},
+    "right_shoulder": [40,36],
+    "right_elbow": [19,139],
+    "right_wrist": [27,215],
+    "left_shoulder": [160,36],
+    "left_elbow": [178,143],
+    "left_wrist": [175,218],
+    "right_arm": {"right_elbow":[18,149]},
+    "left_arm": {"left_elbow":[53,150]}
+}

src/DressApp/dress_lib/clothes_datas/clothes_on_top/model_9/model_9.json

@@ -0,0 +1,11 @@
+{
+    "neck": {"right_point":[215,122],"left_point":[539,119],"height":[370,284]},
+    "right_shoulder": [223,201],
+    "right_elbow": [101,801],
+    "right_wrist": [121,1218],
+    "left_shoulder": [820,201],
+    "left_elbow": [905,912],
+    "left_wrist": [912,1220],
+    "right_arm": {"right_elbow":[106,734]},
+    "left_arm": {"left_elbow":[192,798]}
+}

src/DressApp/log.txt

@@ -1,31 +1,16 @@
 form.is_valid() = True
-{'human_name': '松田雄飛', 'height': 178, 'picture': <TemporaryUploadedFile: IMG_0137.png (image/png)>}
-91
-松田雄飛
-178
-IMG_0137.png
+{'human_name': '鈴木涼介', 'height': 165, 'picture': <TemporaryUploadedFile: IMG_0163.png (image/png)>}
+2
+鈴木涼介
+165
+IMG_0163.png
 <class 'django.db.models.fields.files.ImageFieldFile'>
-topProc_time:0.5612227916717529[sec]
-tf.keras.preprocessing.image.array_to_img(alpha_img, scale=True)
-(255, 255, 255, 0)
-imgProc_time:75.56257796287537[sec]
-91
-/media/cut_images/IMG_0137.png
-./DressApp/dress_lib/materials/part_segms/IMG_0137.png
-./DressApp/dress_lib/materials/skeleton_jsons/IMG_0137.json
-imgProc_time:75.56257796287537[sec]
-bottom_time:0.09531474113464355[sec]
-elapsed_time:76.22654676437378[sec]
----point error---
-Traceback (most recent call last):
-  File "./DressApp/views.py", line 192, in select_clothes
-    result_img,brank_img = clothes_on_top.change(actual_img,human_segm,candidate,clothes_name)
-  File "./DressApp/dress_lib/change_clothes_lib/clothes_on_top.py", line 789, in change
-    brank_img = torso_change(brank_img,human_segm,candidate,model_name,json_data)
-  File "./DressApp/dress_lib/change_clothes_lib/clothes_on_top.py", line 278, in torso_change
-    brank_img = adjust_torso_rotate(brank_img,human_segm,torso_img,neck_point_mask,shoulder_formed_angle,json_data,neck_max_width_point,neck_min_width_point)
-  File "./DressApp/dress_lib/change_clothes_lib/clothes_on_top.py", line 246, in adjust_torso_rotate
-    brank = cv2.resize(brank,dsize=((human_max_x-human_min_x), 1))#ここで人物部位セグム画像の胴体xサイズにリサイズ
-cv2.error: OpenCV(4.5.4) /tmp/pip-req-build-3129w7z7/opencv/modules/core/src/matrix.cpp:466: error: (-215:Assertion failed) _step >= minstep in function 'Mat'
-
-
+topProc_time:0.8832082748413086[sec]
+imgProc_time:52.20853877067566[sec]
+2
+/media/cut_images/IMG_0163.png
+./DressApp/dress_lib/materials/part_segms/IMG_0163.png
+./DressApp/dress_lib/materials/skeleton_jsons/IMG_0163.json
+imgProc_time:52.20853877067566[sec]
+bottom_time:0.10111641883850098[sec]
+elapsed_time:53.19682168960571[sec]

src/DressApp/static/backup_dress.css

@@ -0,0 +1,225 @@
+body{
+    margin:0px
+}
+#main_frame{
+    height:796px;
+    min-width:600px;
+    background-color: black;
+    overflow: hidden;
+}
+#sub_frame{
+    height:796px;
+    width:100%;
+}
+#sub_left{
+    display:inline-block;
+    height:796px;
+    width:66%;
+    max-width:796px;
+    overflow:hidden;
+    /*background-image:url("../img/dress2.jpeg");
+    background-size: cover;*/
+}
+#sub_right{
+    position:relative;
+    left:-1px;
+    display:inline-block;
+    height:796px;
+    width:calc(33% + 0px);
+    overflow: scroll;
+    vertical-align: top;
+}
+#dress_back{
+    position:relative;
+    top:0px;
+    left:calc(-398px + 100% / 2);
+    z-index:1;
+    height:100%;
+}
+#user_img_box{
+    position:relative;
+    z-index:2;
+    height:90%;
+    width:100%;
+    top:-796px;
+    text-align: center;
+    display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.model{
+    width:100%;
+    padding-top:100%;
+    border-top: 1px solid white;
+    background-color: black;
+}
+.model_have{
+    border-top: 1px solid white;
+    width:100%;
+    text-align: center;
+}
+/*
+#down{
+    border-bottom: 1px solid white;
+}*/
+.model_img{
+    width:99%;
+    height:auto;
+    vertical-align:bottom;
+}
+.icon{
+    position:relative;
+    z-index:3;
+    top:-1493px;
+    left:calc(-68px + 100%);
+
+    width:60px;
+    height:53px;
+    padding-top:7px;
+    overflow: hidden;
+
+    /*border: 1px solid black;*/
+    background-color: white;
+    border-radius:10px;
+    text-align: center;
+}
+#human_icon{
+    width:80%;
+    height:auto;
+}
+.hide_flag{
+    visibility: hidden;
+}
+.visible_flag{
+    visibility: visible;
+}
+.none_flag{
+    display:none !important;
+}
+#asset_form{
+    position:relative;
+    z-index:5;
+    top:-560px;
+    left:calc(50% - 300px);
+
+    height:300px;
+    width:600px;
+    padding-top: 50px;
+
+    border-radius: 30px;
+    background-color: white;
+}
+.avater_icon{
+    display:inline-block;
+    height:300px;
+    margin-left: 56px;
+}
+.avater_text{
+    font-size: 28px;
+    text-align: center;
+}
+#human_plus_icon{
+    height:73%;
+}
+#human_already_icon{
+    height:73%;
+}
+
+#file_form{
+    position:relative;
+    z-index:6;
+    top:-540px;
+    left:calc(50% - 300px);
+
+    height:700px;
+    width:600px;
+    padding: 15px 15px 15px 15px;
+
+    background-color: white;
+}
+#send_next_butt{
+    margin-top:10px;
+    margin-bottom:10px;
+}
+#file_look{
+    text-align: center;
+    width:100%;
+    height: 500px
+}
+.road_img{
+    height:100%;
+}
+
+#avater_select_form{
+    position:relative;
+    z-index:6;
+    top:-340px;
+    left:calc(50% - 315px);
+
+    height:350px;
+    width:600px;
+    padding: 15px 15px 15px 15px;
+
+    background-color: white;
+}
+#select_img_contents{
+    height:320px;
+    width:calc(100% - 30px);
+    padding-left:15px;
+    padding-right:15px;
+    overflow-x: scroll;
+}
+.cut_img_contant{
+    display: inline-block;
+    height:100%;
+    width:270px;
+    text-align: center;
+}
+.cut_img{
+    height: 270px;
+    width:auto;
+}
+.cut_img_name{
+    margin:0px 0px 0px 0px;
+}
+/*
+#cambus_form{
+    position:relative;
+    z-index:6;
+    top:-540px;
+    left:calc(50% - 300px);
+
+    height:700px;
+    width:600px;
+    padding: 15px 15px 15px 15px;
+
+    background-color: white;
+
+}
+#pointting_command_text{
+    border:1px solid black;
+}
+#cambus{
+    height:80%;
+    background-color: white;
+    text-align: center;
+}
+#cut_out_img{
+    height:100%;
+}*/
+
+#black_pocket{
+    height:0px;
+    width:100%;
+}
+#black_mask{
+    position:relative;
+    top:-1148px;
+    height:796px;
+    width:100%;
+    background-color: black;
+    opacity: 0.5;
+}
+.black_layer_4{
+    z-index:4;
+}