-
Notifications
You must be signed in to change notification settings - Fork 215
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
Lay aside phasor and waveac diagrams #760
Conversation
The aim of this commit is to lay aside the waveac and phasordiagram code. This code is difficultinh the merge of old PRs and entagles (even more) the Qucs code. In this sense, phasordiagram.h/.cpp and waveac.h/.cpp were removed from "CMakeLists.txt" and "Makefile.am". The most relevant code spread over diagram.cpp/h, marker.cpp/h, etc. was commented whereas those portions of code that intrude existing functions were removed since it'll be needed to figure out an alternative non-intrusive way to implement that feature.
8d1a894
to
eabc938
Compare
Travis says:
The build has been terminated I restarted the build but I got the same result. Any guess? |
I see both builds get stuck at the same point, after the I fear that once the code is out it will be quite difficult to find the time to refactor it merge it back in; do we have at least some examples to see how these diagrams should work? |
I'm not familiar with the test stuff but I see something strange in the build logs around
there is an |
Thanks!! I've just removed the two tests related to PR682 |
2be25b9
to
e772cdf
Compare
running This is of course somewhat related to #756 - X should not be needed for running the tests. BTW, Travis still fails, but with a slightly different error now |
cfdcb34
to
cd73a37
Compare
Surely I'm failing to understand the logic behind the git submodules... but I followed the procedure detailed here and it seems that the changes I'm doing locally are not commited/pushed correctly. Basically, I did the following: Am I missing something important? 😓 |
I think that the changes to |
and maybe, since this should be a temporary thing, you could leave the tests in place and just add them to the exclusions lists skip.txt and skip_OSX.txt |
c3ac4d9
to
6746420
Compare
I fixed it for you. Hope it passes now. With submodules I do the following:
|
@guitorri Many thanks!! I found particularly difficult to update the submodules. Thank you for those guidelines!! I'm sure they'll help me in the future :-) |
I will merge as is. If the Graph refactor is still hard to merge we might need to clean it up further. |
The aim of this commit is to lay aside the waveac and phasor diagrams since their current implementation makes much more difficult to merge older PR (specifically #370) and entangles the Qucs code.
In this sense, "phasordiagram.h/.cpp" and "waveac.h/.cpp" were removed from "CMakeLists.txt" and "Makefile.am". The most relevant code spread over "diagram.cpp/h", "marker.cpp/h", etc. was
commented whereas those portions of code that intrude existing functions were removed.
IMHO, an alternative non-intrusive way will be needed to implement these features in the future.