diff --git a/rtgui/cropwindow.cc b/rtgui/cropwindow.cc index ddb38f16a..d400eb590 100644 --- a/rtgui/cropwindow.cc +++ b/rtgui/cropwindow.cc @@ -1961,8 +1961,8 @@ void CropWindow::expose (Cairo::RefPtr cr) // drawing to the "mouse over" channel const auto mouseOverGeom = editSubscriber->getMouseOverGeometry(); if (mouseOverGeom.size()) { - if (mouseOverGeom.size() > 65534) { - // once it has been switched to OM_65535, it won't return back to OM_255 + if (mouseOverGeom.size() > 255) { + // Once it has been switched to OM_65535, it won't return back to OM_255 // to avoid constant memory allocations in some particular situation. // It will return to OM_255 on a new editing session setObjectMode(OM_65535); diff --git a/rtgui/editbuffer.cc b/rtgui/editbuffer.cc index 80114ed11..63504972a 100644 --- a/rtgui/editbuffer.cc +++ b/rtgui/editbuffer.cc @@ -42,14 +42,14 @@ void ObjectMOBuffer::setObjectMode(ObjectMode newType) switch (newType) { case (OM_255): if (objectMode==OM_65535) { - objectMap->unreference(); + objectMap.clear(); objectMap = Cairo::ImageSurface::create(Cairo::FORMAT_A8, w, h); } break; case (OM_65535): if (objectMode==OM_255) { - objectMap->unreference(); + objectMap.clear(); objectMap = Cairo::ImageSurface::create(Cairo::FORMAT_RGB16_565, w, h); } break; @@ -108,9 +108,11 @@ int ObjectMOBuffer::getObjectID(const rtengine::Coord& location) } if (objectMode == OM_255) { - id = (unsigned char)(*( objectMap->get_data() + location.y * objectMap->get_stride() + location.x )); + // In OM_255 mode, size of pixel is 1 Byte (i.e. size of uint8_t) + memcpy(&id, ( objectMap->get_data() + location.y * objectMap->get_stride() + sizeof(std::uint8_t) * location.x ), sizeof(std::uint8_t)); } else { - id = (unsigned short)(*( objectMap->get_data() + location.y * objectMap->get_stride() + location.x )); + // In OM_65535 mode, size of pixel is 2 Bytes (i.e. size of uint16_t) + memcpy(&id, ( objectMap->get_data() + location.y * objectMap->get_stride() + sizeof(std::uint16_t) * location.x ), sizeof(std::uint16_t)); } return id - 1; diff --git a/rtgui/editwidgets.cc b/rtgui/editwidgets.cc index 0b765caef..a1324b5b8 100644 --- a/rtgui/editwidgets.cc +++ b/rtgui/editwidgets.cc @@ -67,6 +67,29 @@ RGBColor Geometry::getOuterLineColor () return color; } +void Geometry::setMOChannelColor(Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, unsigned short id) +{ + switch (objectBuffer->getObjectMode()) { + case OM_255: + /* In OM_255 mode, FORMAT_A8 format is used: + - Alpha is represented with 8 bits (mask = 0xFF) from 0 to 255 + */ + cr->set_source_rgba (0., 0., 0., ((id + 1) & 0xFF) / 255.); + break; + case OM_65535: + default: + /* In OM_65535 mode, FORMAT_RGB16_565 format is used: + - Red is represented with 5 bits (mask = 0xF800, left shift = 11) from 0 to 31 + - Green is represented with 6 bits (mask = 0x7E0, left shift = 5) from 0 to 63 + - Blue is represented with 5 bits (mask = 0x1F) from 0 to 31 + */ + const double red = (((id + 1) & 0xF800) >> 11) / 31.; + const double green = (((id + 1) & 0x7E0) >> 5) / 63.; + const double blue = ((id + 1) & 0x1F) / 31.; + cr->set_source_rgb (red, green, blue); + } +} + #ifdef GUIVERSION void Circle::drawOuterGeometry(Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, EditCoordSystem &coordSystem) @@ -169,12 +192,9 @@ void Circle::drawToMOChannel (Cairo::RefPtr &cr, unsigned short center_ += objectBuffer->getDataProvider()->posScreen + objectBuffer->getDataProvider()->deltaScreen; } - // 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.); - } + // Setting MO Channel color according to the objet's ID + setMOChannelColor(cr, objectBuffer, id); + cr->arc(center_.x + 0.5, center_.y + 0.5, radius_, 0, 2.*rtengine::RT_PI); if (filled) { @@ -291,12 +311,9 @@ void Line::drawToMOChannel(Cairo::RefPtr &cr, unsigned short id, end_ += objectBuffer->getDataProvider()->posScreen + objectBuffer->getDataProvider()->deltaScreen; } - // 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.); - } + // Setting MO Channel color according to the objet's ID + setMOChannelColor(cr, objectBuffer, id); + cr->move_to(begin_.x + 0.5, begin_.y + 0.5); cr->line_to(end_.x + 0.5, end_.y + 0.5); cr->stroke(); @@ -433,12 +450,8 @@ void Polyline::drawToMOChannel (Cairo::RefPtr &cr, unsigned shor if ((flags & F_HOVERABLE) && points.size() > 1) { rtengine::Coord currPos; - // 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.); - } + // Setting MO Channel color according to the objet's ID + setMOChannelColor(cr, objectBuffer, id); cr->set_line_width( getMouseOverLineWidth() ); cr->set_line_cap(Cairo::LINE_CAP_ROUND); @@ -628,12 +641,9 @@ void EditRectangle::drawToMOChannel(Cairo::RefPtr &cr, unsigned br = bottomRight + objectBuffer->getDataProvider()->posScreen + objectBuffer->getDataProvider()->deltaScreen; } - // 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.); - } + // Setting MO Channel color according to the objet's ID + setMOChannelColor(cr, objectBuffer, id); + cr->rectangle(tl.x + 0.5, tl.y + 0.5, br.x - tl.x, br.y - tl.y); if (filled) { @@ -880,6 +890,9 @@ void Ellipse::drawToMOChannel (Cairo::RefPtr &cr, unsigned short center_ += objectBuffer->getDataProvider()->posScreen + objectBuffer->getDataProvider()->deltaScreen; } + // Setting MO Channel color according to the objet's ID + setMOChannelColor(cr, objectBuffer, id); + if (radYT_ > 0 && radY_ > 0 && radXL_ > 0 && radX_ > 0) { // To have an ellipse with radius of (radX, radX), a circle of radius 1. shall be twisted with a scale // of radX for x-axis, radY for y-axis @@ -1110,12 +1123,9 @@ void OPIcon::drawMOImage(std::shared_ptr &img, Cairo::RefPtrgetObjectMode() == OM_255) { - cr->set_source_rgba (0., 0., 0., ((id + 1) & 0xFF) / 255.); - } else { - cr->set_source_rgba (0., 0., 0., (id + 1) / 65535.); - } + // Setting MO Channel color according to the objet's ID + setMOChannelColor(cr, objectBuffer, id); + cr->set_line_width(0.); cr->rectangle(tl.x, tl.y, imgW, imgH); cr->fill(); diff --git a/rtgui/editwidgets.h b/rtgui/editwidgets.h index b22ba175e..f348a08df 100644 --- a/rtgui/editwidgets.h +++ b/rtgui/editwidgets.h @@ -234,6 +234,9 @@ protected: RGBColor outerLineColor; short flags; + // Set MO Channel color according to Edit Widget id and MO Channel mode + static void setMOChannelColor (Cairo::RefPtr &cr, ObjectMOBuffer *objectBuffer, unsigned short id); + public: float innerLineWidth; // ...outerLineWidth = innerLineWidth+2 Datum datum;