fix: 色変更関数の変数名などをわかりやすいようにした #60
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kathmandu777
requested changes
Sep 28, 2022
i-make/mode/base.py
Outdated
Comment on lines
193
to
202
|
|
||
| @classmethod | ||
| def get_choice_images_paths(cls): | ||
| """Get the paths to the images for the choices.""" | ||
| icon_file = cls.ICON_PATH.replace(cls.CHOICE_IMAGES_DIR_PATH, "").replace("/", "") | ||
| return [ | ||
| os.path.join(cls.CHOICE_IMAGES_DIR_PATH, file) | ||
| for file in os.listdir(cls.CHOICE_IMAGES_DIR_PATH) | ||
| if file.endswith(".png") and not file == icon_file | ||
| ] |
i-make/mode/base.py
Outdated
| @@ -142,23 +142,30 @@ def set_skin_color(self, hue: float, sat: float, val: float) -> None: | |||
| def _convert_image_color( | |||
| self, image: np.ndarray, hue: float, sat: float, val: float, include_alpha_ch: bool | |||
| ) -> np.ndarray: | |||
| """アルファチャンネル付きのRGB=(0,0,255)の画像の色を、指定したHSV数値の色に変更する. | |||
| """アルファチャンネル付きのHSV=(240,255,255)の画像の色を、指定したHSV数値の色に変更する. | |||
i-make/mode/base.py
Outdated
| hue (_type_): HSVのHueの数値 | ||
| sat (_type_): HSVのSaturationの数値 | ||
| val (_type_): HSVのValueの数値 | ||
| image (_type_): H:240 S:255 V:255で塗りつぶしたアルファチャンネルを含むメイク素材、1024x1024 |
i-make/mode/base.py
Outdated
Comment on lines
149
to
151
| hue (_type_): HSVのHueの数値(0~255) | ||
| sat (_type_): HSVのSaturationの数値(0~255) | ||
| val (_type_): HSVのValueの数値(0~255) |
There was a problem hiding this comment.
0~255で制限するならvalidationつけてもいいかも
範囲外でもおかしくならないならばそのままでも大丈夫
（たしかこの前口頭レビューしたところ）
i-make/mode/base.py
Outdated
Comment on lines
159
to
161
| DETECT_HUE_VAL = 120 | ||
| DETECT_SAT_VAL = 255 | ||
| NOT_DETECT_VAL_VAL = 0 |
There was a problem hiding this comment.
VAL_VAL になっちゃうから、最後のVALは不要です
There was a problem hiding this comment.
RGB=(0,0,255) ⇔ HSV=(120, 255, ?) っていう認識でいいかな？
それならば、
B255_HUE = 120
B255_SAT = 255
NO_CAHNGE_VAL = 0
みたいな感じ？？
認識違ったらごめん
kathmandu777
requested changes
Sep 28, 2022
i-make/mode/base.py
Outdated
| image_hsv[:, :, 0] = np.where(image_hsv[:, :, 0] == 120, hue / 2, image_hsv[:, :, 0]) | ||
| image_hsv[:, :, 1] = np.where(image_hsv[:, :, 1] == 255, sat, image_hsv[:, :, 1]) | ||
| image_hsv[:, :, 2] = np.where(image_hsv[:, :, 2] != 0, (val * (image_hsv[:, :, 2] / 255)), image_hsv[:, :, 2]) | ||
| if not ((0.0 <= hue <= 255) & (0.0 <= sat <= 255) & (0.0 <= val <= 255)): |
i-make/mode/base.py
Outdated
| image_hsv[:, :, 1] = np.where(image_hsv[:, :, 1] == 255, sat, image_hsv[:, :, 1]) | ||
| image_hsv[:, :, 2] = np.where(image_hsv[:, :, 2] != 0, (val * (image_hsv[:, :, 2] / 255)), image_hsv[:, :, 2]) | ||
| if not ((0.0 <= hue <= 255) & (0.0 <= sat <= 255) & (0.0 <= val <= 255)): | ||
| raise ValueError("Defferent range of values") |
There was a problem hiding this comment.
1個ずつ判定した方が、どの値が範囲外かわかるからいい気がする
|
@GoRuGoo |
|
最初のdocstring、ももさんがSとVが255であることを知らずにまちがえて素材作って、エラー出てますって動かしたときに連絡きたのでRGBよりHSVの方が良いと思うの自分だけですかね？ |
|
B255ってh120のs255ではない？ |
|
一応そうなんですけど、B255で伝えて間違ったものが帰ってきたので… |
|
プログラム的には、B255を変換しているので、そのままで行きましょう |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
わかりやすいようにしたつもりです
Issue number
Close #
How to check the revision
Points for Review
Remarks