Skip to content

Commit

Permalink
Added drawAdditionalExtremGeometryPoints(). Refs #13894
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Dec 19, 2023
1 parent 9e38384 commit ce2a535
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/netedit/elements/GNEContour.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ class GNEAttributeCarrier;
class GNEContour {

public:
/// @brief enum for geometryPoints
enum GeometryPoint {
FROM = 1 << 0, // Geometry point from
TO = 1 << 1, // Geometry point to
MIDDLE = 1 << 2, // Middle geometry points
NONE = 0 // no geometry points
};

/// @brief Constructor
GNEContour(GNEAttributeCarrier* AC);

Expand Down
22 changes: 22 additions & 0 deletions src/netedit/elements/additional/GNEAdditional.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,28 @@ GNEAdditional::drawListedAdditional(const GUIVisualizationSettings& s, const Pos
}


int
GNEAdditional::drawAdditionalExtremGeometryPoints(const bool ignoreShift, const double startPos, const double endPos) const {
// declare result
int result = GNEContour::GeometryPoint::NONE;
// get modes
const auto &modes = myNet->getViewNet()->getEditModes();
// check conditions
if (modes.isCurrentSupermodeNetwork() &&
(modes.networkEditMode == NetworkEditMode::NETWORK_MOVE) &&
(ignoreShift || myNet->getViewNet()->getMouseButtonKeyPressed().shiftKeyPressed())) {
// check positions
if (startPos != INVALID_DOUBLE) {
result |= GNEContour::GeometryPoint::FROM;
}
if (startPos != INVALID_DOUBLE) {
result |= GNEContour::GeometryPoint::TO;
}
}
return result;
}


GNEMoveOperation*
GNEAdditional::getMoveOperationSingleLane(const double startPos, const double endPos) {
// get allow change lane
Expand Down
2 changes: 2 additions & 0 deletions src/netedit/elements/additional/GNEAdditional.h
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ class GNEAdditional : public GNEPathManager::PathElement, public GNEHierarchical
void drawListedAdditional(const GUIVisualizationSettings& s, const Position& parentPosition, const double offsetX, const double extraOffsetY,
const RGBColor baseCol, const RGBColor textCol, GUITexture texture, const std::string text) const;

/// @brief check if draw additional extrem geometry points
int drawAdditionalExtremGeometryPoints(const bool ignoreShift, const double startPos, const double endPos) const;

/// @brief get moveOperation for an element over single lane
GNEMoveOperation* getMoveOperationSingleLane(const double startPos, const double endPos);
Expand Down

0 comments on commit ce2a535

Please sign in to comment.