Skip to content

Commit d83f3ec

Browse files
3nids3nids
committedMay 12, 2014
QgsScaleRangeWidget: renamed from QgsScaleVisibilityWidget, do not use ui file
·
ltr-3_40archive/master_2
1 parent f757bfd commit d83f3ec

11 files changed

+110
-249
lines changed
 

‎src/app/qgsvectorlayerproperties.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -385,9 +385,9 @@ void QgsVectorLayerProperties::syncToLayer( void )
385385
setDisplayField( layer-> displayField() );
386386

387387
// set up the scale based layer visibility stuff....
388-
mScaleVisibilityWidget->setFromLayer( layer );
388+
mScaleRangeWidget->setFromLayer( layer );
389389
mScaleVisibilityGroupBox->setChecked( layer->hasScaleBasedVisibility() );
390-
mScaleVisibilityWidget->setMapCanvas( QgisApp::instance()->mapCanvas() );
390+
mScaleRangeWidget->setMapCanvas( QgisApp::instance()->mapCanvas() );
391391

392392
// get simplify drawing configuration
393393
const QgsVectorSimplifyMethod& simplifyMethod = layer->simplifyMethod();
@@ -494,8 +494,8 @@ void QgsVectorLayerProperties::apply()
494494

495495
// set up the scale based layer visibility stuff....
496496
layer->toggleScaleBasedVisibility( mScaleVisibilityGroupBox->isChecked() );
497-
layer->setMinimumScale( 1.0 / mScaleVisibilityWidget->minimumScale() );
498-
layer->setMaximumScale( 1.0 / mScaleVisibilityWidget->maximumScale() );
497+
layer->setMinimumScale( 1.0 / mScaleRangeWidget->minimumScale() );
498+
layer->setMaximumScale( 1.0 / mScaleRangeWidget->maximumScale() );
499499

500500
// provider-specific options
501501
if ( layer->dataProvider() )

‎src/app/qgsvectorlayerproperties.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define QGSVECTORLAYERPROPERTIES
2121

2222
#include "qgsoptionsdialogbase.h"
23-
#include "qgsscalevisibilitywidget.h"
23+
#include "qgsscalerangewidget.h"
2424
#include "ui_qgsvectorlayerpropertiesbase.h"
2525
#include "qgisgui.h"
2626
#include "qgsaddattrdialog.h"

‎src/customwidgets/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SET (QGIS_CUSTOMWIDGETS_SRCS
1212
qgsfieldcomboboxplugin.cpp
1313
qgsfieldexpressionwidgetplugin.cpp
1414
qgsmaplayercomboboxplugin.cpp
15-
qgsscalevisibilitywidgetplugin.cpp
15+
qgsscalerangewidgetplugin.cpp
1616
)
1717

