Skip to content

Conversation

@sawyerbfuller
Copy link
Contributor

  • give correct z-plane damping ratio on mouse click
  • auto zoom into unit circle
  • show zgrid with lines of constant damping ratio and natural frequency if desired
  • sisotool now plots dots instead of a continuous line for discrete-time systems
  • fixed spelling of variables in a couple of places

@coveralls
Copy link

coveralls commented Jun 2, 2020

Coverage Status

Coverage decreased (-0.2%) to 84.212% when pulling 07e9c6e on sawyerbfuller:rlocus-work into 0160990 on python-control:master.

@murrayrm
Copy link
Member

Fixed up a few conflicts with changes to rootlocus.py from PR #413. Will merge if Travis CI passes.

@murrayrm
Copy link
Member

Screwed up. The merge with PR #413 is a bit more complicated. Will handle later.

@sawyerbfuller My plan is to back out my latest commit and then rebase on top of current master (which will get PR #413). If you have suggestions for any conflicts that might come up, let me know.

@murrayrm
Copy link
Member

Fixed up the conflicts. If Travis CI succeeds, this should be ready to merge.

@sawyerbfuller Probably worth a quick look to make sure I didn't screw anything up.

@sawyerbfuller
Copy link
Contributor Author

Sorry about the merge problems. I’m not enough of a git guru yet to figure out how to do a test merge at home. Will check for any issues next time I’m at a computer.

@murrayrm
Copy link
Member

Thanks @sawyerbfuller. I think I got all of the changes got mapped over correctly, so it should just take a quick look to make sure I didn't miss anything (unit tests are OK).

@sawyerbfuller
Copy link
Contributor Author

Ok I took a quick look through. Couldn't figure out how to see exactly what changes you had to make, but I checked through my local diffs and everything there seems to be in this branch. So if it passes unit tests, seems like all must be good.

@murrayrm murrayrm merged commit d3142ff into python-control:master Jul 14, 2020
@sawyerbfuller sawyerbfuller deleted the rlocus-work branch July 15, 2020 04:25
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.

3 participants