@@ -70,12 +70,13 @@ QgsMapLayer::QgsMapLayer( QgsMapLayer::LayerType type,
70
70
const QString &lyrname,
71
71
const QString &source )
72
72
: mDataSource( source )
73
+ , mLayerName( lyrname )
73
74
, mLayerType( type )
75
+ , mUndoStack( new QUndoStack( this ) )
76
+ , mUndoStackStyles( new QUndoStack( this ) )
74
77
, mStyleManager( new QgsMapLayerStyleManager( this ) )
78
+ , mRefreshTimer( new QTimer( this ) )
75
79
{
76
- // Set the display name = internal name
77
- mLayerName = lyrname;
78
-
79
80
// mShortName.replace( QRegExp( "[\\W]" ), "_" );
80
81
81
82
// Generate the unique ID of this layer
@@ -91,13 +92,8 @@ QgsMapLayer::QgsMapLayer( QgsMapLayer::LayerType type,
91
92
// there for the compiler, so the pattern is actually \W
92
93
mID .replace ( QRegExp ( " [\\ W]" ), QStringLiteral ( " _" ) );
93
94
94
- // set some generous defaults for scale based visibility
95
- mMinScale = 0 ;
96
- mMaxScale = 100000000 ;
97
- mScaleBasedVisibility = false ;
98
-
99
95
connect ( mStyleManager , &QgsMapLayerStyleManager::currentStyleChanged, this , &QgsMapLayer::styleChanged );
100
- connect ( & mRefreshTimer , &QTimer::timeout, this , [ = ] { triggerRepaint ( true ); } );
96
+ connect ( mRefreshTimer , &QTimer::timeout, this , [ = ] { triggerRepaint ( true ); } );
101
97
}
102
98
103
99
QgsMapLayer::~QgsMapLayer ()
@@ -586,8 +582,8 @@ bool QgsMapLayer::writeLayerXml( QDomElement &layerElement, QDomDocument &docume
586
582
layerElement.appendChild ( QgsXmlUtils::writeRectangle ( mExtent , document ) );
587
583
}
588
584
589
- layerElement.setAttribute ( QStringLiteral ( " autoRefreshTime" ), QString::number ( mRefreshTimer . interval () ) );
590
- layerElement.setAttribute ( QStringLiteral ( " autoRefreshEnabled" ), mRefreshTimer . isActive () ? 1 : 0 );
585
+ layerElement.setAttribute ( QStringLiteral ( " autoRefreshTime" ), QString::number ( mRefreshTimer -> interval () ) );
586
+ layerElement.setAttribute ( QStringLiteral ( " autoRefreshEnabled" ), mRefreshTimer -> isActive () ? 1 : 0 );
591
587
layerElement.setAttribute ( QStringLiteral ( " refreshOnNotifyEnabled" ), mIsRefreshOnNofifyEnabled ? 1 : 0 );
592
588
layerElement.setAttribute ( QStringLiteral ( " refreshOnNotifyMessage" ), mRefreshOnNofifyMessage );
593
589
@@ -913,36 +909,36 @@ bool QgsMapLayer::hasScaleBasedVisibility() const
913
909
914
910
bool QgsMapLayer::hasAutoRefreshEnabled () const
915
911
{
916
- return mRefreshTimer . isActive ();
912
+ return mRefreshTimer -> isActive ();
917
913
}
918
914
919
915
int QgsMapLayer::autoRefreshInterval () const
920
916
{
921
- return mRefreshTimer . interval ();
917
+ return mRefreshTimer -> interval ();
922
918
}
923
919
924
920
void QgsMapLayer::setAutoRefreshInterval ( int interval )
925
921
{
926
922
if ( interval <= 0 )
927
923
{
928
- mRefreshTimer . stop ();
929
- mRefreshTimer . setInterval ( 0 );
924
+ mRefreshTimer -> stop ();
925
+ mRefreshTimer -> setInterval ( 0 );
930
926
}
931
927
else
932
928
{
933
- mRefreshTimer . setInterval ( interval );
929
+ mRefreshTimer -> setInterval ( interval );
934
930
}
935
- emit autoRefreshIntervalChanged ( mRefreshTimer . isActive () ? mRefreshTimer . interval () : 0 );
931
+ emit autoRefreshIntervalChanged ( mRefreshTimer -> isActive () ? mRefreshTimer -> interval () : 0 );
936
932
}
937
933
938
934
void QgsMapLayer::setAutoRefreshEnabled ( bool enabled )
939
935
{
940
936
if ( !enabled )
941
- mRefreshTimer . stop ();
942
- else if ( mRefreshTimer . interval () > 0 )
943
- mRefreshTimer . start ();
937
+ mRefreshTimer -> stop ();
938
+ else if ( mRefreshTimer -> interval () > 0 )
939
+ mRefreshTimer -> start ();
944
940
945
- emit autoRefreshIntervalChanged ( mRefreshTimer . isActive () ? mRefreshTimer . interval () : 0 );
941
+ emit autoRefreshIntervalChanged ( mRefreshTimer -> isActive () ? mRefreshTimer -> interval () : 0 );
946
942
}
947
943
948
944
const QgsLayerMetadata &QgsMapLayer::metadata () const
@@ -1824,7 +1820,6 @@ void QgsMapLayer::writeCommonStyle( QDomElement &layerElement, QDomDocument &doc
1824
1820
}
1825
1821
}
1826
1822
1827
-
1828
1823
void QgsMapLayer::readCommonStyle ( const QDomElement &layerElement, const QgsReadWriteContext &context )
1829
1824
{
1830
1825
QgsAbstract3DRenderer *r3D = nullptr ;
@@ -1841,18 +1836,16 @@ void QgsMapLayer::readCommonStyle( const QDomElement &layerElement, const QgsRea
1841
1836
setRenderer3D ( r3D );
1842
1837
}
1843
1838
1844
-
1845
1839
QUndoStack *QgsMapLayer::undoStack ()
1846
1840
{
1847
- return & mUndoStack ;
1841
+ return mUndoStack ;
1848
1842
}
1849
1843
1850
1844
QUndoStack *QgsMapLayer::undoStackStyles ()
1851
1845
{
1852
- return & mUndoStackStyles ;
1846
+ return mUndoStackStyles ;
1853
1847
}
1854
1848
1855
-
1856
1849
QStringList QgsMapLayer::customPropertyKeys () const
1857
1850
{
1858
1851
return mCustomProperties .keys ();
0 commit comments