1818
SET (QGIS_CUSTOMWIDGETS_MOC_HDRS
@@ -21,7 +21,7 @@ SET (QGIS_CUSTOMWIDGETS_MOC_HDRS
2121
qgsfieldcomboboxplugin.h
2222
qgsfieldexpressionwidgetplugin.h
2323
qgsmaplayercomboboxplugin.h
24-
qgsscalevisibilitywidgetplugin.h
24+
qgsscalerangewidgetplugin.h
2525
)
2626

2727
QT4_WRAP_CPP(QGIS_CUSTOMWIDGETS_MOC_SRCS ${QGIS_CUSTOMWIDGETS_MOC_HDRS})
@@ -36,11 +36,11 @@ SET(QGIS_CUSTOMWIDGETS_HDRS
3636
qgsfieldcomboboxplugin.h
3737
qgsfieldexpressionwidgetplugin.h
3838
qgsmaplayercomboboxplugin.h
39-
qgsscalevisibilitywidgetplugin.h
39+
qgsscalerangewidgetplugin.h
4040
)
4141

4242
SET(QGIS_CUSTOMWIDGETS_UI_HDRS
43-
${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsscalevisibilitywidget.h
43+
# ${CMAKE_CURRENT_BINARY_DIR}/../ui/ui_qgsXXXwidget.h
4444
)
4545

4646
INCLUDE_DIRECTORIES(

‎src/customwidgets/qgiscustomwidgets.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "qgsfieldcomboboxplugin.h"
2222
#include "qgsfieldexpressionwidgetplugin.h"
2323
#include "qgsmaplayercomboboxplugin.h"
24-
#include "qgsscalevisibilitywidgetplugin.h"
24+
#include "qgsscalerangewidgetplugin.h"
2525

2626

2727
QgisCustomWidgets::QgisCustomWidgets( QObject *parent )
@@ -37,7 +37,7 @@ QgisCustomWidgets::QgisCustomWidgets( QObject *parent )
3737
mWidgets.append( new QgsFieldComboBoxPlugin );
3838
mWidgets.append( new QgsFieldExpressionWidgetPlugin );
3939
mWidgets.append( new QgsMapLayerComboBoxPlugin );
40-
mWidgets.append( new QgsScaleVisibilityWidgetPlugin );
40+
mWidgets.append( new QgsScaleRangeWidgetPlugin );
4141
}
4242

4343
QList<QDesignerCustomWidgetInterface*> QgisCustomWidgets::customWidgets() const

‎src/customwidgets/qgsscalevisibilitywidgetplugin.cpp renamed to ‎src/customwidgets/qgsscalerangewidgetplugin.cpp

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsscalevisibilitywidgetplugin.cpp
2+
qgsscalerangewidgetplugin.cpp
33
--------------------------------------
44
Date : 25.04.2014
55
Copyright : (C) 2014 Denis Rouzaud
@@ -14,53 +14,53 @@
1414
***************************************************************************/
1515

1616
#include "qgiscustomwidgets.h"
17-
#include "qgsscalevisibilitywidgetplugin.h"
18-
#include "qgsscalevisibilitywidget.h"
17+
#include "qgsscalerangewidgetplugin.h"
18+
#include "qgsscalerangewidget.h"
1919

2020

21-
QgsScaleVisibilityWidgetPlugin::QgsScaleVisibilityWidgetPlugin( QObject *parent )
21+
QgsScaleRangeWidgetPlugin::QgsScaleRangeWidgetPlugin( QObject *parent )
2222
: QObject( parent )
2323
, mInitialized( false )
2424
{
2525
}
2626

2727

28-
QString QgsScaleVisibilityWidgetPlugin::name() const
28+
QString QgsScaleRangeWidgetPlugin::name() const
2929
{
30-
return "QgsScaleVisibilityWidget";
30+
return "QgsScaleRangeWidget";
3131
}
3232

33-
QString QgsScaleVisibilityWidgetPlugin::group() const
33+
QString QgsScaleRangeWidgetPlugin::group() const
3434
{
3535
return QgisCustomWidgets::groupName();
3636
}
3737

38-
QString QgsScaleVisibilityWidgetPlugin::includeFile() const
38+
QString QgsScaleRangeWidgetPlugin::includeFile() const
3939
{
40-
return "qgsscalevisibilitywidget.h";
40+
return "qgsscalerangewidget.h";
4141
}
4242

43-
QIcon QgsScaleVisibilityWidgetPlugin::icon() const
43+
QIcon QgsScaleRangeWidgetPlugin::icon() const
4444
{
4545
return QIcon();
4646
}
4747

48-
bool QgsScaleVisibilityWidgetPlugin::isContainer() const
48+
bool QgsScaleRangeWidgetPlugin::isContainer() const
4949
{
5050
return false;
5151
}
5252

53-
QWidget *QgsScaleVisibilityWidgetPlugin::createWidget( QWidget *parent )
53+
QWidget *QgsScaleRangeWidgetPlugin::createWidget( QWidget *parent )
5454
{
55-
return new QgsScaleVisibilityWidget( parent );
55+
return new QgsScaleRangeWidget( parent );
5656
}
5757

58-
bool QgsScaleVisibilityWidgetPlugin::isInitialized() const
58+
bool QgsScaleRangeWidgetPlugin::isInitialized() const
5959
{
6060
return mInitialized;
6161
}
6262

63-
void QgsScaleVisibilityWidgetPlugin::initialize( QDesignerFormEditorInterface *core )
63+
void QgsScaleRangeWidgetPlugin::initialize( QDesignerFormEditorInterface *core )
6464
{
6565
Q_UNUSED( core );
6666
if ( mInitialized )
@@ -69,20 +69,20 @@ void QgsScaleVisibilityWidgetPlugin::initialize( QDesignerFormEditorInterface *c
6969
}
7070

7171

72-
QString QgsScaleVisibilityWidgetPlugin::toolTip() const
72+
QString QgsScaleRangeWidgetPlugin::toolTip() const
7373
{
74-
return "A widget to define the scale visibility";
74+
return "A widget to define the scale range";
7575
}
7676

77-
QString QgsScaleVisibilityWidgetPlugin::whatsThis() const
77+
QString QgsScaleRangeWidgetPlugin::whatsThis() const
7878
{
79-
return "A widget to define the scale visibility";
79+
return "A widget to define the scale range.";
8080
}
8181

82-
QString QgsScaleVisibilityWidgetPlugin::domXml() const
82+
QString QgsScaleRangeWidgetPlugin::domXml() const
8383
{
8484
return QString( "<ui language=\"c++\">\n"
85-
" <widget class=\"%1\" name=\"mScaleVisibilityWidget\">\n"
85+
" <widget class=\"%1\" name=\"mScaleRangeWidget\">\n"
8686
" <property name=\"geometry\">\n"
8787
" <rect>\n"
8888
" <x>0</x>\n"

‎src/customwidgets/qgsscalevisibilitywidgetplugin.h renamed to ‎src/customwidgets/qgsscalerangewidgetplugin.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsscalevisibilitywidgetplugin.h
2+
qgsscalerangewidgetplugin.h
33
--------------------------------------
44
Date : 25.04.2014
55
Copyright : (C) 2014 Denis Rouzaud
@@ -13,20 +13,20 @@
1313
* *
1414
***************************************************************************/
1515

16-
#ifndef QGSSCALEVISIBILITYWIDGETPLUGIN_H
17-
#define QGSSCALEVISIBILITYWIDGETPLUGIN_H
16+
#ifndef QGSSCALERANGEWIDGETPLUGIN_H
17+
#define QGSSCALERANGEWIDGETPLUGIN_H
1818

1919
#include <QDesignerExportWidget>
2020
#include <QDesignerCustomWidgetInterface>
2121

2222

23-
class QDESIGNER_WIDGET_EXPORT QgsScaleVisibilityWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
23+
class QDESIGNER_WIDGET_EXPORT QgsScaleRangeWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
2424
{
2525
Q_OBJECT
2626
Q_INTERFACES( QDesignerCustomWidgetInterface )
2727

2828
public:
29-
explicit QgsScaleVisibilityWidgetPlugin( QObject *parent = 0 );
29+
explicit QgsScaleRangeWidgetPlugin( QObject *parent = 0 );
3030

3131
private:
3232
bool mInitialized;
@@ -45,4 +45,4 @@ class QDESIGNER_WIDGET_EXPORT QgsScaleVisibilityWidgetPlugin : public QObject, p
4545
QString whatsThis() const;
4646
QString domXml() const;
4747
};
48-
#endif // QGSSCALEVISIBILITYWIDGETPLUGIN_H
48+
#endif // QGSSCALERANGEWIDGETPLUGIN_H

‎src/gui/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ qgsrelationeditor.cpp
138138
qgsrelationmanagerdialog.cpp
139139
qgsrubberband.cpp
140140
qgsscalecombobox.cpp
141-
qgsscalevisibilitywidget.cpp
141+
qgsscalerangewidget.cpp
142142
qgssearchquerybuilder.cpp
143143
qgssublayersdialog.cpp
144144
qgssvgannotationitem.cpp
@@ -277,7 +277,7 @@ qgsrelationadddlg.h
277277
qgsrelationeditor.h
278278
qgsrelationmanagerdialog.h
279279
qgsscalecombobox.h
280-
qgsscalevisibilitywidget.h
280+
qgsscalerangewidget.h
281281
qgssearchquerybuilder.h
282282
qgssublayersdialog.h
283283
qgsunitselectionwidget.h
@@ -342,7 +342,7 @@ qgsprojectionselector.h
342342
qgsrelationeditor.h
343343
qgsrubberband.h
344344
qgsscalecombobox.h
345-
qgsscalevisibilitywidget.h
345+
qgsscalerangewidget.h
346346
qgssearchquerybuilder.h
347347
qgssublayersdialog.h
348348
qgsvectorlayertools.h

‎src/gui/qgsscalevisibilitywidget.cpp renamed to ‎src/gui/qgsscalerangewidget.cpp

Lines changed: 42 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsscalevisibilitywidget.cpp
2+
qgsscalerangewidget.cpp
33
--------------------------------------
44
Date : 25.04.2014
55
Copyright : (C) 2014 Denis Rouzaud
@@ -13,28 +13,42 @@
1313
* *
1414
***************************************************************************/
1515

16-
#include "qgsscalevisibilitywidget.h"
16+
#include "qgsscalerangewidget.h"
1717
#include "qgsapplication.h"
1818
#include "qgsproject.h"
1919

20-
QgsScaleVisibilityWidget::QgsScaleVisibilityWidget( QWidget *parent )
20+
21+
QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent )
2122
: QWidget( parent )
2223
, mCanvas( 0 )
2324
{
24-
setupUi( this );
25+
mLayout = new QGridLayout( this );
26+
mLayout->setContentsMargins( 0, 0, 0, 0 );
27+
28+
QLabel* maxLbl = new QLabel( tr("Maximimum (inclusive)"), this);
29+
QLabel* minLbl = new QLabel( tr("Minimimum (exclusive)"), this);
2530

31+
mMaximumScaleIconLabel = new QLabel(this);
2632
mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.svg" ) );
33+
mMinimumScaleIconLabel = new QLabel(this);
2734
mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.svg" ) );
2835

29-
mMinimumScaleSetCurrentPushButton->hide();
30-
mMaximumScaleSetCurrentPushButton->hide();
36+
mMaximumScaleComboBox = new QgsScaleComboBox(this);
37+
mMinimumScaleComboBox = new QgsScaleComboBox(this);
38+
39+
mLayout->addWidget(maxLbl, 0, 0);
40+
mLayout->addWidget(mMaximumScaleIconLabel, 0, 1);
41+
mLayout->addWidget(mMaximumScaleComboBox, 0, 2);
42+
mLayout->addWidget(minLbl, 0, 3);
43+
mLayout->addWidget(mMinimumScaleIconLabel, 0, 4);
44+
mLayout->addWidget(mMinimumScaleComboBox, 0, 5);
3145
}
3246

33-
QgsScaleVisibilityWidget::~QgsScaleVisibilityWidget()
47+
QgsScaleRangeWidget::~QgsScaleRangeWidget()
3448
{
3549
}
3650

37-
void QgsScaleVisibilityWidget::showEvent( QShowEvent * )
51+
void QgsScaleRangeWidget::showEvent( QShowEvent * )
3852
{
3953
bool projectScales = QgsProject::instance()->readBoolEntry( "Scales", "/useProjectScales" );
4054
if ( projectScales )
@@ -45,47 +59,57 @@ void QgsScaleVisibilityWidget::showEvent( QShowEvent * )
4559
}
4660
}
4761

48-
void QgsScaleVisibilityWidget::setMapCanvas( QgsMapCanvas *mapCanvas )
62+
void QgsScaleRangeWidget::setMapCanvas( QgsMapCanvas *mapCanvas )
4963
{
64+
if (mMinimumScaleSetCurrentPushButton)
65+
delete mMinimumScaleSetCurrentPushButton;
66+
if (mMaximumScaleSetCurrentPushButton)
67+
delete mMaximumScaleSetCurrentPushButton;
5068
if ( !mapCanvas )
5169
return;
5270

5371
mCanvas = mapCanvas;
54-
mMinimumScaleSetCurrentPushButton->show();
55-
mMaximumScaleSetCurrentPushButton->show();
72+
73+
mMaximumScaleSetCurrentPushButton = new QToolButton();
74+
connect( mMaximumScaleSetCurrentPushButton, SIGNAL(clicked()), this, SLOT(setMaxScaleFromCanvas()));
75+
mMinimumScaleSetCurrentPushButton = new QToolButton();
76+
connect( mMinimumScaleSetCurrentPushButton, SIGNAL(clicked()), this, SLOT(setMinScaleFromCanvas()));
77+
78+
mLayout->addWidget(mMaximumScaleSetCurrentPushButton, 1,2);
79+
mLayout->addWidget(mMinimumScaleSetCurrentPushButton, 1,5);
5680
}
5781

58-
void QgsScaleVisibilityWidget::setMinimumScale( double scale )
82+
void QgsScaleRangeWidget::setMinimumScale( double scale )
5983
{
6084
mMinimumScaleComboBox->setScale( scale );
6185
}
6286

63-
double QgsScaleVisibilityWidget::minimumScale()
87+
double QgsScaleRangeWidget::minimumScale()
6488
{
6589
return mMinimumScaleComboBox->scale();
6690
}
6791

68-
void QgsScaleVisibilityWidget::setMaximumScale( double scale )
92+
void QgsScaleRangeWidget::setMaximumScale( double scale )
6993
{
7094
mMaximumScaleComboBox->setScale( scale );
7195
}
7296

73-
double QgsScaleVisibilityWidget::maximumScale()
97+
double QgsScaleRangeWidget::maximumScale()
7498
{
7599
return mMaximumScaleComboBox->scale();
76100
}
77101

78-
void QgsScaleVisibilityWidget::on_mMinimumScaleSetCurrentPushButton_clicked()
102+
void QgsScaleRangeWidget::setMinScaleFromCanvas()
79103
{
80104
mMinimumScaleComboBox->setScale( 1.0 / mCanvas->mapSettings().scale() );
81105
}
82106

83-
void QgsScaleVisibilityWidget::on_mMaximumScaleSetCurrentPushButton_clicked()
107+
void QgsScaleRangeWidget::setMaxScaleFromCanvas()
84108
{
85109
mMaximumScaleComboBox->setScale( 1.0 / mCanvas->mapSettings().scale() );
86110
}
87111

88-
void QgsScaleVisibilityWidget::setFromLayer( QgsMapLayer *layer )
112+
void QgsScaleRangeWidget::setFromLayer( QgsMapLayer *layer )
89113
{
90114
mMinimumScaleComboBox->setScale( 1.0 / layer->minimumScale() );
91115
mMaximumScaleComboBox->setScale( 1.0 / layer->maximumScale() );

‎src/gui/qgsscalevisibilitywidget.h renamed to ‎src/gui/qgsscalerangewidget.h

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsscalevisibilitywidget.h
2+
qgsscalerangewidget.h
33
--------------------------------------
44
Date : 25.04.2014
55
Copyright : (C) 2014 Denis Rouzaud
@@ -13,22 +13,27 @@
1313
* *
1414
***************************************************************************/
1515

16-
#ifndef QGSSCALEVISIBILITYWIDGET_H
17-
#define QGSSCALEVISIBILITYWIDGET_H
16+
#ifndef QGSSCALERANGEWIDGET_H
17+
#define QGSSCALERANGEWIDGET_H
18+
19+
#include <QGridLayout>
20+
#include <QLabel>
21+
#include <QToolButton>
22+
1823

19-
#include "ui_qgsscalevisibilitywidget.h"
2024
#include "qgscollapsiblegroupbox.h"
2125
#include "qgsmaplayer.h"
2226
#include "qgsmapcanvas.h"
27+
#include "qgsscalecombobox.h"
2328

2429

25-
class GUI_EXPORT QgsScaleVisibilityWidget : public QWidget, private Ui::QgsScaleVisibilityWidget
30+
class GUI_EXPORT QgsScaleRangeWidget : public QWidget
2631
{
2732
Q_OBJECT
2833

2934
public:
30-
explicit QgsScaleVisibilityWidget( QWidget *parent = 0 );
31-
~QgsScaleVisibilityWidget();
35+
explicit QgsScaleRangeWidget( QWidget *parent = 0 );
36+
~QgsScaleRangeWidget();
3237

3338
void showEvent( QShowEvent * );
3439

@@ -49,12 +54,21 @@ class GUI_EXPORT QgsScaleVisibilityWidget : public QWidget, private Ui::QgsScale
4954
void setFromLayer( QgsMapLayer* layer );
5055

5156
private slots:
52-
void on_mMinimumScaleSetCurrentPushButton_clicked();
53-
void on_mMaximumScaleSetCurrentPushButton_clicked();
57+
void setMaxScaleFromCanvas();
58+
void setMinScaleFromCanvas();
5459

5560
private:
5661
//! pointer to the map canvas used for current buttons.
5762
QgsMapCanvas* mCanvas;
63+
64+
// ui
65+
QGridLayout* mLayout;
66+
QLabel* mMaximumScaleIconLabel;
67+
QLabel* mMinimumScaleIconLabel;
68+
QToolButton* mMaximumScaleSetCurrentPushButton;
69+
QToolButton* mMinimumScaleSetCurrentPushButton;
70+
QgsScaleComboBox* mMaximumScaleComboBox;
71+
QgsScaleComboBox* mMinimumScaleComboBox;
5872
};
5973

60-
#endif // QGSSCALEVISIBILITYWIDGET_H
74+
#endif // QGSSCALERANGEWIDGET_H

‎src/ui/qgsscalevisibilitywidget.ui

Lines changed: 0 additions & 177 deletions
This file was deleted.

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@
465465
</property>
466466
<layout class="QGridLayout" name="gridLayout_6">
467467
<item row="0" column="0">
468-
<widget class="QgsScaleVisibilityWidget" name="mScaleVisibilityWidget">
468+
<widget class="QgsScaleRangeWidget" name="mScaleRangeWidget">
469469
<property name="toolTip">
470470
<string>A widget to define the scale visibility</string>
471471
</property>
@@ -1647,9 +1647,9 @@
16471647
<container>1</container>
16481648
</customwidget>
16491649
<customwidget>
1650-
<class>QgsScaleVisibilityWidget</class>
1650+
<class>QgsScaleRangeWidget</class>
16511651
<extends>QWidget</extends>
1652-
<header>qgsscalevisibilitywidget.h</header>
1652+
<header>qgsscalerangewidget.h</header>
16531653
</customwidget>
16541654
<customwidget>
16551655
<class>QgsScaleComboBox</class>

0 commit comments

Comments
 (0)
Please sign in to comment.