Skip to content

Commit

Permalink
Updated isGLObjectLocked() function. Refs #13894
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Dec 19, 2023
1 parent abe475f commit 2168262
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/netedit/elements/additional/GNEAdditional.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ GNEAdditional::getOptionalAdditionalName() const {


bool
GNEAdditional::isGLObjectLocked() {
GNEAdditional::isGLObjectLocked() const {
if (myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork()) {
return myNet->getViewNet()->getLockManager().isObjectLocked(getType(), isAttributeCarrierSelected());
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/elements/additional/GNEAdditional.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ class GNEAdditional : public GNEPathManager::PathElement, public GNEHierarchical
virtual void drawGL(const GUIVisualizationSettings& s) const = 0;

/// @brief check if element is locked
bool isGLObjectLocked();
bool isGLObjectLocked() const;

/// @brief mark element as front element
void markAsFrontElement();
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/elements/demand/GNEDemandElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ GNEDemandElement::getParameterWindow(GUIMainWindow& app, GUISUMOAbstractView&) {


bool
GNEDemandElement::isGLObjectLocked() {
GNEDemandElement::isGLObjectLocked() const {
if (myNet->getViewNet()->getEditModes().isCurrentSupermodeDemand()) {
return myNet->getViewNet()->getLockManager().isObjectLocked(getType(), isAttributeCarrierSelected());
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/elements/demand/GNEDemandElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ class GNEDemandElement : public GNEPathManager::PathElement, public GNEHierarchi
virtual void drawGL(const GUIVisualizationSettings& s) const = 0;

/// @brief check if element is locked
bool isGLObjectLocked();
bool isGLObjectLocked() const;

/// @brief mark element as front element
void markAsFrontElement();
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/elements/network/GNENetworkElement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ GNENetworkElement::getCenteringBoundary() const {


bool
GNENetworkElement::isGLObjectLocked() {
GNENetworkElement::isGLObjectLocked() const {
if (myNet->getViewNet()->getEditModes().isCurrentSupermodeNetwork()) {
return myNet->getViewNet()->getLockManager().isObjectLocked(getType(), isAttributeCarrierSelected());
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/netedit/elements/network/GNENetworkElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ class GNENetworkElement : public GUIGlObject, public GNEHierarchicalElement, pub
virtual void drawGL(const GUIVisualizationSettings& s) const = 0;

/// @brief check if element is locked
bool isGLObjectLocked();
bool isGLObjectLocked() const;

/// @brief mark element as front element
void markAsFrontElement();
Expand Down
2 changes: 1 addition & 1 deletion src/utils/gui/globjects/GUIGlObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ GUIGlObject::getTypeParameterWindow(GUIMainWindow& app, GUISUMOAbstractView& par


bool
GUIGlObject::isGLObjectLocked() {
GUIGlObject::isGLObjectLocked() const {
// by default unlocked
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion src/utils/gui/globjects/GUIGlObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class GUIGlObject {
virtual void drawGL(const GUIVisualizationSettings& s) const = 0;

/// @brief check if element is locked (Currently used only in netedit)
virtual bool isGLObjectLocked();
virtual bool isGLObjectLocked() const;

/// @brief mark element as front element (Currently used only in netedit)
virtual void markAsFrontElement();
Expand Down

0 comments on commit 2168262

Please sign in to comment.