Skip to content
Snippets Groups Projects
Commit 65eb24ee authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

fix bug in curve merge

parent ed61bfca
No related branches found
No related tags found
No related merge requests found
......@@ -954,6 +954,8 @@ void NManip::FilMerge( const string& opts )
fout->xco = fin->xco;
fout->yco = fin->yco;
fout->ZCo = fiter()->ZCo;
if ( POlc fc = P2C(fin) )
P2C(fout)->PCo = fc->PCo;
while ( fin = fiter() ){
if ( fin->xco != fout->xco )
throw "different x coordinates";
......@@ -964,6 +966,9 @@ void NManip::FilMerge( const string& opts )
for ( uint i=0; i<fout->ZCo.size(); ++i )
if ( fin->ZCo[i] != fout->ZCo[i] )
throw "different z"+S(i)+" coordinate";
if ( POlc fc = P2C(fin) )
if ( fc->PCo.size() != P2C(fout)->PCo.size() )
throw "different numer of curve parameters";
}
// check RPar, and prepare move to z if they differ:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment