From c13bcd5f8f887dbc4c876e8acec8f9e0c58f1183 Mon Sep 17 00:00:00 2001 From: Desmis Date: Wed, 22 Feb 2017 11:33:55 +0100 Subject: [PATCH] change width spot delimiter - thinner --- rtgui/edit.cc | 55 ++++++++++++++++++++++++++--------------------- rtgui/locallab.cc | 50 +++++++++++++++++++++--------------------- 2 files changed, 55 insertions(+), 50 deletions(-) diff --git a/rtgui/edit.cc b/rtgui/edit.cc index 430ee4d1c..f385ec2ae 100644 --- a/rtgui/edit.cc +++ b/rtgui/edit.cc @@ -481,15 +481,16 @@ void Beziers::drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuff { if ((flags & F_VISIBLE) && state != INSENSITIVE) { RGBColor color; - - if (flags & F_AUTO_COLOR) { - color = getOuterLineColor(); - } else { - color = outerLineColor; - } - - cr->set_source_rgb (color.getR(), color.getG(), color.getB()); - cr->set_line_width ( getOuterLineWidth() ); + /* + if (flags & F_AUTO_COLOR) { + color = getOuterLineColor(); + } else { + color = outerLineColor; + } + */ + // cr->set_source_rgb (color.getR(), color.getG(), color.getB()); + // cr->set_line_width ( getOuterLineWidth() ); + cr->set_line_width ( innerLineWidth ); rtengine::Coord begin_ = begin; rtengine::Coord inter_ = inter; @@ -520,6 +521,7 @@ void Beziers::drawOuterGeometry (Cairo::RefPtr &cr, ObjectMOBuff void Beziers::drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) { if ((flags & F_VISIBLE) && innerLineWidth > 0.) { + /* if (state != INSENSITIVE) { RGBColor color; @@ -531,7 +533,7 @@ void Beziers::drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuff cr->set_source_rgb (color.getR(), color.getG(), color.getB()); } - + */ cr->set_line_width (innerLineWidth); rtengine::Coord begin_ = begin; @@ -557,20 +559,22 @@ void Beziers::drawInnerGeometry (Cairo::RefPtr &cr, ObjectMOBuff cr->move_to (begin_.x + 0.5, begin_.y + 0.5); cr->curve_to (begin_.x + 0.5, begin_.y + 0.5, inter_.x + 0.5, inter_.y + 0.5, end_.x + 0.5, end_.y + 0.5); cr->restore(); - - if (state == INSENSITIVE) { - std::valarray ds (1); - ds[0] = 4; - cr->set_source_rgba (1.0, 1.0, 1.0, 0.618); - cr->stroke_preserve(); - cr->set_source_rgba (0.0, 0.0, 0.0, 0.618); - cr->set_dash (ds, 0); - cr->stroke(); - ds.resize (0); - cr->set_dash (ds, 0); - } else { - cr->stroke(); - } + cr->stroke(); + /* + if (state == INSENSITIVE) { + std::valarray ds (1); + ds[0] = 4; + cr->set_source_rgba (1.0, 1.0, 1.0, 0.618); + cr->stroke_preserve(); + cr->set_source_rgba (0.0, 0.0, 0.0, 0.618); + cr->set_dash (ds, 0); + cr->stroke(); + ds.resize (0); + cr->set_dash (ds, 0); + } else { + cr->stroke(); + } + */ } } @@ -597,12 +601,13 @@ void Beziers::drawToMOChannel (Cairo::RefPtr &cr, unsigned short } // setting the color to the objet's ID + /* if (objectBuffer->getObjectMode() == OM_255) { cr->set_source_rgba (0., 0., 0., ((id + 1) & 0xFF) / 255.); } else { cr->set_source_rgba (0., 0., 0., (id + 1) / 65535.); } - + */ cr->save(); cr->move_to (begin_.x + 0.5, begin_.y + 0.5); diff --git a/rtgui/locallab.cc b/rtgui/locallab.cc index 84f0c4b3b..07ec3449e 100644 --- a/rtgui/locallab.cc +++ b/rtgui/locallab.cc @@ -657,7 +657,7 @@ Locallab::Locallab (): Beziers *twobeziers[3]; Beziers *thrbeziers[3]; Beziers *foubeziers[3]; - + float innw = 0.7f; // Visible geometry locXLine[0] = new Line(); locXLine[0]->innerLineWidth = 2; @@ -680,51 +680,51 @@ Locallab::Locallab (): if (options.showdelimspot) { onebeziers[0] = new Beziers(); onebeziers[0]->datum = Geometry::IMAGE; - onebeziers[0]->innerLineWidth = 1; + onebeziers[0]->innerLineWidth = innw; onebeziers[1] = new Beziers(); onebeziers[1]->datum = Geometry::IMAGE; - onebeziers[1]->innerLineWidth = 1; + onebeziers[1]->innerLineWidth = innw; onebeziers[2] = new Beziers(); onebeziers[2]->datum = Geometry::IMAGE; - onebeziers[2]->innerLineWidth = 1; + onebeziers[2]->innerLineWidth = innw; twobeziers[0] = new Beziers(); twobeziers[0]->datum = Geometry::IMAGE; - twobeziers[0]->innerLineWidth = 1; + twobeziers[0]->innerLineWidth = innw; twobeziers[1] = new Beziers(); twobeziers[1]->datum = Geometry::IMAGE; - twobeziers[1]->innerLineWidth = 1; + twobeziers[1]->innerLineWidth = innw; twobeziers[2] = new Beziers(); twobeziers[2]->datum = Geometry::IMAGE; - twobeziers[2]->innerLineWidth = 1; + twobeziers[2]->innerLineWidth = innw; thrbeziers[0] = new Beziers(); thrbeziers[0]->datum = Geometry::IMAGE; - thrbeziers[0]->innerLineWidth = 1; + thrbeziers[0]->innerLineWidth = innw; thrbeziers[1] = new Beziers(); thrbeziers[1]->datum = Geometry::IMAGE; - thrbeziers[1]->innerLineWidth = 1; + thrbeziers[1]->innerLineWidth = innw; thrbeziers[2] = new Beziers(); thrbeziers[2]->datum = Geometry::IMAGE; - thrbeziers[2]->innerLineWidth = 1; + thrbeziers[2]->innerLineWidth = innw; foubeziers[0] = new Beziers(); foubeziers[0]->datum = Geometry::IMAGE; - foubeziers[0]->innerLineWidth = 1; + foubeziers[0]->innerLineWidth = innw; foubeziers[1] = new Beziers(); foubeziers[1]->datum = Geometry::IMAGE; - foubeziers[1]->innerLineWidth = 1; + foubeziers[1]->innerLineWidth = innw; foubeziers[2] = new Beziers(); foubeziers[2]->datum = Geometry::IMAGE; - foubeziers[2]->innerLineWidth = 1; + foubeziers[2]->innerLineWidth = innw; } // oneellipse->radiusInImageSpace = true; @@ -774,51 +774,51 @@ Locallab::Locallab (): if (options.showdelimspot) { onebeziers[0] = new Beziers(); onebeziers[0]->datum = Geometry::IMAGE; - onebeziers[0]->innerLineWidth = 1; + onebeziers[0]->innerLineWidth = innw; onebeziers[1] = new Beziers(); onebeziers[1]->datum = Geometry::IMAGE; - onebeziers[1]->innerLineWidth = 1; + onebeziers[1]->innerLineWidth = innw; onebeziers[2] = new Beziers(); onebeziers[2]->datum = Geometry::IMAGE; - onebeziers[2]->innerLineWidth = 1; + onebeziers[2]->innerLineWidth = innw; twobeziers[0] = new Beziers(); twobeziers[0]->datum = Geometry::IMAGE; - twobeziers[0]->innerLineWidth = 1; + twobeziers[0]->innerLineWidth = innw; twobeziers[1] = new Beziers(); twobeziers[1]->datum = Geometry::IMAGE; - twobeziers[1]->innerLineWidth = 1; + twobeziers[1]->innerLineWidth = innw; twobeziers[2] = new Beziers(); twobeziers[2]->datum = Geometry::IMAGE; - twobeziers[2]->innerLineWidth = 1; + twobeziers[2]->innerLineWidth = innw; thrbeziers[0] = new Beziers(); thrbeziers[0]->datum = Geometry::IMAGE; - thrbeziers[0]->innerLineWidth = 1; + thrbeziers[0]->innerLineWidth = innw; thrbeziers[1] = new Beziers(); thrbeziers[1]->datum = Geometry::IMAGE; - thrbeziers[1]->innerLineWidth = 1; + thrbeziers[1]->innerLineWidth = innw; thrbeziers[2] = new Beziers(); thrbeziers[2]->datum = Geometry::IMAGE; - thrbeziers[2]->innerLineWidth = 1; + thrbeziers[2]->innerLineWidth = innw; foubeziers[0] = new Beziers(); foubeziers[0]->datum = Geometry::IMAGE; - foubeziers[0]->innerLineWidth = 1; + foubeziers[0]->innerLineWidth = innw; foubeziers[1] = new Beziers(); foubeziers[1]->datum = Geometry::IMAGE; - foubeziers[1]->innerLineWidth = 1; + foubeziers[1]->innerLineWidth = innw; foubeziers[2] = new Beziers(); foubeziers[2]->datum = Geometry::IMAGE; - foubeziers[2]->innerLineWidth = 1; + foubeziers[2]->innerLineWidth = innw; } // oneellipse->radiusInImageSpace = true;