Skip to content

Commit 693c5a4

Browse files
palvarezlopezpalvarezlopez
committed
Renamed GNEAllowVClassesDialog to GNEVClassesDialog. Refs #16898 
1 parent 42245f6 commit 693c5a4

File tree

6 files changed

+48
-48
lines changed

6 files changed

+48
-48
lines changed

‎src/netedit/GNEViewNet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <netedit/dialogs/basic/GNEInformationBasicDialog.h>
2626
#include <netedit/dialogs/basic/GNEQuestionBasicDialog.h>
2727
#include <netedit/dialogs/basic/GNEWarningBasicDialog.h>
28-
#include <netedit/dialogs/GNEAllowVClassesDialog.h>
28+
#include <netedit/dialogs/GNEVClassesDialog.h>
2929
#include <netedit/dialogs/GNEGeometryPointDialog.h>
3030
#include <netedit/dialogs/fix/GNEFixAdditionalElementsDialog.h>
3131
#include <netedit/dialogs/fix/GNEFixDemandElementsDialog.h>

‎src/netedit/GNEViewNetHelper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class GNEUndoList;
145145
class GNEViewNet;
146146
class GNEViewParent;
147147
// dialogs
148-
class GNEAllowVClassesDialog;
148+
class GNEVClassesDialog;
149149
class GNEFixNetworkElements;
150150
class GNEFixAdditionalElementsDialog;
151151
class GNEFixDemandElementsDialog;

