r18480 by jghali - apply part of Cezary PP speedup patch from #11144

scribus-commit scribus-commit at lists.scribus.net
Mon Sep 16 21:04:58 UTC 2013


Author: jghali
Date: Mon Sep 16 21:04:57 2013
New Revision: 18480

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18480
Log:
apply part of Cezary PP speedup patch from #11144

Modified:
    trunk/Scribus/scribus/ui/propertiespalette_group.cpp
    trunk/Scribus/scribus/ui/propertiespalette_image.cpp
    trunk/Scribus/scribus/ui/propertiespalette_line.cpp
    trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
    trunk/Scribus/scribus/ui/propertiespalette_table.cpp
    trunk/Scribus/scribus/ui/propertiespalette_text.cpp
    trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp

Modified: trunk/Scribus/scribus/ui/propertiespalette_group.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18480&path=/trunk/Scribus/scribus/ui/propertiespalette_group.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_group.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_group.cpp Mon Sep 16 21:04:57 2013
@@ -252,7 +252,7 @@
 		setCurrentItem(currItem);
 	}
 	updateGeometry();
-	repaint();
+	//repaint();
 }
 
 void PropertiesPalette_Group::handleUpdateRequest(int updateFlags)

Modified: trunk/Scribus/scribus/ui/propertiespalette_image.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18480&path=/trunk/Scribus/scribus/ui/propertiespalette_image.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_image.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_image.cpp Mon Sep 16 21:04:57 2013
@@ -414,7 +414,7 @@
 		setCurrentItem(currItem);
 	}
 	updateGeometry();
-	repaint();
+	//repaint();
 }
 
 void PropertiesPalette_Image::handleUpdateRequest(int updateFlags)

Modified: trunk/Scribus/scribus/ui/propertiespalette_line.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18480&path=/trunk/Scribus/scribus/ui/propertiespalette_line.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_line.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_line.cpp Mon Sep 16 21:04:57 2013
@@ -224,7 +224,7 @@
 		setCurrentItem(currItem);
 	}
 	updateGeometry();
-	repaint();
+	//repaint();
 }
 
 void PropertiesPalette_Line::handleUpdateRequest(int updateFlags)

Modified: trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18480&path=/trunk/Scribus/scribus/ui/propertiespalette_shape.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_shape.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_shape.cpp Mon Sep 16 21:04:57 2013
@@ -313,7 +313,7 @@
 	}
 	setCurrentItem(currItem);
 	updateGeometry();
-	repaint();
+	//repaint();
 }
 
 void PropertiesPalette_Shape::handleUpdateRequest(int updateFlags)

Modified: trunk/Scribus/scribus/ui/propertiespalette_table.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18480&path=/trunk/Scribus/scribus/ui/propertiespalette_table.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_table.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_table.cpp Mon Sep 16 21:04:57 2013
@@ -326,7 +326,9 @@
 			if (color == CommonStrings::None)
 				color = CommonStrings::tr_NoneColor;
 			setCurrentComboItem(fillColor, color);
+			bool sigBlocked = fillShade->blockSignals(true);
 			fillShade->setValue(table->fillShade());
+			fillShade->blockSignals(sigBlocked);
 		}
 		else
 		{
@@ -335,7 +337,9 @@
 			if (color == CommonStrings::None)
 				color = CommonStrings::tr_NoneColor;
 			setCurrentComboItem(fillColor, color);
+			bool sigBlocked = fillShade->blockSignals(true);
 			fillShade->setValue(cell.fillShade());
+			fillShade->blockSignals(sigBlocked);
 		}
 	}
 	else

Modified: trunk/Scribus/scribus/ui/propertiespalette_text.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18480&path=/trunk/Scribus/scribus/ui/propertiespalette_text.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_text.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_text.cpp Mon Sep 16 21:04:57 2013
@@ -265,7 +265,7 @@
 		setCurrentItem(currItem);
 	}
 	updateGeometry();
-	repaint();
+	//repaint();
 }
 
 void PropertiesPalette_Text::handleUpdateRequest(int updateFlags)

Modified: trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18480&path=/trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp (original)
+++ trunk/Scribus/scribus/ui/propertiespalette_xyz.cpp Mon Sep 16 21:04:57 2013
@@ -542,7 +542,7 @@
 		setCurrentItem(currItem);
 	}
 	updateGeometry();
-	repaint();
+	//repaint();
 }
 
 void PropertiesPalette_XYZ::unitChange()
@@ -634,15 +634,14 @@
 {
 	if (!m_ScMW || m_ScMW->scriptIsRunning())
 		return;
-	bool tmp = m_haveItem;
-	m_haveItem = false;
 	QTransform ma;
 	QPoint dp;
+	bool sigBlocked1 = widthSpin->blockSignals(true);
+	bool sigBlocked2 = heightSpin->blockSignals(true);
 	if ((m_lineMode) && (m_item->asLine()))
 	{
 		ma.translate(static_cast<double>(xposSpin->value()) / m_unitRatio, static_cast<double>(yposSpin->value()) / m_unitRatio);
 		ma.rotate(static_cast<double>(rotationSpin->value())*(-1));
-		// Qt4 dp = ma * QPoint(static_cast<int>(x), static_cast<int>(y));
 		dp = QPoint(static_cast<int>(x), static_cast<int>(y)) * ma;
 		widthSpin->setValue(dp.x()*m_unitRatio);
 		heightSpin->setValue(dp.y()*m_unitRatio);
@@ -652,20 +651,20 @@
 		widthSpin->setValue(x*m_unitRatio);
 		heightSpin->setValue(y*m_unitRatio);
 	}
-	m_haveItem = tmp;
+	widthSpin->blockSignals(sigBlocked1);
+	heightSpin->blockSignals(sigBlocked2);
 }
 
 void PropertiesPalette_XYZ::displayRotation(double r)
 {
 	if (!m_ScMW || m_ScMW->scriptIsRunning())
 		return;
-	bool tmp = m_haveItem;
 	double rr = r;
 	if (r > 0)
 		rr = 360 - rr;
-	m_haveItem = false;
+	bool sigBlocked = rotationSpin->blockSignals(true);
 	rotationSpin->setValue(fabs(rr));
-	m_haveItem = tmp;
+	rotationSpin->blockSignals(sigBlocked);
 }
 
 void PropertiesPalette_XYZ::handleNewX()




More information about the scribus-commit mailing list