Finalization of the MVP

src/app/seamly2d/core/vtooloptionspropertybrowser.cpp

@@ -506,14 +506,14 @@ void VToolOptionsPropertyBrowser::itemClicked(QGraphicsItem *item)
 {
     if (item != nullptr)
     {
-        if (item->type() == QGraphicsItem::UserType + static_cast<int>(Tool::BackgroundImage))
+        if (item->isEnabled()==false)
         {
             return;
         }
 
-        if (item->isEnabled()==false)
+        if(item->type() == QGraphicsItem::UserType + static_cast<int>(Tool::BackgroundImage))
         {
-            return;
+            item = nullptr;
         }
     }
 

src/app/seamly2d/mainwindow.cpp

@@ -1688,11 +1688,9 @@ void  MainWindow::addImage(DraftImage image)
     {
         image.width  = image.pixmap.width();
         image.height = image.pixmap.height();
-        image.xScale = 100;
-        image.yScale = 100;
     }
 
-    ImageItem *item = new ImageItem(image);
+    ImageItem *item = new ImageItem(doc, image);
     doc->addBackgroundImage(image.id, item);
     draftScene->addItem(item);
     //Need error dialog
@@ -1796,8 +1794,6 @@ void MainWindow::updateImage(DraftImage image)
     qCDebug(vMainWindow, "YPos = %f", image.yPos);
     qCDebug(vMainWindow, "Width = %f", image.width);
     qCDebug(vMainWindow, "Height = %f", image.height);
-    qCDebug(vMainWindow, "XScale = %f", image.xScale);
-    qCDebug(vMainWindow, "YScale = %f", image.yScale);
     qCDebug(vMainWindow, "lock Image Aspect = %s",  image.aspectLocked ? "True" : "False");
     qCDebug(vMainWindow, "Units = %d", static_cast<int>(image.units));
     qCDebug(vMainWindow, "Rotation = %f", image.rotation);
@@ -1816,11 +1812,12 @@ void MainWindow::updateImage(DraftImage image)
 //---------------------------------------------------------------------------------------------------------------------
 QString MainWindow::getImageFilename()
 {
-    const QString filter = tr("PNG") + QLatin1String(" (*.png);;") +
-                           tr("JPG") + QLatin1String(" (*.jpg);;") +
-                           tr("SVG") + QLatin1String(" (*.svg);;") +
-                           tr("BMP") + QLatin1String(" (*.bmp);;") +
-                           tr("TIF") + QLatin1String(" (*.tf)");
+    const QString filter = tr("Images") + QLatin1String(" (*.bmp *.jpg *.png *.svg *.tf);;") +
+                           "BMP" + QLatin1String(" (*.bmp);;") +
+                           "JPG" + QLatin1String(" (*.jpg);;") +
+                           "PNG" + QLatin1String(" (*.png);;") +
+                           "SVG" + QLatin1String(" (*.svg);;") +
+                           "TIF" + QLatin1String(" (*.tf)");
 
     const QString path = qApp->Seamly2DSettings()->getImageFilePath();
 
@@ -4401,6 +4398,7 @@ void MainWindow::Clear()
 #endif
     CleanLayout();
     pieceList.clear(); // don't move to CleanLayout()
+    doc->clearBackgroundImageMap();
     qApp->getUndoStack()->clear();
     toolProperties->clearPropertyBrowser();
     toolProperties->itemClicked(nullptr);

src/libs/ifc/xml/vabstractpattern.cpp

@@ -3130,25 +3130,30 @@ QString VAbstractPattern::useGroupLineWeight(quint32 toolId, QString weight)
 }
 
 
-QMap<qint32, ImageItem *>   VAbstractPattern::getBackgroundImageMap()
+QMap<qint32, ImageItem *> VAbstractPattern::getBackgroundImageMap()
 {
     return m_imageMap;
 }
 
 
-void    VAbstractPattern::addBackgroundImage(qint32 id, ImageItem *item)
+void VAbstractPattern::addBackgroundImage(qint32 id, ImageItem *item)
 {
     m_imageMap.insert(id, item);
 }
 
 
-void    VAbstractPattern::removeBackgroundImage(qint32 id)
+void VAbstractPattern::removeBackgroundImage(qint32 id)
 {
     m_imageMap.remove(id);
 }
 
 
-ImageItem*  VAbstractPattern::getBackgroundImage(qint32 id)
+ImageItem* VAbstractPattern::getBackgroundImage(qint32 id)
 {
     return m_imageMap.value(id);
 }
+
+void VAbstractPattern::clearBackgroundImageMap()
+{
+    m_imageMap.clear();
+}

src/libs/ifc/xml/vabstractpattern.h

@@ -179,6 +179,7 @@ class VAbstractPattern : public QObject, public VDomDocument
     ImageItem *                    getBackgroundImage(qint32 id);
     void                           addBackgroundImage(qint32 id, ImageItem *item);
     void                           removeBackgroundImage(qint32 id);
+    void                           clearBackgroundImageMap();
 
     QMap<GHeights, bool>           GetGradationHeights() const;
     void                           SetGradationHeights(const QMap<GHeights, bool> &options);