diff --git a/bazaar/Scatter/Scatter.cpp b/bazaar/Scatter/Scatter.cpp index cca618d7c..96e0b28b8 100644 --- a/bazaar/Scatter/Scatter.cpp +++ b/bazaar/Scatter/Scatter.cpp @@ -154,6 +154,8 @@ void Scatter::DrawLegend(Draw& w,const int& scale) const LC.Append(vFColors); Vector LW; LW.Append(vPWidth); + VectorVJ; + VJ.Append(vJoin); Vector MS; MS.Append(vMarkStyles); Vector MC; @@ -186,7 +188,8 @@ void Scatter::DrawLegend(Draw& w,const int& scale) const LC.At(i));*/ Vector vp; vp << Point(scale*(i-start)*legendWeight, scale*(4-12*(j+1))) << Point(scale*(i-start)*legendWeight+scale*23, scale*(4-12*(j+1))); - DrawPolylineX(w, vp, scale*Thick.At(i)/6, LC.At(i), Patt.At(i), scale); + if (VJ.At(i)) + DrawPolylineX(w, vp, scale*Thick.At(i)/6, LC.At(i), Patt.At(i), scale); Point p(scale*((i-start)*legendWeight+7),scale*(4-12*(j+1))+scale*Thick.At(i)/12); DrawMark(MS.At(i),w,scale,p,LW.At(i,0),MC.At(i)); Font scaledFont; @@ -819,7 +822,7 @@ void Scatter::SaveToClipboard() WinMetaFileDraw wmfd; wmfd.Create(6*GetSize().cx,6*GetSize().cy,"Scatter","chart"); SetDrawing (wmfd, 6); - WinMetaFile wmf = wmfd.Close(); + WinMetaFile wmf = wmfd.Close(); wmf.WriteClipboard(); } #else diff --git a/bazaar/Scatter/Scatter.h b/bazaar/Scatter/Scatter.h index 528b9b400..b2ef1f20d 100644 --- a/bazaar/Scatter/Scatter.h +++ b/bazaar/Scatter/Scatter.h @@ -62,6 +62,7 @@ public: Scatter& SetLabelY(const WString& _yLabel); Scatter& SetLabelY2(const WString& _yLabel); Scatter& SetLabelsFont(const Font& fontLabels); + Font GetLabelsFont() {return labelsFont;}; Scatter& SetLabelsColor(const class::Color& colorLabels); Scatter& SetPlotAreaPoz(const int& poz_x,const int& poz_y);