diff options
| author | B. Stack <bgstack15@gmail.com> | 2021-05-10 12:09:24 +0000 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2021-05-10 12:09:24 +0000 |
| commit | 692fd264ae30b5b844f748626262e79bc3d5a7e2 (patch) | |
| tree | 9261c60b81eb28e068f0f2f44fd8e60214462b2a /wx+/graph.h | |
| parent | Merge branch '11.9' into 'master' (diff) | |
| parent | add upstream 11.10 (diff) | |
| download | FreeFileSync-692fd264ae30b5b844f748626262e79bc3d5a7e2.tar.gz FreeFileSync-692fd264ae30b5b844f748626262e79bc3d5a7e2.tar.bz2 FreeFileSync-692fd264ae30b5b844f748626262e79bc3d5a7e2.zip | |
Merge branch '11.10' into 'master'11.10
add upstream 11.10
See merge request opensource-tracking/FreeFileSync!33
Diffstat (limited to 'wx+/graph.h')
| -rw-r--r-- | wx+/graph.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wx+/graph.h b/wx+/graph.h index 288ef9e7..55734a06 100644 --- a/wx+/graph.h +++ b/wx+/graph.h @@ -25,7 +25,7 @@ namespace zen setLabelX(Graph2D::LABEL_X_BOTTOM, 20, std::make_shared<LabelFormatterTimeElapsed>()). setLabelY(Graph2D::LABEL_Y_RIGHT, 60, std::make_shared<LabelFormatterBytes>())); //set graph data - std::shared_ptr<CurveData> curveDataBytes_ = ... + SharedRef<CurveData> curveDataBytes_ = ... m_panelGraph->setCurve(curveDataBytes_, Graph2D::CurveAttributes().setLineWidth(2).setColor(wxColor(0, 192, 0))); */ struct CurvePoint @@ -215,7 +215,7 @@ public: int lineWidth = fastFromDIP(2); }; - void addCurve(const std::shared_ptr<CurveData>& data, const CurveAttributes& ca = CurveAttributes()); + void addCurve(const SharedRef<CurveData>& data, const CurveAttributes& ca = CurveAttributes()); void clearCurves() { curves_.clear(); } static wxColor getBorderColor() { return {130, 135, 144}; } //medium grey, the same Win7 uses for other frame borders => not accessible! but no big deal... @@ -326,7 +326,7 @@ private: std::optional<wxBitmap> doubleBuffer_; - using CurveList = std::vector<std::pair<std::shared_ptr<CurveData>, CurveAttributes>>; + using CurveList = std::vector<std::pair<SharedRef<CurveData>, CurveAttributes>>; CurveList curves_; //perf!!! generating the font is *very* expensive! => buffer for Graph2D::render()! |