Issue #412: Crash on delete sketch line with constraints

[modules/shaper.git] / src / ModuleBase / ModuleBase_Tools.cpp

diff --git a/src/ModuleBase/ModuleBase_Tools.cpp b/src/ModuleBase/ModuleBase_Tools.cpp
index 0f57b4c7b7fedc812fa84c3cc465d9d369d6205f..06e8fb08dc8befc26ccd7f1dda8c3304313598eb 100644 (file)
--- a/src/ModuleBase/ModuleBase_Tools.cpp
+++ b/src/ModuleBase/ModuleBase_Tools.cpp
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        ModuleBase_Tools.cpp
 // Created:     11 July 2014
 // Author:      Vitaly Smetannikov
@@ -7,6 +9,7 @@
 #include <QLayout>
 #include <QPainter>
 #include <QBitmap>
+#include <QDoubleSpinBox>
 
 namespace ModuleBase_Tools {
 
@@ -25,7 +28,7 @@ void adjustMargins(QLayout* theLayout)
 {
   if(!theLayout)
     return;
-  theLayout->setContentsMargins(2, 5, 5, 2);
+  theLayout->setContentsMargins(2, 5, 2, 5);
   theLayout->setSpacing(4);
 }
 
@@ -44,8 +47,7 @@ void zeroMargins(QLayout* theLayout)
   theLayout->setSpacing(5);
 }
 
-QPixmap composite(const QString& theAdditionalIcon, const int theXShift,
-                  const int theYShift, const QString& theIcon)
+QPixmap composite(const QString& theAdditionalIcon, const QString& theIcon)
 {
   QImage anIcon(theIcon);
   QImage anAditional(theAdditionalIcon);
@@ -59,12 +61,12 @@ QPixmap composite(const QString& theAdditionalIcon, const int theXShift,
   int aWidth = anIcon.width();
   int aHeight = anIcon.height();
 
-  int aStartWidthPos = aWidth-anAddWidth-1;
-  int aStartHeightPos = aHeight-anAddHeight-1;
+  int aStartWidthPos = aWidth - anAddWidth - 1;
+  int aStartHeightPos = aHeight - anAddHeight - 1;
 
-  for (int i = 0; i < anAddWidth; i++)
+  for (int i = 0; i < anAddWidth && i + aStartWidthPos < aWidth; i++)
   {
-    for (int j = 0; j < anAddHeight; j++)
+    for (int j = 0; j < anAddHeight && j + aStartHeightPos < aHeight; j++)
     {
       if (qAlpha(anAditional.pixel(i, j)) > 0)
         anIcon.setPixel(i + aStartWidthPos, j + aStartHeightPos, anAditional.pixel(i, j));
@@ -96,6 +98,13 @@ QPixmap lighter(const QString& theIcon, const int theLighterValue)
   return QPixmap::fromImage(aResult);
 }
 
+void setSpinValue(QDoubleSpinBox* theSpin, double theValue)
+{
+  bool isBlocked = theSpin->blockSignals(true);
+  theSpin->setValue(theValue);
+  theSpin->blockSignals(isBlocked);
+}
+
 }