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

Add 4 new modules(ohmmeter,wattmeter,fasor diagram and temporal diagr… #546

Closed
wants to merge 2 commits into from

Conversation

FoxMarts
Copy link

…am for AC)

@in3otd
Copy link
Contributor

in3otd commented Jul 23, 2016

A more detailed description of what this PR does would be helpful, or actually needed; I guess this is somewhat related to #395, #396, #398, #440, #441.
Examples showing how to use these new components will also be helpful.

As you saw, the PR could not be built by Appveyor and Travis, so there is little chance that others can build and test it. The main error seems to be Cannot find file 'bitmaps/ohm.png'; you probably forgot to commit that file.

You have included lot of stuff that was already merged in the develop and/or release-0.0.19 branches and has nothing to do with the new components you added. Please remove those changes and rebase your changes on the develop branch.
Included there are several files which are generated by the bootstrap script, also those should be removed.

If you have question on how to reshape this PR and/or use git feel free to ask here; you can also often find someone on the channel #qucs on freenet that should be able to help

@guitorri
Copy link
Member

guitorri commented Nov 9, 2016

I can give you the context for this.

These modules were written by students of ISEP in Portugal under the guidance of Prof. Mario Alvez. I was contacted by them to help including the modules in QUCS, but in the current state is not really possible. The students seem to have difficulties with Git.

Some examples for these modules can be found in the following document.
Exemplos.pdf

Some time ago Pedro @Pedro-project tried to submit the wattmeter, see #389, #395, #396, #440, #441. It seems he was unable to rebase the code.

I tried to assist them and cleanup the code. I did that, but I did not perform any sort of test:
https://github.com/guitorri/qucs/tree/pedro-code

@FoxMarts, my suggestion is to take the above branch as base an apply the changes one by one.

@guitorri guitorri changed the base branch from master to develop February 18, 2017 12:54
@ra3xdh
Copy link
Contributor

ra3xdh commented Jul 13, 2017

I see, it is a duplicate of #682. Should it be closed after #682 is merged?

@andresmmera
Copy link
Contributor

I think so. PR 682 was merged last sunday so it makes no sense having this PR opened. Can someone close this one? I can't closing it from the github app

@ra3xdh
Copy link
Contributor

ra3xdh commented Jul 13, 2017

Closing this after #682 is merged.

@ra3xdh ra3xdh closed this Jul 13, 2017
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.

5 participants