diff -Nru rcsnao2d-0.0.2/debian/changelog rcsnao2d-0.0.3/debian/changelog --- rcsnao2d-0.0.2/debian/changelog 2011-12-07 20:05:00.000000000 +0000 +++ rcsnao2d-0.0.3/debian/changelog 2012-06-12 22:02:02.000000000 +0000 @@ -1,5 +1,5 @@ -rcsnao2d (0.0.2-0oneiric3) oneiric; urgency=high +rcsnao2d (0.0.3-0oneiric1) oneiric; urgency=high - * x64 problem2 + * Stable Release - -- Hossein Ansari Wed, 07 Dec 2011 23:12:58 +0430 + -- Hossein Ansari Wed, 13 Jun 2012 02:06:43 +0430 diff -Nru rcsnao2d-0.0.2/debian/compat rcsnao2d-0.0.3/debian/compat --- rcsnao2d-0.0.2/debian/compat 2011-04-07 11:58:36.000000000 +0000 +++ rcsnao2d-0.0.3/debian/compat 2012-06-12 21:52:32.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru rcsnao2d-0.0.2/debian/patches/debian-changes-0.0.2-0oneiric2 rcsnao2d-0.0.3/debian/patches/debian-changes-0.0.2-0oneiric2 --- rcsnao2d-0.0.2/debian/patches/debian-changes-0.0.2-0oneiric2 2011-12-07 19:55:54.000000000 +0000 +++ rcsnao2d-0.0.3/debian/patches/debian-changes-0.0.2-0oneiric2 1970-01-01 00:00:00.000000000 +0000 @@ -1,36 +0,0 @@ -Description: Upstream changes introduced in version 0.0.2-0oneiric2 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - rcsnao2d (0.0.2-0oneiric2) natty; urgency=low - . - * x64 problem2 - . - The person named in the Author field signed this changelog entry. -Author: Hossein Ansari - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- rcsnao2d-0.0.2.orig/monitor.cpp -+++ rcsnao2d-0.0.2/monitor.cpp -@@ -64,7 +64,7 @@ Monitor::Monitor(QWidget *parent) : - } - - QPointF Monitor::scale(QPointF realPos){ -- QPointF ret(center.x()+realPos.x()*scaleX,center.y()+realPos.y()*scaleY); -+ QPointF ret(center.x()+realPos.x()*scaleX,center.y( )+realPos.y()*scaleY); - return ret; - } - diff -Nru rcsnao2d-0.0.2/debian/patches/debian-changes-0.0.2-1 rcsnao2d-0.0.3/debian/patches/debian-changes-0.0.2-1 --- rcsnao2d-0.0.2/debian/patches/debian-changes-0.0.2-1 2011-04-07 12:01:08.000000000 +0000 +++ rcsnao2d-0.0.3/debian/patches/debian-changes-0.0.2-1 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -Description: Upstream changes introduced in version 0.0.2-1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - rcsnao2d (0.0.2-1) unstable; urgency=low - . - * Initial release (Closes: #nnnn) - . - The person named in the Author field signed this changelog entry. -Author: Hossein Ansari - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- rcsnao2d-0.0.2.orig/monitor.cpp -+++ rcsnao2d-0.0.2/monitor.cpp -@@ -430,16 +430,39 @@ void Monitor::drawOtherLines(QPainter &p - QPointF sideDownLeft = scale(QPointF(-fieldLength/2.0,fieldWidth/2.0)); - QPointF sideDownRight = scale(QPointF(fieldLength/2.0,fieldWidth/2.0)); - -+ QPointF penaltyDownLeft = scale(QPointF(-fieldLength/2.0,penaltyWidth/2.0)); -+ QPointF penaltyDownRight = scale(QPointF(-fieldLength/2.0+penaltyLength,penaltyWidth/2.0)); -+ -+ QPointF penaltyUpLeft = scale(QPointF(-fieldLength/2.0,-penaltyWidth/2.0)); -+ QPointF penaltyUpRight = scale(QPointF(-fieldLength/2.0+penaltyLength,-penaltyWidth/2.0)); -+ -+ QPointF rPenaltyDownLeft = scale(-QPointF(-fieldLength/2.0,penaltyWidth/2.0)); -+ QPointF rPenaltyDownRight = scale(-QPointF(-fieldLength/2.0+penaltyLength,penaltyWidth/2.0)); -+ -+ QPointF rPenaltyUpLeft = scale(-QPointF(-fieldLength/2.0,-penaltyWidth/2.0)); -+ QPointF rPenaltyUpRight = scale(-QPointF(-fieldLength/2.0+penaltyLength,-penaltyWidth/2.0)); -+ -+ -+ - - paint.setPen(Qt::white); - - /// Left Side Of Fielde Drawing - paint.drawLine(centerUp,centerDown); -+ - paint.drawLine( sideUpLeft ,sideUpRight ); - paint.drawLine( sideDownLeft , sideDownRight); - paint.drawLine( sideUpLeft ,sideDownLeft ); - paint.drawLine( sideUpRight , sideDownRight); - -+ paint.drawLine(penaltyDownLeft,penaltyDownRight); -+ paint.drawLine(penaltyUpLeft,penaltyUpRight); -+ paint.drawLine(penaltyUpRight,penaltyDownRight); -+ -+ paint.drawLine(rPenaltyDownLeft,rPenaltyDownRight); -+ paint.drawLine(rPenaltyUpLeft,rPenaltyUpRight); -+ paint.drawLine(rPenaltyUpRight,rPenaltyDownRight); -+ - - /// - paint.drawEllipse(scale(QPointF(0,0)) , scaleX*centerRadius , scaleX*centerRadius ); diff -Nru rcsnao2d-0.0.2/debian/patches/debian-changes-0.0.2-4maverick rcsnao2d-0.0.3/debian/patches/debian-changes-0.0.2-4maverick --- rcsnao2d-0.0.2/debian/patches/debian-changes-0.0.2-4maverick 2011-04-08 07:33:16.000000000 +0000 +++ rcsnao2d-0.0.3/debian/patches/debian-changes-0.0.2-4maverick 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -Description: Upstream changes introduced in version 0.0.2-4maverick - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - rcsnao2d (0.0.2-4maverick) maverick; urgency=low - . - * Initial release - . - The person named in the Author field signed this changelog entry. -Author: Hossein Ansari - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- rcsnao2d-0.0.2.orig/monitor.cpp -+++ rcsnao2d-0.0.2/monitor.cpp -@@ -260,10 +260,11 @@ void Monitor::drawBall ( QPainter &paint - } - void Monitor::dropBall() - { -+ QPoint localCurser= ui->centralWidget->mapFromGlobal(QCursor::pos()); -+ - if ( sock.connected() ) - { -- QPointF drop_pos = invertScale(QCursor::pos()-QPointF(0,30));//-QPointF(borderSize,borderSize));// - geometry().topLeft() - center ; --// drop_pos.set; -+ QPointF drop_pos = invertScale(localCurser); - stringstream ss ; - ss << "(ball (pos " << drop_pos.x() << " " << drop_pos.y() << " 0.045)(vel 0 0 0))" ; - sock.Send(ss.str()); -@@ -347,7 +348,7 @@ void Monitor::parseThing( string msg ) - str.push_back(' '); - } - -- int pos = str.find("team_left"); -+ unsigned int pos = str.find("team_left"); - string temp; - string he ; - stringstream ss ; -@@ -515,9 +516,11 @@ void Monitor::drawObjects ( QPainter &pa - - void Monitor::dropPlayer( int player ) - { -+ - if ( sock.connected() ) - { -- QPointF drop_pos = invertScale(QCursor::pos()-QPointF(0,30)); -+ QPoint localCurser= ui->centralWidget->mapFromGlobal(QCursor::pos()); -+ QPointF drop_pos = invertScale(localCurser); - stringstream ss; - if ( toggle == TEAM_Left ) - ss << "(agent (team Left)(unum " << player << ")(pos " << drop_pos.x() << " " << drop_pos.y() << " 0.45))" ; diff -Nru rcsnao2d-0.0.2/debian/patches/debian-changes-0.0.2-5maverick3 rcsnao2d-0.0.3/debian/patches/debian-changes-0.0.2-5maverick3 --- rcsnao2d-0.0.2/debian/patches/debian-changes-0.0.2-5maverick3 2011-04-19 07:03:58.000000000 +0000 +++ rcsnao2d-0.0.3/debian/patches/debian-changes-0.0.2-5maverick3 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -Description: Upstream changes introduced in version 0.0.2-5maverick3 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - rcsnao2d (0.0.2-5maverick3) maverick; urgency=low - . - * x64 problem2 - . - The person named in the Author field signed this changelog entry. -Author: Hossein Ansari - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- rcsnao2d-0.0.2.orig/monitor.cpp -+++ rcsnao2d-0.0.2/monitor.cpp -@@ -65,7 +65,6 @@ Monitor::Monitor(QWidget *parent) : - - QPointF Monitor::scale(QPointF realPos){ - QPointF ret(center.x()+realPos.x()*scaleX,center.y()+realPos.y()*scaleY); -- - return ret; - } - -@@ -161,7 +160,6 @@ void Monitor::paintEvent(QPaintEvent */* - } - drawField(paint); - drawGoal(paint); --// drawField(paint); - drawOtherLines(paint); - drawObjects ( paint , temp ) ; - paint.end(); -@@ -348,7 +346,7 @@ void Monitor::parseThing( string msg ) - str.push_back(' '); - } - -- unsigned int pos = str.find("team_left"); -+ size_t pos = str.find("team_left"); - string temp; - string he ; - stringstream ss ; -@@ -471,10 +469,8 @@ void Monitor::drawOtherLines(QPainter &p - paint.drawEllipse(scale(QPointF(0,0)) , scaleX*(centerRadius+0.01) ,scaleX*(centerRadius+0.01) ); - - paint.setBrush(Qt::white); -- paint.drawEllipse(scale(QPointF(0,0)) , 1 , 1 ); -+ paint.drawEllipse(scale(QPointF(0,0)) , 1 , 1 ); - --// paint.drawEllipse(center , 0.05*z1 , 0.05*z1 ); --// paint.drawLine( center + QPointF ( 0 , 6*z2 ) , center + QPointF ( 0 , -6*z2 ) ); - paint.drawLine(centerUp,centerDown); - - } diff -Nru rcsnao2d-0.0.2/debian/patches/series rcsnao2d-0.0.3/debian/patches/series --- rcsnao2d-0.0.2/debian/patches/series 2011-12-07 19:52:27.000000000 +0000 +++ rcsnao2d-0.0.3/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -debian-changes-0.0.2-1 -debian-changes-0.0.2-4maverick -debian-changes-0.0.2-5maverick3 -debian-changes-0.0.2-0oneiric2 diff -Nru rcsnao2d-0.0.2/debian/README.Debian rcsnao2d-0.0.3/debian/README.Debian --- rcsnao2d-0.0.2/debian/README.Debian 2011-04-07 11:58:36.000000000 +0000 +++ rcsnao2d-0.0.3/debian/README.Debian 1970-01-01 00:00:00.000000000 +0000 @@ -1,6 +0,0 @@ -rcsnao2d for Debian -------------------- - - - - -- Hossein Ansari Thu, 07 Apr 2011 16:28:33 +0430 diff -Nru rcsnao2d-0.0.2/debian/README.source rcsnao2d-0.0.3/debian/README.source --- rcsnao2d-0.0.2/debian/README.source 2011-04-07 11:58:36.000000000 +0000 +++ rcsnao2d-0.0.3/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -rcsnao2d for Debian -------------------- - - - - - - diff -Nru rcsnao2d-0.0.2/debian/rules rcsnao2d-0.0.3/debian/rules --- rcsnao2d-0.0.2/debian/rules 2011-04-19 05:23:39.000000000 +0000 +++ rcsnao2d-0.0.3/debian/rules 2012-06-12 21:52:05.000000000 +0000 @@ -8,19 +8,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -LBITS := $(shell getconf LONG_BIT) -ifeq ($(LBITS),64) - CXXFLAGS = -O2 -m64 - CFLAGS = -O2 -m64 - export CXXFLAGS CFLAGS - -else - CXXFLAGS = -O2 -m32 - CFLAGS = -O2 -m32 - export CXXFLAGS CFLAGS - -endif - %: dh $@ diff -Nru rcsnao2d-0.0.2/monitor.cpp rcsnao2d-0.0.3/monitor.cpp --- rcsnao2d-0.0.2/monitor.cpp 2011-04-07 11:29:09.000000000 +0000 +++ rcsnao2d-0.0.3/monitor.cpp 2012-06-12 21:50:59.000000000 +0000 @@ -64,8 +64,7 @@ } QPointF Monitor::scale(QPointF realPos){ - QPointF ret(center.x()+realPos.x()*scaleX,center.y()+realPos.y()*scaleY); - + QPointF ret(center.x()+realPos.x()*scaleX,center.y( )+realPos.y()*scaleY); return ret; } @@ -161,7 +160,6 @@ } drawField(paint); drawGoal(paint); -// drawField(paint); drawOtherLines(paint); drawObjects ( paint , temp ) ; paint.end(); @@ -260,10 +258,11 @@ } void Monitor::dropBall() { + QPoint localCurser= ui->centralWidget->mapFromGlobal(QCursor::pos()); + if ( sock.connected() ) { - QPointF drop_pos = invertScale(QCursor::pos()-QPointF(0,30));//-QPointF(borderSize,borderSize));// - geometry().topLeft() - center ; -// drop_pos.set; + QPointF drop_pos = invertScale(localCurser); stringstream ss ; ss << "(ball (pos " << drop_pos.x() << " " << drop_pos.y() << " 0.045)(vel 0 0 0))" ; sock.Send(ss.str()); @@ -347,7 +346,7 @@ str.push_back(' '); } - int pos = str.find("team_left"); + size_t pos = str.find("team_left"); string temp; string he ; stringstream ss ; @@ -430,16 +429,39 @@ QPointF sideDownLeft = scale(QPointF(-fieldLength/2.0,fieldWidth/2.0)); QPointF sideDownRight = scale(QPointF(fieldLength/2.0,fieldWidth/2.0)); + QPointF penaltyDownLeft = scale(QPointF(-fieldLength/2.0,penaltyWidth/2.0)); + QPointF penaltyDownRight = scale(QPointF(-fieldLength/2.0+penaltyLength,penaltyWidth/2.0)); + + QPointF penaltyUpLeft = scale(QPointF(-fieldLength/2.0,-penaltyWidth/2.0)); + QPointF penaltyUpRight = scale(QPointF(-fieldLength/2.0+penaltyLength,-penaltyWidth/2.0)); + + QPointF rPenaltyDownLeft = scale(-QPointF(-fieldLength/2.0,penaltyWidth/2.0)); + QPointF rPenaltyDownRight = scale(-QPointF(-fieldLength/2.0+penaltyLength,penaltyWidth/2.0)); + + QPointF rPenaltyUpLeft = scale(-QPointF(-fieldLength/2.0,-penaltyWidth/2.0)); + QPointF rPenaltyUpRight = scale(-QPointF(-fieldLength/2.0+penaltyLength,-penaltyWidth/2.0)); + + + paint.setPen(Qt::white); /// Left Side Of Fielde Drawing paint.drawLine(centerUp,centerDown); + paint.drawLine( sideUpLeft ,sideUpRight ); paint.drawLine( sideDownLeft , sideDownRight); paint.drawLine( sideUpLeft ,sideDownLeft ); paint.drawLine( sideUpRight , sideDownRight); + paint.drawLine(penaltyDownLeft,penaltyDownRight); + paint.drawLine(penaltyUpLeft,penaltyUpRight); + paint.drawLine(penaltyUpRight,penaltyDownRight); + + paint.drawLine(rPenaltyDownLeft,rPenaltyDownRight); + paint.drawLine(rPenaltyUpLeft,rPenaltyUpRight); + paint.drawLine(rPenaltyUpRight,rPenaltyDownRight); + /// paint.drawEllipse(scale(QPointF(0,0)) , scaleX*centerRadius , scaleX*centerRadius ); @@ -447,10 +469,8 @@ paint.drawEllipse(scale(QPointF(0,0)) , scaleX*(centerRadius+0.01) ,scaleX*(centerRadius+0.01) ); paint.setBrush(Qt::white); - paint.drawEllipse(scale(QPointF(0,0)) , 1 , 1 ); + paint.drawEllipse(scale(QPointF(0,0)) , 1 , 1 ); -// paint.drawEllipse(center , 0.05*z1 , 0.05*z1 ); -// paint.drawLine( center + QPointF ( 0 , 6*z2 ) , center + QPointF ( 0 , -6*z2 ) ); paint.drawLine(centerUp,centerDown); } @@ -492,9 +512,11 @@ void Monitor::dropPlayer( int player ) { + if ( sock.connected() ) { - QPointF drop_pos = invertScale(QCursor::pos()-QPointF(0,30)); + QPoint localCurser= ui->centralWidget->mapFromGlobal(QCursor::pos()); + QPointF drop_pos = invertScale(localCurser); stringstream ss; if ( toggle == TEAM_Left ) ss << "(agent (team Left)(unum " << player << ")(pos " << drop_pos.x() << " " << drop_pos.y() << " 0.45))" ; diff -Nru rcsnao2d-0.0.2/monitor.ui rcsnao2d-0.0.3/monitor.ui --- rcsnao2d-0.0.2/monitor.ui 2011-04-07 10:01:41.000000000 +0000 +++ rcsnao2d-0.0.3/monitor.ui 2012-06-12 21:50:59.000000000 +0000 @@ -14,7 +14,7 @@ rcsNao2D - + :/pics/icons/icon.png:/pics/icons/icon.png @@ -77,7 +77,7 @@ 20 10 371 - 34 + 36 @@ -124,7 +124,7 @@ Connect - + :/pics/icons/connect.png:/pics/icons/connect.png @@ -137,7 +137,7 @@ 580 10 87 - 34 + 36 @@ -147,7 +147,7 @@ Help - + :/pics/icons/help.png:/pics/icons/help.png @@ -162,9 +162,7 @@ Port help - - - + clicked() diff -Nru rcsnao2d-0.0.2/rcsNao2D.pro.user rcsnao2d-0.0.3/rcsNao2D.pro.user --- rcsnao2d-0.0.2/rcsNao2D.pro.user 2011-04-07 11:43:14.000000000 +0000 +++ rcsnao2d-0.0.3/rcsNao2D.pro.user 1970-01-01 00:00:00.000000000 +0000 @@ -1,113 +0,0 @@ - - - - ProjectExplorer.Project.ActiveTarget - 0 - - - ProjectExplorer.Project.EditorSettings - - System - - - - ProjectExplorer.Project.Target.0 - - Desktop - Qt4ProjectManager.Target.DesktopTarget - 0 - 0 - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - /home/hp/robocup/server/rcsnao2d/rcsnao2d/temp/rcsNao2D-build-desktop - 6 - 0 - true - - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - /home/hp/robocup/server/rcsnao2d/rcsnao2d/temp/rcsNao2D-build-desktop - 6 - 0 - true - - 2 - - rcsNao2D - Qt4ProjectManager.Qt4RunConfiguration - 2 - - rcsNao2D.pro - false - false - - false - false - - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 4 - -