[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegames/kolf
From:       Stefan Majewsky <majewsky () gmx ! net>
Date:       2010-10-31 22:15:42
Message-ID: 20101031221542.57AC7AC8E5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1191687 by majewsky:

Remove obsolete scaling code in Putter, StrokeCircle and KolfGame.

 M  +9 -45     game.cpp  
 M  +2 -15     game.h  


--- trunk/KDE/kdegames/kolf/game.cpp #1191686:1191687
@@ -926,18 +926,15 @@
 	setData(0, Rtti_Putter);
 	m_showGuideLine = true;
 	oneDegree = M_PI / 180;
-	resizeFactor = 1;
-	baseGuideLineLength = guideLineLength = 9;
-	baseGuideLineThickness = 1;
-	basePutterThickness = 4;
-	basePutterWidth = putterWidth = 11;
+	guideLineLength = 9;
+	putterWidth = 11;
 	angle = 0;
 
 	guideLine = new HintedLineItem(true, this);
-	guideLine->setPen(QPen(Qt::white, baseGuideLineThickness));
+	guideLine->setPen(QPen(Qt::white));
 	guideLine->setZValue(998.8);
 
-	setPen(QPen(Qt::black, basePutterThickness));
+	setPen(QPen(Qt::black, 4));
 	maxAngle = 2 * M_PI;
 
 	hideInfo();
@@ -946,15 +943,6 @@
 	resetAngles();
 }
 
-void Putter::resize(double resizeFactor)
-{
-	this->resizeFactor = resizeFactor;
-	guideLineLength = baseGuideLineLength * resizeFactor;
-	guideLine->setPen(QPen(Qt::white, baseGuideLineThickness*resizeFactor, \
                Qt::DotLine));
-	putterWidth = basePutterWidth * resizeFactor;
-	setPen(QPen(Qt::black, basePutterThickness*resizeFactor));
-}
-
 void Putter::showInfo()
 {
 	guideLine->setVisible(isVisible());
@@ -987,7 +975,7 @@
 {
 	setVisible(true);
 	setPos(_x, _y);
-	guideLineLength = baseGuideLineLength * resizeFactor;
+	guideLineLength = 9; //reset to default
 	finishMe();
 }
 
@@ -1004,11 +992,11 @@
 	switch (d)
 	{
 		case Forwards:
-			guideLineLength -= 1*resizeFactor;
+			guideLineLength -= 1;
 			guideLine->setVisible(false);
 			break;
 		case Backwards:
-			guideLineLength += 1*resizeFactor;
+			guideLineLength += 1;
 			guideLine->setVisible(false);
 			break;
 		case D_Left:
@@ -2099,15 +2087,9 @@
 	iheight = 100;
 	ithickness = 8;
 	setZValue(10000);
-}
 
-void StrokeCircle::resize(double resizeFactor)
-{
-	const double baseSize = 80;
-	const double baseThickness = 8;
-
-	setSize(resizeFactor * baseSize, resizeFactor * baseSize);
-	setThickness(resizeFactor * baseThickness);
+	setSize(80, 80);
+	setThickness(8);
 }
 
 void StrokeCircle::setValue(double v)
@@ -2300,7 +2282,6 @@
 	// create the advanced putting indicator
 	strokeCircle = new StrokeCircle(courseBoard);
 	strokeCircle->setPos(width - 90, height - 90);
-	strokeCircle->resize(1);
 	strokeCircle->setVisible(false);
 	strokeCircle->setValue(0);
 	strokeCircle->setMaxValue(360); 
@@ -2836,25 +2817,8 @@
 
 	int setSize = qMin(newW, newH);
 	QGraphicsView::resize(setSize, setSize); //make sure new size is square
-
-// 	resizeAllItems((double)setSize/400.0);
-	resizeAllItems(1); //item scaling is now done automatically by Tagaro::Board
-	//TODO: Remove all the manual scaling code.
 }
 
-void KolfGame::resizeAllItems(double resizeFactor, bool resizeBorderWalls)
-{
-	Q_UNUSED(resizeBorderWalls);
-	//resizeFactor is the number to multiply default sizes and positions by to get \
their resized value (i.e. if it is 1 then use default size, if it is >1 then \
                everything needs to be bigger, and if it is <1 then everything needs \
                to be smaller)
-	
-	//stroke circle resize
-	strokeCircle->resize(resizeFactor);
-
-	//putter resize
-	putter->setPos((*curPlayer).ball()->x(), (*curPlayer).ball()->y());
-	putter->resize(resizeFactor);
-}
-
 void KolfGame::puttRelease()
 {
 	if (!m_useAdvancedPutting && putting && !editing)
--- trunk/KDE/kdegames/kolf/game.h #1191686:1191687
@@ -512,7 +512,7 @@
 {
 public:
 	Putter(QGraphicsItem* parent);
-	void resize(double resizeFactor);
+
 	void go(Direction, Amount amount = Amount_Normal);
 	void setOrigin(double x, double y);
 	double curLen() const { return guideLineLength; }
@@ -537,17 +537,7 @@
 	double angle;
 	double oneDegree;
 	QMap<Ball *, double> angleMap;
-	/*
-	 * base numbers are the size or position when no resizing has taken place (i.e. the \
                defaults)
-	 */
-	double guideLineLength, baseGuideLineLength;
-	double baseGuideLineThickness;
-	double basePutterThickness;
-	double basePutterWidth, putterWidth;
-	/*
-	 * resizeFactor is the number to multiply base numbers by to get their resized \
value (i.e. if it is 1 then use default size, if it is >1 then everything needs to be \
                bigger, and if it is <1 then everything needs to be smaller)
-	 */
-	double resizeFactor;
+	double guideLineLength, putterWidth;
 	void finishMe();
 	QGraphicsLineItem *guideLine;
 	bool m_showGuideLine;
@@ -767,7 +757,6 @@
 public:
 	StrokeCircle(QGraphicsItem *parent);
 
-	void resize(double resizeFactor);
 	void setValue(double v);
 	double value();
 	void setMaxValue(double m);
@@ -910,8 +899,6 @@
 
 	//resizes view to make sure it is square and calls resizeAllItems
 	void resizeEvent(QResizeEvent *);
-	//resizes and moves all items in the game
-	void resizeAllItems(double resizeFactor, bool resizeBorderWalls=1);
 
 	QPoint viewportToViewport(const QPoint &p);
 


[prev in list] [next in list] [prev in thread] [next in thread]