Skip to content

Commit e65ed50

Browse files
committed
[svg] mark DrawPolyLine[NDC] mehods as not implemented
These methods was copy and paste from TPostScript, but never correctly implemented for SVG. To avoid corrupted SVG code just put warning that methods do notthing
1 parent 5352b5c commit e65ed50

File tree

2 files changed

+6
-118
lines changed

2 files changed

+6
-118
lines changed

graf2d/postscript/inc/TSVG.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class TSVG : public TVirtualPS {
4848
void DrawBox(Double_t x1, Double_t y1,Double_t x2, Double_t y2) override;
4949
void DrawFrame(Double_t xl, Double_t yl, Double_t xt, Double_t yt,
5050
Int_t mode, Int_t border, Int_t dark, Int_t light) override;
51-
void DrawPolyLine(Int_t n, TPoints *xy);
52-
void DrawPolyLineNDC(Int_t n, TPoints *uv);
51+
void DrawPolyLine(Int_t, TPoints *);
52+
void DrawPolyLineNDC(Int_t, TPoints *);
5353
void DrawPolyMarker(Int_t n, Float_t *x, Float_t *y) override;
5454
void DrawPolyMarker(Int_t n, Double_t *x, Double_t *y) override;
5555
void DrawPS(Int_t n, Float_t *xw, Float_t *yw) override;

graf2d/postscript/src/TSVG.cxx

Lines changed: 4 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -425,65 +425,9 @@ void TSVG::DrawFrame(Double_t xl, Double_t yl, Double_t xt, Double_t yt,
425425
/// - If NN>0 the line is clipped as a line.
426426
/// - If NN<0 the line is clipped as a fill area.
427427

428-
void TSVG::DrawPolyLine(Int_t nn, TPoints *xy)
428+
void TSVG::DrawPolyLine(Int_t, TPoints *)
429429
{
430-
Int_t n, idx, idy;
431-
Double_t ixd0, iyd0, ixdi, iydi, ix, iy;
432-
433-
if (nn > 0) {
434-
n = nn;
435-
} else {
436-
n = -nn;
437-
}
438-
439-
ixd0 = XtoSVG(xy[0].GetX());
440-
iyd0 = YtoSVG(xy[0].GetY());
441-
if( n <= 1) return;
442-
443-
PrintFast(2," m");
444-
idx = 0;
445-
idy = 0;
446-
for (Int_t i=1;i<n;i++) {
447-
ixdi = XtoSVG(xy[i].GetX());
448-
iydi = YtoSVG(xy[i].GetY());
449-
ix = ixdi - ixd0;
450-
iy = iydi - iyd0;
451-
ixd0 = ixdi;
452-
iyd0 = iydi;
453-
if( ix && iy) {
454-
if( idx ) { MovePS(idx,0); idx = 0; }
455-
if( idy ) { MovePS(0,idy); idy = 0; }
456-
MovePS(ix,iy);
457-
continue;
458-
}
459-
if ( ix ) {
460-
if( idy ) { MovePS(0,idy); idy = 0; }
461-
if( !idx ) { idx = ix; continue;}
462-
if( ix*idx > 0 ) {
463-
idx += ix;
464-
} else {
465-
MovePS(idx,0);
466-
idx = ix;
467-
}
468-
continue;
469-
}
470-
if( iy ) {
471-
if( idx ) { MovePS(idx,0); idx = 0; }
472-
if( !idy) { idy = iy; continue;}
473-
if( iy*idy > 0 ) {
474-
idy += iy;
475-
} else {
476-
MovePS(0,idy);
477-
idy = iy;
478-
}
479-
}
480-
}
481-
if( idx ) MovePS(idx,0);
482-
if( idy ) MovePS(0,idy);
483-
484-
if (nn > 0 ) {
485-
} else {
486-
}
430+
Warning("DrawPolyLine", "not implemented");
487431
}
488432

489433
////////////////////////////////////////////////////////////////////////////////
@@ -496,65 +440,9 @@ void TSVG::DrawPolyLine(Int_t nn, TPoints *xy)
496440
/// --If NN>0 the line is clipped as a line.
497441
/// - If NN<0 the line is clipped as a fill area.
498442

499-
void TSVG::DrawPolyLineNDC(Int_t nn, TPoints *xy)
443+
void TSVG::DrawPolyLineNDC(Int_t, TPoints *)
500444
{
501-
Int_t n, idx, idy;
502-
Double_t ixd0, iyd0, ixdi, iydi, ix, iy;
503-
504-
if (nn > 0) {
505-
n = nn;
506-
} else {
507-
n = -nn;
508-
}
509-
510-
ixd0 = UtoSVG(xy[0].GetX());
511-
iyd0 = VtoSVG(xy[0].GetY());
512-
if( n <= 1) return;
513-
514-
idx = 0;
515-
idy = 0;
516-
for (Int_t i=1;i<n;i++) {
517-
ixdi = UtoSVG(xy[i].GetX());
518-
iydi = VtoSVG(xy[i].GetY());
519-
ix = ixdi - ixd0;
520-
iy = iydi - iyd0;
521-
ixd0 = ixdi;
522-
iyd0 = iydi;
523-
if( ix && iy) {
524-
if( idx ) { MovePS(idx,0); idx = 0; }
525-
if( idy ) { MovePS(0,idy); idy = 0; }
526-
MovePS(ix,iy);
527-
continue;
528-
}
529-
if ( ix ) {
530-
if( idy ) { MovePS(0,idy); idy = 0; }
531-
if( !idx ) { idx = ix; continue;}
532-
if( ix*idx > 0 ) {
533-
idx += ix;
534-
} else {
535-
MovePS(idx,0);
536-
idx = ix;
537-
}
538-
continue;
539-
}
540-
if( iy ) {
541-
if( idx ) { MovePS(idx,0); idx = 0; }
542-
if( !idy) { idy = iy; continue;}
543-
if( iy*idy > 0 ) {
544-
idy += iy;
545-
} else {
546-
MovePS(0,idy);
547-
idy = iy;
548-
}
549-
}
550-
}
551-
if( idx ) MovePS(idx,0);
552-
if( idy ) MovePS(0,idy);
553-
554-
if (nn > 0 ) {
555-
if (xy[0].GetX() == xy[n-1].GetX() && xy[0].GetY() == xy[n-1].GetY()) PrintFast(3," cl");
556-
} else {
557-
}
445+
Warning("DrawPolyLineNDC", "not implemented");
558446
}
559447

560448
////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)