Topic: new Elementsand some re-work for WAGO-Symbols

Hello everybody!

To add further symbols to the WGAO Kontakttechnik - Directory I changed from
this thread https://qelectrotech.org/forum/viewtopi … 612#p10612
to this Elements forum to supply new symbols to the QET-Community.

I added some symbols and again some rework had to be done to be ready for
yet-to-come - symbols in the near future.

To cut a long story short: Here is the new Package.

Best regards
  plc-user

Post's attachments

Attachment icon WAGO_20200301.tar.xz 424.97 kb, 165 downloads since 2020-03-07 

Re: new Elementsand some re-work for WAGO-Symbols

Hello plc-user,
merged, thanks.
https://git.tuxfamily.org/qet/qet.git/c … b7984232e6

Re: new Elementsand some re-work for WAGO-Symbols

Hello QET-Team and QET-users!

Again I re-worked and added some symbols inside the WAGO-Kontakttechnik - Directory.
The Symbols are packed into the attached file.


Best regards
  plc-user

Post's attachments

Attachment icon WAGO_20201017.tar.xz 491.65 kb, 39 downloads since 2020-10-17 

Re: new Elementsand some re-work for WAGO-Symbols

Hello QET-Team!

Is this forum still the place to provide Elements to the project?
It seems that my latest "update" for the Wago-directory was not noticed ...

Regards
  plc-user

Re: new Elementsand some re-work for WAGO-Symbols

Hello Plc-user

the best way is to fork master on Github and make a pull request.
https://github.com/qelectrotech/qelectr … rce-mirror

Merged, thanks

https://git.tuxfamily.org/qet/qet.git/c … f654f912f6

Regards,

Laurent

Re: new Elementsand some re-work for WAGO-Symbols

Hello Laurent,

I have no experience on using git, until now.
Can you give me some hints on how to use git for updating elements?
Maybe there is some "howto" for that?

Thanks in advance!
  plc-user

7 (edited by De-Backer 2020-11-13 21:43:49)

Re: new Elementsand some re-work for WAGO-Symbols

1. New to GitHub? Create an account.
2. Fork https://github.com/qelectrotech/qelectr … rce-mirror see:
https://www.youtube.com/watch?v=HbSjyU2vf6Y

plc-user
if you have any questions ask them. nomicons/smile

Re: new Elementsand some re-work for WAGO-Symbols

Re: new Elementsand some re-work for WAGO-Symbols

Thank you, De-Backer and Laurent!

I will have a look at the videos and be sure: If there are questions, I'll ask!  nomicons/wink

Re: new Elementsand some re-work for WAGO-Symbols

Hello everybody,

now that the Pull-Request is done and Laurent released the changes it is time to upgrade my fork of the QET-Repo.
Is there a simple way to tell github to upgrade my fork to the (in the meantime changed) original Repo?
I took a quick look but didn't find a simple way...

Regards
  plc-user

11 (edited by De-Backer 2020-11-17 21:11:03)

Re: new Elementsand some re-work for WAGO-Symbols

run ones

# clone your repo
git clone git@github.com:plc-user/qelectrotech-source-mirror.git qelectrotech_source
cd qelectrotech_source
# add qelectrotech repo
git remote add upstream https://github.com/qelectrotech/qelectrotech-source-mirror.git

run always

# fetch qelectrotech repo
git fetch upstream
# checkout to your master
git checkout master
# reset your master to == qelectrotech repo master
git reset --hard upstream/master 
# push to your repo
git push origin master --force

done

Re: new Elementsand some re-work for WAGO-Symbols

Hello De-Backer!

Your manual works perfectly!  nomicons/smile
Thank you!

Already tried the next Pull-Request

Regards
  plc-user

13 (edited by De-Backer 2020-11-19 00:28:31)

Re: new Elementsand some re-work for WAGO-Symbols

I forgot to say "git reset --hard upstream / master" removes all changes, pay attention to it.

git-stash can be your best friend in some cases
https://git-scm.com/docs/git-stash#_examples

this is necessary if you are doing changes in the local clone repo

Re: new Elementsand some re-work for WAGO-Symbols

Hello De-Backer!

O.k. - I'll keep that in mind!
Thank you!

Regards
  plc-user