Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle hairline #169

Merged
merged 3 commits into from
Mar 5, 2024
Merged

Handle hairline #169

merged 3 commits into from
Mar 5, 2024

Conversation

bordoray
Copy link
Collaborator

@bordoray bordoray commented Mar 5, 2024

Issue

close #167

変更内容:Description

テスト手順:Test

  • Make hairline on point , line and polygon layer and export json

Summary by CodeRabbit

  • 新機能
    • fill.pyおよびline.pyモジュールでconvert_to_point関数をget_stroke_width_pt関数に置き換えました。
    • line.pyto_rgba関数のインポートをto_rgba, get_stroke_width_ptに置き換えました。
    • marker.pytranslator.vector.symbol.utilsからget_stroke_width_pt関数を追加しました。
  • リファクタ
    • get_stroke_width_pt関数を導入して、ライン幅をポイント単位で計算するようにしました。

@bordoray bordoray requested a review from Kanahiro March 5, 2024 02:12
Copy link

coderabbitai bot commented Mar 5, 2024

Walkthrough

translator/vector/symbolディレクトリ内の複数のファイルが変更されました。主な変更点は、convert_to_point関数の削除と、新しいget_stroke_width_pt関数の導入に関連しています。これにより、ポリゴンシンボルと線シンボルのアウトライン幅の処理が改善されました。また、QGISのマップキャンバス上で見える「非常に細い線」が、Illustratorでインポートした際にも正しく表示されるようになりました。

Changes

ファイル 変更内容
.../symbol/fill.py, .../symbol/line.py convert_to_point関数の削除とget_stroke_width_pt関数の導入。line.pyではto_rgbaのインポートをto_rgba, get_stroke_width_ptに変更。
.../symbol/marker.py get_stroke_width_pt関数を使用してoutline_widthの計算を更新。

Assessment against linked issues

Objective Addressed Explanation
#167: Fix hairline width -> 0

Poem

🐰✨
細い線、心は広く
変更の風、新たな光を当てる
コードのうさぎ、喜びに飛び跳ねる
Illustratorも見逃さず抱く
細い線の誓い、永遠に変わらず
🌟🌿


Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit-tests for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit tests for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit tests.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • The JSON schema for the configuration file is available here.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review Status

Actionable comments generated: 0

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between eeac579 and f5e4c3e.
Files selected for processing (4)
  • translator/vector/symbol/fill.py (3 hunks)
  • translator/vector/symbol/line.py (4 hunks)
  • translator/vector/symbol/marker.py (2 hunks)
  • translator/vector/symbol/utils.py (2 hunks)
Additional comments: 7
translator/vector/symbol/utils.py (2)
  • 3-3: このインポート文は適切です。
  • 23-33: get_stroke_width_pt関数は、ヘアライン幅を適切に扱うための良い実装です。ただし、convert_to_point関数はこのファイル内で定義されていないため、その実装が正しく動作することを確認してください。
translator/vector/symbol/line.py (2)
  • 5-5: to_rgbaget_stroke_width_ptのインポートは適切に更新されました。
  • 15-15: get_stroke_width_pt関数の使用は、ヘアライン幅の問題を解決するための適切なアプローチです。この変更により、線シンボルデータの幅が正しく処理されるようになりました。

Also applies to: 25-25, 53-53, 61-61, 69-69

translator/vector/symbol/fill.py (1)
  • 39-39: get_stroke_width_pt関数の使用は、ポリゴンシンボルのアウトライン幅を一貫して処理するための適切な方法です。この変更により、ヘアライン幅の問題が解決されます。

Also applies to: 86-86

translator/vector/symbol/marker.py (2)
  • 12-12: get_stroke_width_pt関数のインポートは適切に行われました。
  • 177-177: get_stroke_width_pt関数の使用は、マーカーシンボルのアウトライン幅を一貫して処理するための適切な方法です。この変更により、ヘアライン幅の問題が解決されます。

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review Status

Actionable comments generated: 0

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between f5e4c3e and c737196.
Files selected for processing (1)
  • translator/vector/symbol/line.py (4 hunks)
Files skipped from review as they are similar to previous changes (1)
  • translator/vector/symbol/line.py

Copy link
Member

@Kanahiro Kanahiro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but add nits

tests/src/python/test_qgssymbollayer_createsld.py#L234
"""
if defined_width == 0:
return 0.375 # pt (hairline size: 0.5px)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nits:
It may be better to take more generic approach, what do you think?
Does it bring more complexity without reasonable benefits?

Suggested change
return 0.375 # pt (hairline size: 0.5px)
hairline_width = 0.5
return convert_to_point(hairline_width, PIXEL) # PIXEL should be replaced with correct one

Copy link
Collaborator Author

@bordoray bordoray Mar 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kanahiro
I tried with logic implemented in convert_to_point() function, but it is not showed expected result 0.375pt as expected.

Should I follow QGIS way of conversion from pixel to pt even if is different from common way (1px = 0.75pt) ?.
image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO, pixels depends on DPI so it might not fixed value...
Hairline menas the thinest width then it is not bad to use fixed value, it may be okay that it is not 0.375pt.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Kanahiro Okay method changed

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review Status

Actionable comments generated: 0

Configuration used: CodeRabbit UI

Commits Files that changed from the base of the PR and between c737196 and bbc23ff.
Files selected for processing (1)
  • translator/vector/symbol/utils.py (2 hunks)
Files skipped from review as they are similar to previous changes (1)
  • translator/vector/symbol/utils.py

@Kanahiro Kanahiro merged commit d43b7fb into main Mar 5, 2024
3 checks passed
@Kanahiro Kanahiro deleted the fix/hairline branch March 5, 2024 03:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix hairline width -> 0
2 participants