Only jsf parts of #60 #62
Conversation
1. Added sample_interval for jsf_sss_ping 2. Added python interface for jsf_dvl_ping
1. Added altitude, validity flag, sample interval for jsf_sss_ping 2. Added function match_sound_vel to match sound velocity from jsf_dvl_ping to jsf_sss_ping and calculate the max slant range
nilsbore
changed the title
|
@xyp8023 So these are only the jsf parts but it's still failing on windows for some reason. I've rebuilt the current master on CI and it's still building so it's not a problem with CI having been updated. |
| @@ -363,6 +441,25 @@ std_data::sss_ping::PingsT convert_to_xtf_pings(const jsf_sss_ping::PingsT& ping | |||
| } | |||
|
|
|||
|
|
|||
| jsf_sss_ping::PingsT match_sound_vel(jsf_sss_ping::PingsT& sss_pings, jsf_dvl_ping::PingsT& dvl_pings) | |||
| { | |||
| std::stable_sort(dvl_pings.begin(), dvl_pings.end(), [](const jsf_dvl_ping& dvl_ping1, const jsf_dvl_ping& dvl_ping2) { | |||
There was a problem hiding this comment.
Ok, so my suspicion are actually these two stable_sort invocations. There seems to be some template instantiation problem here that causes a static_assert.
|
Suspicion confirmed: #63 builds. |
|
Maybe we can do something like this?: if (MSVC AND ${MSVC_VERSION} GREATER_EQUAL 1915) |
|
If that fixes the problem, that would be a good way to do it. Please open another PR with that change to see if it builds. Make sure to base it on the |
Cherry-picking the parts out of #60 that are relevant for parsing jsf. The xtf parts that John have done will need a separate PR to figure out what is causing the windows build failure.