format; rm 'Mask' from mask names

GUI/Model/Mask/MaskItems.cpp

@@ -114,7 +114,7 @@ void MaskItem::readFrom(QXmlStreamReader* r)
 
 RectangleItem::RectangleItem()
 {
-    setName("RectangleMask");
+    setName("Rectangle");
     m_x_low.init("x left", "left x coordinate", 0, 4, RealLimits::limitless(), "xLow");
     m_x_up.init("x right", "right x coordinate", 0, 4, RealLimits::limitless(), "xUp");
     m_y_low.init("y bottom", "bottom y coordinate", 0, 4, RealLimits::limitless(), "yLow");
@@ -234,7 +234,7 @@ std::unique_ptr<IShape2D> RegionOfInterestItem::createShape() const
 
 PolygonItem::PolygonItem()
 {
-    setName("PolygonMask");
+    setName("Polygon");
 }
 
 std::unique_ptr<IShape2D> PolygonItem::createShape() const
@@ -372,7 +372,7 @@ void LineItem::readFrom(QXmlStreamReader* r)
 
 VerticalLineItem::VerticalLineItem()
 {
-    setName("VerticalLineMask");
+    setName("VerticalLine");
 }
 
 std::unique_ptr<IShape2D> VerticalLineItem::createShape() const
@@ -384,7 +384,7 @@ std::unique_ptr<IShape2D> VerticalLineItem::createShape() const
 
 HorizontalLineItem::HorizontalLineItem()
 {
-    setName("HorizontalLineMask");
+    setName("HorizontalLine");
 }
 
 std::unique_ptr<IShape2D> HorizontalLineItem::createShape() const
@@ -396,7 +396,7 @@ std::unique_ptr<IShape2D> HorizontalLineItem::createShape() const
 
 EllipseItem::EllipseItem()
 {
-    setName("EllipseMask");
+    setName("Ellipse");
     m_x_center.init("x center", "x center", 0, 4, RealLimits::limitless(), "xCenter");
     m_y_center.init("y center", "y center", 0, 4, RealLimits::limitless(), "yCenter");
     m_x_radius.init("x radius", "x radius", 0, 4, RealLimits::lowerLimited(0.), "xRadius");
@@ -518,7 +518,7 @@ void EllipseItem::readFrom(QXmlStreamReader* r)
 
 FullframeItem::FullframeItem()
 {
-    setName("FullFrameMask");
+    setName("FullFrame");
 }
 
 std::unique_ptr<IShape2D> FullframeItem::createShape() const

GUI/View/Frame/Plot2DFrame.cpp

@@ -56,11 +56,13 @@ Plot2DFrame::Plot2DFrame()
     panels->addTab(axes_panel, "Scales");
     panels->setTabToolTip(0, "Scales panel");
 
-    auto* masks_panel = new MasksPanel([this]() -> MasksSet* { return dataItem()->masksRW(); }, true);
+    auto* masks_panel =
+        new MasksPanel([this]() -> MasksSet* { return dataItem()->masksRW(); }, true);
     panels->addTab(masks_panel, "Masks");
     panels->setTabToolTip(1, "Masks panel");
 
-    auto* prjns_panel = new MasksPanel([this]() -> MasksSet* { return dataItem()->prjnsRW(); }, false);
+    auto* prjns_panel =
+        new MasksPanel([this]() -> MasksSet* { return dataItem()->prjnsRW(); }, false);
     panels->addTab(prjns_panel, "Prjns");
     panels->setTabToolTip(2, "Projections panel");
 

GUI/View/Setup/MasksPanel.cpp

@@ -98,34 +98,34 @@ void MasksPanel::updateMaskEditor()
         return;
 
     if (m_mask_not_prjn) {
-	// -- mask value (only if not RoI)
-	if (!dynamic_cast<RegionOfInterestItem*>(t)) {
-	    auto* check_box = new QCheckBox("Maskvalue", m_editor_layout->parentWidget());
-	    m_editor_layout->addRow(check_box);
-	    check_box->setChecked(t->maskValue());
-	    connect(check_box, &QCheckBox::stateChanged, [t, check_box] {
-		ASSERT(check_box);
-		t->setMaskValue(check_box->isChecked());
-		ASSERT(t);
-		emit t->maskGeometryChanged();
-		gDoc->setModified();
-	    });
-	}
-
-	// -- mask visibility
-	auto* check_box = new QCheckBox("Show", m_editor_layout->parentWidget());
-	m_editor_layout->addRow(check_box);
-	check_box->setChecked(t->isVisible());
-	connect(check_box, &QCheckBox::stateChanged, [this, t, check_box] {
-	    ASSERT(check_box);
-	    m_keep_selection = true;
-	    ASSERT(t);
-	    t->setIsVisible(check_box->isChecked());
-	    t->setWasVisible(check_box->isChecked());
-	    m_keep_selection = false;
-	    emit t->maskGeometryChanged();
-	    gDoc->setModified();
-	});
+        // -- mask value (only if not RoI)
+        if (!dynamic_cast<RegionOfInterestItem*>(t)) {
+            auto* check_box = new QCheckBox("Maskvalue", m_editor_layout->parentWidget());
+            m_editor_layout->addRow(check_box);
+            check_box->setChecked(t->maskValue());
+            connect(check_box, &QCheckBox::stateChanged, [t, check_box] {
+                ASSERT(check_box);
+                t->setMaskValue(check_box->isChecked());
+                ASSERT(t);
+                emit t->maskGeometryChanged();
+                gDoc->setModified();
+            });
+        }
+
+        // -- mask visibility
+        auto* check_box = new QCheckBox("Show", m_editor_layout->parentWidget());
+        m_editor_layout->addRow(check_box);
+        check_box->setChecked(t->isVisible());
+        connect(check_box, &QCheckBox::stateChanged, [this, t, check_box] {
+            ASSERT(check_box);
+            m_keep_selection = true;
+            ASSERT(t);
+            t->setIsVisible(check_box->isChecked());
+            t->setWasVisible(check_box->isChecked());
+            m_keep_selection = false;
+            emit t->maskGeometryChanged();
+            gDoc->setModified();
+        });
     }
 
     // -- name (only if not RoI)