Skip to content

Adding python codes to samples/python#14107

Merged
alalek merged 13 commits intoopencv:3.4from
adityak2920:aditya
Feb 20, 2020
Merged

Adding python codes to samples/python#14107
alalek merged 13 commits intoopencv:3.4from
adityak2920:aditya

Conversation

@adityak2920
Copy link
Copy Markdown
Contributor

@adityak2920 adityak2920 commented Mar 19, 2019 •
edited
Loading

There are some files in samples/cpp whose python samples are not available. So, this PR is just adding "laplace.py" python code for laplace.cpp .
Added drawing.py to samples/python as it's code is not present

@adityak2920 adityak2920 changed the title Adding laplace.py to samples/python Adding python codes to samples/python Mar 20, 2019
alalek
alalek reviewed Apr 23, 2019
View reviewed changes
@alalek
Copy link
Copy Markdown
Member

alalek commented Apr 23, 2019

This patch should go into 3.4 branch first. We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@adityak2920 adityak2920 changed the base branch from master to 3.4 May 2, 2019 08:02
@adityak2920 @asmorkalov
Python version of samples:
e0094f0 
- laplace.py
- drawing.py
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Nov 6, 2019

@alalek I rebased the branch on top of 3.4 and squashed commits.

@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Nov 7, 2019

👍 Tested on Ubuntu 16.04 with current 3.4 branch.

@asmorkalov asmorkalov self-requested a review November 7, 2019 06:49
alalek
alalek reviewed Nov 7, 2019
View reviewed changes
Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Consider using Python samples template: https://github.com/opencv/opencv/wiki/Coding_Style_Guide#python-samples

@VadimLevin
Copy link
Copy Markdown
Contributor

VadimLevin commented Dec 27, 2019 •
edited
Loading

@adityak2920 Thank you for your contribution.

Please split your code into functions for each drawing functionality and it is better to have the main function reference to keep this sample aligned with the others.

When you are done, please remove WIP status from the message, to make checks to complete.

@VadimLevin VadimLevin removed the pr: needs rebase Rebase patch (and squash fixup commits) on the top of target branch label Dec 27, 2019
@VadimLevin
Copy link
Copy Markdown
Contributor

VadimLevin commented Jan 14, 2020

Looks good to me 👍

@adityak2920
Copy link
Copy Markdown
Contributor Author

adityak2920 commented Jan 27, 2020

@alalek Please review this PR and check whether it can be merged or not.

asmorkalov
asmorkalov approved these changes Feb 20, 2020
View reviewed changes
@asmorkalov
Copy link
Copy Markdown
Contributor

asmorkalov commented Feb 20, 2020

@alalek could you take a look and merge?

@alalek alalek merged commit e007d93 into opencv:3.4 Feb 20, 2020
@alalek alalek mentioned this pull request Feb 20, 2020
Merged
jshiwam pushed a commit to jshiwam/opencv that referenced this pull request Feb 22, 2020
@adityak2920 @jshiwam
Merge pull request opencv#14107 from adityak2920:aditya
b74ebb2 
Adding python codes to samples/python

* Python version of samples:
- laplace.py
- drawing.py

* Update drawing.py

* Update drawing.py

* Update drawing.py

* Update laplace.py

* Update laplace.py

* Update drawing.py

* Update drawing.py

* Update laplace.py

* samples

* drawing

* drawing

* drawing.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek left review comments

@asmorkalov asmorkalov asmorkalov approved these changes

Assignees

@asmorkalov asmorkalov

Labels

category: python bindings category: samples

Projects

None yet

Milestone

3.4.10

Development

Successfully merging this pull request may close these issues.

4 participants

@adityak2920 @alalek @asmorkalov @VadimLevin