Merge branch 'develop'

richelbilderbeek · Sep 9, 2018 · 4307c2b · 4307c2b
2 parents 6334bec + d9896a9
commit 4307c2b
Showing 1 changed file with 1 addition and 19 deletions.
diff --git a/CppQtQuadBezierArrowItem/qtquadbezierarrowitem.cpp b/CppQtQuadBezierArrowItem/qtquadbezierarrowitem.cpp
@@ -316,24 +316,6 @@ void ribi::QtQuadBezierArrowItem::paint(
   const QStyleOptionGraphicsItem *,
   QWidget *)
 {
-  #define FIX_BRAINWEAVER_ISSUE_288
-  #ifdef FIX_BRAINWEAVER_ISSUE_288
-  //https://github.com/richelbilderbeek/BrainWeaver/issues/288
-  //  if (!parentItem()->scene())
-  //  {
-  //    qCritical() << "STOPPED";
-  //    while (1)
-  //    {
-  //      qApp->processEvents();
-  //    }
-  //  }
-  if (!parentItem()->scene())
-  {
-    throw std::runtime_error("QtQuadBezierArrowItem must have a parent");
-  }
-  assert(parentItem()->scene());
-  #endif // FIX_BRAINWEAVER_ISSUE_288
-
   painter->setRenderHint(QPainter::Antialiasing);
 
   if (this->isSelected() || this->hasFocus())
@@ -403,7 +385,7 @@ void ribi::QtQuadBezierArrowItem::paint(
 
       const QPointF p0(p_end_head.x(),p_end_head.y());
       const QPointF p1
-        = p0 + QPointF( 
+        = p0 + QPointF(
            std::cos(angle1) * sz,
            -std::sin(angle1) * sz);
       const QPointF p2