Make label and polyline part of non base plan

AlbrechtL · Jun 9, 2019 · 3402b97 · 3402b97
1 parent 7bd40b9
commit 3402b97
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 # Ignoring original svn files
 .svn/
+classes/
diff --git a/src/com/eteks/sweethome3d/viewcontroller/LabelController.java b/src/com/eteks/sweethome3d/viewcontroller/LabelController.java
@@ -519,7 +519,7 @@ private static void doDeleteLabel(Home home, Label label, boolean basePlanLocked
    * Returns <code>true</code>.
    */
   protected boolean isLabelPartOfBasePlan(Label label) {
-    return true;
+    return false;
   }
 
   /**

diff --git a/src/com/eteks/sweethome3d/viewcontroller/PlanController.java b/src/com/eteks/sweethome3d/viewcontroller/PlanController.java
@@ -866,7 +866,14 @@ public String getPresentationName() {
   protected boolean isItemPartOfBasePlan(Selectable item) {
     if (item instanceof HomePieceOfFurniture) {
       return isPieceOfFurniturePartOfBasePlan((HomePieceOfFurniture)item);
-    } else {
+    } 
+    else if(item instanceof Label) {
+      return false;
+    }
+    else if (item instanceof Polyline) {
+      return false;
+    }
+    else {
       return !(item instanceof ObserverCamera);
     }
   }