porting to smesh 8.3

Here's the place for discussion related to coding in FreeCAD, C++ or Python. Design, interfaces and structures.
UR_
Posts: 612
Joined: Tue Jan 03, 2017 8:42 pm

Re: porting to smesh 8.3

Postby UR_ » Thu May 03, 2018 8:47 pm

bernd wrote:
Thu May 03, 2018 8:17 pm
HaHaHa dejavu :shock:
Had one too, but occured later (march 2017)

https://forum.freecadweb.org/viewtopic. ... distortion
looo
Posts: 1972
Joined: Mon Nov 11, 2013 5:29 pm

Re: porting to smesh 8.3

Postby looo » Fri May 04, 2018 8:12 am

UR_ wrote:
Thu May 03, 2018 8:47 pm
bernd wrote:
Thu May 03, 2018 8:17 pm
HaHaHa dejavu :shock:
Had one too, but occured later (march 2017)

https://forum.freecadweb.org/viewtopic. ... distortion
was this solved?

I guess I have to go through all the commits and see which one are missing. It's said these patches are not applied upstream. I hope we can get a more close collaboration with salome with a more active external smesh. Doing the same work 3 times is somehow a bit annoying. I guess it's in the sense of all 3 projects (freecad/salome/pyocct) if the collaboration is working better.

Weren't there some salome guyes which tried to reimplement the freecad-sketcher in salome? :? Sometimes opensource seems to be very ineffective.
User avatar
bernd
Posts: 5964
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland

Re: porting to smesh 8.3

Postby bernd » Fri May 04, 2018 10:12 am

looo wrote:
Fri May 04, 2018 8:12 am
I hope we can get a more close collaboration with salome with a more active external smesh. Doing the same work 3 times is somehow a bit annoying. I guess it's in the sense of all 3 projects (freecad/salome/pyocct) if the collaboration is working better.
+1 I never had contact with them. Vejmarie seams to have his office just near those guys and he knows them too. But he is very busy with his own company ATM.
looo wrote:
Fri May 04, 2018 8:12 am
Weren't there some salome guyes which tried to reimplement the freecad-sketcher in salome? :? Sometimes opensource seems to be very ineffective.
Accroding to Vejmarie, they took FreeCAD sketcher code and adapted it to salome.
User avatar
bernd
Posts: 5964
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland

Re: porting to smesh 8.3

Postby bernd » Fri May 04, 2018 10:20 am

looo wrote:
Fri May 04, 2018 8:12 am
UR_ wrote:
Thu May 03, 2018 8:47 pm
bernd wrote:
Thu May 03, 2018 8:17 pm
HaHaHa dejavu :shock:
Had one too, but occured later (march 2017)

https://forum.freecadweb.org/viewtopic. ... distortion
was this solved?
Yes, see https://forum.freecadweb.org/viewtopic. ... 30#p169042 and git commit 1b7224cd but it seams werner just fixed a change of vejmarie from git commit 732bd85c


interesting for us too might be:
git commit 1b08ae0613
User avatar
bernd
Posts: 5964
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland

Re: porting to smesh 8.3

Postby bernd » Fri May 04, 2018 10:29 am

looo wrote:
Fri May 04, 2018 8:12 am
I guess I have to go through all the commits and see which one are missing.
It is what I would probably do too, because my C++ knowledge is not good enought to fix the problems directly.
looo
Posts: 1972
Joined: Mon Nov 11, 2013 5:29 pm

Re: porting to smesh 8.3

Postby looo » Sat May 05, 2018 6:21 pm

I didn't find the commit which really solves this problem for me. So I will try to apply all the patches. As this is quite some work, I would like to use git as much as possible. My idea is to:

1. get list of commits:
git log --since="2015" src/3rdParty/salomesmesh/ |grep commit

2. create patches from commits and save the patches

3. modify patches to allow beeing applied at smesh

4. apply patches at smesh

5. resolve merge conflicts (one by one)

Then the next problem is that the external smesh8.3 is not a fork from the origin smesh (salome) The file structure was changed recently. So applying the diff at salome will be another hurdle...

Does anyone knows a better strategy?
User avatar
bernd
Posts: 5964
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland

Re: porting to smesh 8.3

Postby bernd » Sat May 05, 2018 6:39 pm

what else the the external smesh 8.3 is based on,if not a fork of origin smesh ?
User avatar
bernd
Posts: 5964
Joined: Sun Sep 08, 2013 8:07 pm
Location: Zürich, Switzerland

Re: porting to smesh 8.3

Postby bernd » Sat May 05, 2018 6:43 pm

I do not like patches, I like git. Our smesh is a certain commit of original smesh. Get this original smesh and merge our commits. Then try to rebase to newer original smesh until you are on 8.3. Just an idea?
looo
Posts: 1972
Joined: Mon Nov 11, 2013 5:29 pm

Re: porting to smesh 8.3

Postby looo » Sat May 05, 2018 7:56 pm

bernd wrote:what else the the external smesh 8.3 is based on,if not a fork of origin smesh ?
In my eyes a fork has all the history included... The external smesh is part of the full salome-package copied at a specific commit. I don't know if it's easy to figure out which commit it is based on.
I do not like patches, I like git. Our smesh is a certain commit of original smesh. Get this original smesh and merge our commits. Then try to rebase to newer original smesh until you are on 8.3. Just an idea?
this would work, but I guess there will be quite some conflicts... And we also want to make our patches/commits ready to get applied for salome. I guess it will not be accepted if our commits have to be inserted somewhere in the tree...

Also I don't know if it is possible to get commits from one directory structure applied to another directory structure. We use FreeCAD/src/3rdParty/salomemesh/src, pyocct uses SMESH/src and salome , I don't know? where do the hide there git-repos?
wmayer
Site Admin
Posts: 13077
Joined: Thu Feb 19, 2009 10:32 am

Re: porting to smesh 8.3

Postby wmayer » Sat May 05, 2018 9:29 pm

FYI, this issue is back: https://forum.freecadweb.org/viewtopic. ... 40#p135981
So, this means that git commit 5c791306d and git commit 1b08ae0 must be added to the external smesh.