‎src/netedit/dialogs/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ set(netedit_dialogs_SRCS
1010
GNEACChooserDialog.h
1111
GNEAboutDialog.cpp
1212
GNEAboutDialog.h
13-
GNEAllowVClassesDialog.cpp
14-
GNEAllowVClassesDialog.h
13+
GNEVClassesDialog.cpp
14+
GNEVClassesDialog.h
1515
GNEColorDialog.cpp
1616
GNEColorDialog.h
1717
GNEDialog.cpp

‎src/netedit/dialogs/GNEAllowVClassesDialog.cpp renamed to ‎src/netedit/dialogs/GNEVClassesDialog.cpp

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
1212
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
1313
/****************************************************************************/
14-
/// @file GNEAllowVClassesDialog.cpp
14+
/// @file GNEVClassesDialog.cpp
1515
/// @author Pablo Alvarez Lopez
1616
/// @date April 2016
1717
///
@@ -23,37 +23,37 @@
2323
#include <utils/common/StringTokenizer.h>
2424
#include <utils/gui/div/GUIDesigns.h>
2525

26-
#include "GNEAllowVClassesDialog.h"
26+
#include "GNEVClassesDialog.h"
2727

2828
// ===========================================================================
2929
// FOX callback mapping
3030
// ===========================================================================
3131

32-
FXDEFMAP(GNEAllowVClassesDialog::VClassRow) VClassRowMap[] = {
33-
FXMAPFUNC(SEL_COMMAND, MID_GNE_ALLOWVCLASSES_TOGGLE, GNEAllowVClassesDialog::VClassRow::onCmdToggleVClass),
32+
FXDEFMAP(GNEVClassesDialog::VClassRow) VClassRowMap[] = {
33+
FXMAPFUNC(SEL_COMMAND, MID_GNE_ALLOWVCLASSES_TOGGLE, GNEVClassesDialog::VClassRow::onCmdToggleVClass),
3434
};
3535

36-
FXDEFMAP(GNEAllowVClassesDialog) GNEAllowVClassesDialogMap[] = {
37-
FXMAPFUNC(SEL_COMMAND, MID_GNE_ALLOWVCLASSES_SELECTALL, GNEAllowVClassesDialog::onCmdSelectAll),
38-
FXMAPFUNC(SEL_COMMAND, MID_GNE_ALLOWVCLASSES_UNSELECTALL, GNEAllowVClassesDialog::onCmdUnselectAll),
39-
FXMAPFUNC(SEL_COMMAND, MID_GNE_ALLOWVCLASSES_ONLY_ROAD, GNEAllowVClassesDialog::onCmdSelectOnlyRoad),
40-
FXMAPFUNC(SEL_COMMAND, MID_GNE_ALLOWVCLASSES_ONLY_RAIL, GNEAllowVClassesDialog::onCmdSelectOnlyRail),
36+
FXDEFMAP(GNEVClassesDialog) GNEVClassesDialogMap[] = {
37+
FXMAPFUNC(SEL_COMMAND, MID_GNE_ALLOWVCLASSES_SELECTALL, GNEVClassesDialog::onCmdSelectAll),
38+
FXMAPFUNC(SEL_COMMAND, MID_GNE_ALLOWVCLASSES_UNSELECTALL, GNEVClassesDialog::onCmdUnselectAll),
39+
FXMAPFUNC(SEL_COMMAND, MID_GNE_ALLOWVCLASSES_ONLY_ROAD, GNEVClassesDialog::onCmdSelectOnlyRoad),
40+
FXMAPFUNC(SEL_COMMAND, MID_GNE_ALLOWVCLASSES_ONLY_RAIL, GNEVClassesDialog::onCmdSelectOnlyRail),
4141
};
4242

4343
// Object implementation
44-
FXIMPLEMENT(GNEAllowVClassesDialog::VClassRow, FXHorizontalFrame, VClassRowMap, ARRAYNUMBER(VClassRowMap))
45-
FXIMPLEMENT(GNEAllowVClassesDialog, GNEDialog, GNEAllowVClassesDialogMap, ARRAYNUMBER(GNEAllowVClassesDialogMap))
44+
FXIMPLEMENT(GNEVClassesDialog::VClassRow, FXHorizontalFrame, VClassRowMap, ARRAYNUMBER(VClassRowMap))
45+
FXIMPLEMENT(GNEVClassesDialog, GNEDialog, GNEVClassesDialogMap, ARRAYNUMBER(GNEVClassesDialogMap))
4646

4747
// ===========================================================================
4848
// member method definitions
4949
// ===========================================================================
5050

5151
// ---------------------------------------------------------------------------
52-
// GNEAllowVClassesDialog::VClassRow - methods
52+
// GNEVClassesDialog::VClassRow - methods
5353
// ---------------------------------------------------------------------------
5454

55-
GNEAllowVClassesDialog::VClassRow::VClassRow(FXVerticalFrame* contentsFrame, SUMOVehicleClass vClass,
56-
GUIIcon vClassIcon, const std::string& description) :
55+
GNEVClassesDialog::VClassRow::VClassRow(FXVerticalFrame* contentsFrame, SUMOVehicleClass vClass,
56+
GUIIcon vClassIcon, const std::string& description) :
5757
FXHorizontalFrame(contentsFrame, GUIDesignAuxiliarHorizontalFrame),
5858
myVClassString(getVehicleClassNames(vClass)) {
5959
// add frame for vehicle icons
@@ -72,19 +72,19 @@ GNEAllowVClassesDialog::VClassRow::VClassRow(FXVerticalFrame* contentsFrame, SUM
7272
}
7373

7474

75-
GNEAllowVClassesDialog::VClassRow::~VClassRow() {
75+
GNEVClassesDialog::VClassRow::~VClassRow() {
7676

7777
}
7878

7979

8080
const std::string&
81-
GNEAllowVClassesDialog::VClassRow::getVClassString() const {
81+
GNEVClassesDialog::VClassRow::getVClassString() const {
8282
return myVClassString;
8383
}
8484

8585

8686
void
87-
GNEAllowVClassesDialog::VClassRow::setVClassButtonStatus(const bool enabled) {
87+
GNEVClassesDialog::VClassRow::setVClassButtonStatus(const bool enabled) {
8888
if (enabled) {
8989
myVClassButton->setIcon(GUIIconSubSys::getIcon(GUIIcon::ACCEPT));
9090
} else {
@@ -94,13 +94,13 @@ GNEAllowVClassesDialog::VClassRow::setVClassButtonStatus(const bool enabled) {
9494

9595

9696
bool
97-
GNEAllowVClassesDialog::VClassRow::isVClassButtonEnabled() const {
97+
GNEVClassesDialog::VClassRow::isVClassButtonEnabled() const {
9898
return (myVClassButton->getIcon() == GUIIconSubSys::getIcon(GUIIcon::ACCEPT));
9999
}
100100

101101

102102
long
103-
GNEAllowVClassesDialog::VClassRow::onCmdToggleVClass(FXObject*, FXSelector, void*) {
103+
GNEVClassesDialog::VClassRow::onCmdToggleVClass(FXObject*, FXSelector, void*) {
104104
if (myVClassButton->getIcon() == GUIIconSubSys::getIcon(GUIIcon::ACCEPT)) {
105105
setVClassButtonStatus(false);
106106
} else {
@@ -110,11 +110,11 @@ GNEAllowVClassesDialog::VClassRow::onCmdToggleVClass(FXObject*, FXSelector, void
110110
}
111111

112112
// ---------------------------------------------------------------------------
113-
// GNEAllowVClassesDialog - methods
113+
// GNEVClassesDialog - methods
114114
// ---------------------------------------------------------------------------
115115

116-
GNEAllowVClassesDialog::GNEAllowVClassesDialog(GNEApplicationWindow* mainWindow, SumoXMLAttr attr,
117-
const std::string originalVClasses) :
116+
GNEVClassesDialog::GNEVClassesDialog(GNEApplicationWindow* mainWindow, SumoXMLAttr attr,
117+
const std::string originalVClasses) :
118118
GNEDialog(mainWindow, TLF("Edit vClasses of attribute '%'", toString(attr)), GUIIcon::GREENVEHICLE,
119119
GNEDialog::Buttons::ACCEPT_CANCEL_RESET, OpenType::MODAL, ResizeMode::STATIC),
120120
myOriginalVClasses(originalVClasses),
@@ -185,12 +185,12 @@ GNEAllowVClassesDialog::GNEAllowVClassesDialog(GNEApplicationWindow* mainWindow,
185185
}
186186

187187

188-
GNEAllowVClassesDialog::~GNEAllowVClassesDialog() {
188+
GNEVClassesDialog::~GNEVClassesDialog() {
189189
}
190190

191191

192192
void
193-
GNEAllowVClassesDialog::runInternalTest(const InternalTestStep::DialogArgument* dialogArgument) {
193+
GNEVClassesDialog::runInternalTest(const InternalTestStep::DialogArgument* dialogArgument) {
194194
if (dialogArgument->getAction() == InternalTestStep::DialogArgument::Action::ACCEPT) {
195195
onCmdAccept(nullptr, 0, nullptr);
196196
} else if (dialogArgument->getAction() == InternalTestStep::DialogArgument::Action::CANCEL) {
@@ -208,19 +208,19 @@ GNEAllowVClassesDialog::runInternalTest(const InternalTestStep::DialogArgument*
208208
} else if (SumoVehicleClassStrings.hasString(dialogArgument->getCustomAction())) {
209209
myVClassMap[getVehicleClassID(dialogArgument->getCustomAction())]->onCmdToggleVClass(nullptr, 0, nullptr);
210210
} else {
211-
WRITE_ERROR("Invalid dialog argument " + dialogArgument->getCustomAction() + " used in GNEAllowVClassesDialog::runInternalTest");
211+
WRITE_ERROR("Invalid dialog argument " + dialogArgument->getCustomAction() + " used in GNEVClassesDialog::runInternalTest");
212212
}
213213
}
214214

215215

216216
std::string
217-
GNEAllowVClassesDialog::getModifiedVClasses() const {
217+
GNEVClassesDialog::getModifiedVClasses() const {
218218
return myEditedVClasses;
219219
}
220220

221221

222222
long
223-
GNEAllowVClassesDialog::onCmdSelectAll(FXObject*, FXSelector, void*) {
223+
GNEVClassesDialog::onCmdSelectAll(FXObject*, FXSelector, void*) {
224224
// change all icons to accept
225225
for (const auto& vClass : myVClassMap) {
226226
vClass.second->setVClassButtonStatus(true);
@@ -230,7 +230,7 @@ GNEAllowVClassesDialog::onCmdSelectAll(FXObject*, FXSelector, void*) {
230230

231231

232232
long
233-
GNEAllowVClassesDialog::onCmdUnselectAll(FXObject*, FXSelector, void*) {
233+
GNEVClassesDialog::onCmdUnselectAll(FXObject*, FXSelector, void*) {
234234
// change all icons to cancel
235235
for (const auto& vClass : myVClassMap) {
236236
vClass.second->setVClassButtonStatus(false);
@@ -240,7 +240,7 @@ GNEAllowVClassesDialog::onCmdUnselectAll(FXObject*, FXSelector, void*) {
240240

241241

242242
long
243-
GNEAllowVClassesDialog::onCmdSelectOnlyRoad(FXObject*, FXSelector, void*) {
243+
GNEVClassesDialog::onCmdSelectOnlyRoad(FXObject*, FXSelector, void*) {
244244
// change all non-road icons to disallow, and allow for the rest
245245
for (const auto& vClass : myVClassMap) {
246246
if ((vClass.first & (SVC_PEDESTRIAN | SVC_NON_ROAD)) == 0) {
@@ -254,7 +254,7 @@ GNEAllowVClassesDialog::onCmdSelectOnlyRoad(FXObject*, FXSelector, void*) {
254254

255255

256256
long
257-
GNEAllowVClassesDialog::onCmdSelectOnlyRail(FXObject*, FXSelector, void*) {
257+
GNEVClassesDialog::onCmdSelectOnlyRail(FXObject*, FXSelector, void*) {
258258
// change all non-road icons to disallow, and allow for the rest
259259
for (const auto& vClass : myVClassMap) {
260260
if ((vClass.first & SVC_RAIL_CLASSES) != 0) {
@@ -268,7 +268,7 @@ GNEAllowVClassesDialog::onCmdSelectOnlyRail(FXObject*, FXSelector, void*) {
268268

269269

270270
long
271-
GNEAllowVClassesDialog::onCmdAccept(FXObject*, FXSelector, void*) {
271+
GNEVClassesDialog::onCmdAccept(FXObject*, FXSelector, void*) {
272272
bool allSelected = true;
273273
// clear allow and disallow VClasses
274274
std::vector<std::string> allowedVehicles;
@@ -295,7 +295,7 @@ GNEAllowVClassesDialog::onCmdAccept(FXObject*, FXSelector, void*) {
295295

296296

297297
long
298-
GNEAllowVClassesDialog::onCmdCancel(FXObject*, FXSelector, void*) {
298+
GNEVClassesDialog::onCmdCancel(FXObject*, FXSelector, void*) {
299299
// reset vClasses
300300
myEditedVClasses = myOriginalVClasses;
301301
// cancel
@@ -304,7 +304,7 @@ GNEAllowVClassesDialog::onCmdCancel(FXObject*, FXSelector, void*) {
304304

305305

306306
long
307-
GNEAllowVClassesDialog::onCmdReset(FXObject*, FXSelector, void*) {
307+
GNEVClassesDialog::onCmdReset(FXObject*, FXSelector, void*) {
308308
// reset vClasses
309309
myEditedVClasses = myOriginalVClasses;
310310
// continue depending of allow

‎src/netedit/dialogs/GNEAllowVClassesDialog.h renamed to ‎src/netedit/dialogs/GNEVClassesDialog.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html
1212
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-or-later
1313
/****************************************************************************/
14-
/// @file GNEAllowVClassesDialog.h
14+
/// @file GNEVClassesDialog.h
1515
/// @author Pablo Alvarez Lopez
1616
/// @date Feb 2017
1717
///
@@ -34,9 +34,9 @@ class GNEAttributeCarrier;
3434
// class definitions
3535
// ===========================================================================
3636

37-
class GNEAllowVClassesDialog : public GNEDialog {
37+
class GNEVClassesDialog : public GNEDialog {
3838
/// @brief FOX-declaration
39-
FXDECLARE(GNEAllowVClassesDialog)
39+
FXDECLARE(GNEVClassesDialog)
4040

4141
public:
4242
/// @brief vclass row
@@ -88,11 +88,11 @@ class GNEAllowVClassesDialog : public GNEDialog {
8888
};
8989

9090
/// @brief Constructor
91-
GNEAllowVClassesDialog(GNEApplicationWindow* mainWindow, SumoXMLAttr attr,
92-
const std::string originalVClasses);
91+
GNEVClassesDialog(GNEApplicationWindow* mainWindow, SumoXMLAttr attr,
92+
const std::string originalVClasses);
9393

9494
/// @brief destructor
95-
~GNEAllowVClassesDialog();
95+
~GNEVClassesDialog();
9696

9797
/// @brief run internal test
9898
void runInternalTest(const InternalTestStep::DialogArgument* dialogArgument);
@@ -128,7 +128,7 @@ class GNEAllowVClassesDialog : public GNEDialog {
128128

129129
protected:
130130
/// @brief FOX need this
131-
FOX_CONSTRUCTOR(GNEAllowVClassesDialog)
131+
FOX_CONSTRUCTOR(GNEVClassesDialog)
132132

133133
/// @brief original vClasses (used for reset)
134134
const std::string myOriginalVClasses;
@@ -141,8 +141,8 @@ class GNEAllowVClassesDialog : public GNEDialog {
141141

142142
private:
143143
/// @brief Invalidated copy constructor.
144-
GNEAllowVClassesDialog(const GNEAllowVClassesDialog&) = delete;
144+
GNEVClassesDialog(const GNEVClassesDialog&) = delete;
145145

146146
/// @brief Invalidated assignment operator.
147-
GNEAllowVClassesDialog& operator=(const GNEAllowVClassesDialog&) = delete;
147+
GNEVClassesDialog& operator=(const GNEVClassesDialog&) = delete;
148148
};

‎src/netedit/frames/GNEAttributesEditorRow.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// Row used for edit attributes in GNEAttributesEditorType
1919
/****************************************************************************/
2020

21-
#include <netedit/dialogs/GNEAllowVClassesDialog.h>
21+
#include <netedit/dialogs/GNEVClassesDialog.h>
2222
#include <netedit/dialogs/GNEColorDialog.h>
2323
#include <netedit/frames/common/GNEInspectorFrame.h>
2424
#include <netedit/GNEApplicationWindow.h>
@@ -422,7 +422,7 @@ GNEAttributesEditorRow::onCmdOpenColorDialog(FXObject*, FXSelector, void*) {
422422
long
423423
GNEAttributesEditorRow::onCmdOpenAllowDialog(FXObject*, FXSelector, void*) {
424424
// declare allowVClassesDialog
425-
const auto allowVClassesDialog = new GNEAllowVClassesDialog(myAttributeTable->getFrameParent()->getViewNet()->getViewParent()->getGNEAppWindows(),
425+
const auto allowVClassesDialog = new GNEVClassesDialog(myAttributeTable->getFrameParent()->getViewNet()->getViewParent()->getGNEAppWindows(),
426426
myAttrProperty->getAttr(), myValueTextField->getText().text());
427427
// continue depending of result
428428
if (allowVClassesDialog->getResult() == GNEDialog::Result::ACCEPT) {

0 commit comments

Comments
 (0)