#5451: Introduce DeleteLayer command

codereader · Dec 25, 2020 · 3c1db14 · 3c1db14
1 parent 06d0f8b
commit 3c1db14
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 3 deletions.
diff --git a/radiant/ui/layers/LayerControl.cpp b/radiant/ui/layers/LayerControl.cpp
@@ -177,7 +177,7 @@ void LayerControl::onDelete(wxCommandEvent& ev)
 
 	if (box->run() == IDialog::RESULT_YES)
 	{
-		layerSystem.deleteLayer(layerSystem.getLayerName(_layerID));
+        GlobalCommandSystem().executeCommand("DeleteLayer", cmd::Argument(_layerID));
 	}
 }
 

diff --git a/radiantcore/layers/LayerModule.cpp b/radiantcore/layers/LayerModule.cpp
@@ -5,6 +5,7 @@
 #include "imap.h"
 
 #include "module/StaticModule.h"
+#include "command/ExecutionFailure.h"
 #include "LayerManager.h"
 #include "LayerInfoFileModule.h"
 
@@ -15,6 +16,7 @@ namespace
 {
 
 const char* const COMMAND_CREATELAYER("CreateLayer");
+const char* const COMMAND_DELETELAYER("DeleteLayer");
 const char* const COMMAND_ADDTOLAYER("AddSelectionToLayer");
 const char* const COMMAND_MOVETOLAYER("MoveSelectionToLayer");
 const char* const COMMAND_REMOVEFROMLAYER("RemoveSelectionFromLayer");
@@ -85,6 +87,10 @@ class LayerModule :
             std::bind(&LayerModule::createLayer, this, std::placeholders::_1),
             { cmd::ARGTYPE_STRING });
 
+        GlobalCommandSystem().addCommand(COMMAND_DELETELAYER,
+            std::bind(&LayerModule::deleteLayer, this, std::placeholders::_1),
+            { cmd::ARGTYPE_INT });
+
 		GlobalMapInfoFileManager().registerInfoFileModule(
 			std::make_shared<LayerInfoFileModule>()
 		);
@@ -111,6 +117,28 @@ class LayerModule :
         });
     }
 
+    void deleteLayer(const cmd::ArgumentList& args)
+    {
+        if (args.size() != 1)
+        {
+            rError() << "Usage: " << COMMAND_DELETELAYER << " <LayerID> " << std::endl;
+            return;
+        }
+
+        DoWithMapLayerManager([&](ILayerManager& manager)
+        {
+            auto layerName = manager.getLayerName(args[0].getInt());
+
+            if (layerName.empty())
+            {
+                throw cmd::ExecutionFailure(_("This layer ID doesn't exist"));
+            }
+
+            manager.deleteLayer(layerName);
+            GlobalMapModule().setModified(true);
+        });
+    }
+
 	void addSelectionToLayer(const cmd::ArgumentList& args)
 	{
 		if (args.size() != 1)

diff --git a/test/LayerManipulation.cpp b/test/LayerManipulation.cpp
@@ -42,9 +42,10 @@ TEST_F(LayerTest, DeleteLayerMarksMapAsModified)
     auto& layerManager = GlobalMapModule().getRoot()->getLayerManager();
 
     EXPECT_FALSE(GlobalMapModule().isModified());
-    EXPECT_NE(layerManager.getLayerID("Second Layer"), -1);
+    auto layerId = layerManager.getLayerID("Second Layer");
+    EXPECT_NE(layerId, -1);
 
-    layerManager.deleteLayer("Second Layer");
+    GlobalCommandSystem().executeCommand("DeleteLayer", cmd::Argument(layerId));
 
     EXPECT_TRUE(GlobalMapModule().isModified());
 }