Test of signals

homann · homann · commit 1b09393bd72b · 2012-09-21T19:14:51.000+02:00
diff --git a/src/gui/qgsscalecombobox.cpp b/src/gui/qgsscalecombobox.cpp
@@ -32,6 +32,7 @@ QgsScaleComboBox::QgsScaleComboBox( QWidget* parent ) : QComboBox( parent )
   setCompleter( 0 );
   connect( this, SIGNAL( currentIndexChanged( const QString & ) ), this, SLOT( fixupScale() ) );
   connect( lineEdit(), SIGNAL( editingFinished() ), this, SLOT( fixupScale() ) );
+  fixupScale();
 }
 
 QgsScaleComboBox::~QgsScaleComboBox()
@@ -124,8 +125,14 @@ void QgsScaleComboBox::fixupScale()
   {
     mScale = newScale;
   }
-  // We set to the new string representation.
+  // We set to the new string representation
+  // or reset to the old
   setEditText( toString( mScale ) );
+
+  if ( ok )
+  {
+    emit scaleChanged();
+  }
 }
 
 QString QgsScaleComboBox::toString( double scale )
diff --git a/tests/src/gui/testqgsscalecombobox.cpp b/tests/src/gui/testqgsscalecombobox.cpp
@@ -16,10 +16,12 @@
  ***************************************************************************/
 
 #include "qgsapplication.h"
+#include "qgslogger.h"
 #include "qgsscalecombobox.h"
 #include <QObject>
 #include <QLineEdit>
 #include <QComboBox>
+#include <QSignalSpy>
 #include <QtTest>
 
 class TestQgsScaleComboBox: public QObject
@@ -43,6 +45,7 @@ void TestQgsScaleComboBox::initTestCase()
 
   // Create a combobox, and init with predefined scales.
   s = new QgsScaleComboBox();
+  QgsDebugMsg( QString( "Initial scale is %1" ).arg( s->scaleString() ) );
 };
 
 void TestQgsScaleComboBox::cleanupTestCase()
@@ -90,7 +93,18 @@ void TestQgsScaleComboBox::basic()
 
 void TestQgsScaleComboBox::slot_test()
 {
+  QLineEdit *l = s->lineEdit();
+  l->setText( "" );
+
+  QSignalSpy spyScaleChanged( s, SIGNAL( scaleChanged() ) );
+  QSignalSpy spyFixup( l, SIGNAL( editingFinished() ) );
+
+  QTest::keyClicks( l, QLocale::system().toString( 0.02 ) );
+  QTest::keyClick( l, Qt::Key_Return );
+  QCOMPARE( spyFixup.count(), 2 ); // Qt emits twice!?
+  QCOMPARE( spyScaleChanged.count(), 2 );  // Qt emits twice!?
 }
+
 void TestQgsScaleComboBox::cleanup()
 {
 };

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ QgsScaleComboBox::QgsScaleComboBox( QWidget* parent ) : QComboBox( parent )`
`32`	`32`	`setCompleter( 0 );`
`33`	`33`	`connect( this, SIGNAL( currentIndexChanged( const QString & ) ), this, SLOT( fixupScale() ) );`
`34`	`34`	`connect( lineEdit(), SIGNAL( editingFinished() ), this, SLOT( fixupScale() ) );`
	`35`	`+ fixupScale();`
`35`	`36`	`}`
`36`	`37`
`37`	`38`	`QgsScaleComboBox::~QgsScaleComboBox()`
`@@ -124,8 +125,14 @@ void QgsScaleComboBox::fixupScale()`
`124`	`125`	`{`
`125`	`126`	`mScale = newScale;`
`126`	`127`	`}`
`127`		`- // We set to the new string representation.`
	`128`	`+ // We set to the new string representation`
	`129`	`+ // or reset to the old`
`128`	`130`	`setEditText( toString( mScale ) );`
	`131`	`+`
	`132`	`+ if ( ok )`
	`133`	`+ {`
	`134`	`+ emit scaleChanged();`
	`135`	`+ }`
`129`	`136`	`}`
`130`	`137`
`131`	`138`	`QString QgsScaleComboBox::toString( double scale )`