remove need for factory for system of measurement

PeterPetrik · PeterPetrik · commit 7bfcaf4db948 · 2018-06-28T10:41:13.000+02:00
diff --git a/python/core/auto_additions/qgsunittypes.py b/python/core/auto_additions/qgsunittypes.py
@@ -1,4 +1,5 @@
 # The following has been generated automatically from src/core/qgsunittypes.h
+QgsUnitTypes.SystemOfMeasurement.baseClass = QgsUnitTypes
 QgsUnitTypes.DistanceUnit.baseClass = QgsUnitTypes
 QgsUnitTypes.AreaUnit.baseClass = QgsUnitTypes
 QgsUnitTypes.AngleUnit.baseClass = QgsUnitTypes
diff --git a/src/core/qgsunittypes.h b/src/core/qgsunittypes.h
@@ -47,6 +47,7 @@ class CORE_EXPORT QgsUnitTypes
       ImperialSystem, //!< British Imperial
       USCSSystem //!< United States customary system
     };
+    Q_ENUM( SystemOfMeasurement )
 
     //! Units of distance
     enum DistanceUnit
diff --git a/src/quickgui/plugin/qgsquickplugin.cpp b/src/quickgui/plugin/qgsquickplugin.cpp
@@ -66,6 +66,8 @@ void QgsQuickPlugin::registerTypes( const char *uri )
   qRegisterMetaType< QgsCoordinateFormatter::FormatFlags >( "QgsCoordinateFormatter::FormatFlags" );
   qRegisterMetaType< QgsCoordinateFormatter::Format >( "QgsCoordinateFormatter::Format" );
 
+  qmlRegisterUncreatableType< QgsUnitTypes >( uri, 0, 1, "QgsUnitTypes", "Only enums from QgsUnitTypes can be used" );
+
   qmlRegisterType< QgsProject >( uri, 0, 1, "Project" );
   qmlRegisterType< QgsQuickFeatureHighlight >( uri, 0, 1, "FeatureHighlight" );
   qmlRegisterType< QgsQuickCoordinateTransformer >( uri, 0, 1, "CoordinateTransformer" );
diff --git a/src/quickgui/qgsquickutils.cpp b/src/quickgui/qgsquickutils.cpp
@@ -101,20 +101,6 @@ const QUrl QgsQuickUtils::getThemeIcon( const QString &name ) const
   return QUrl( path );
 }
 
-QgsUnitTypes::SystemOfMeasurement QgsQuickUtils::systemOfMeasurementFactory( const QString &type )
-{
-  if ( type == QStringLiteral( "Metric" ) )
-    return QgsUnitTypes::MetricSystem;
-
-  if ( type == QStringLiteral( "Imperial" ) )
-    return QgsUnitTypes::ImperialSystem;
-
-  if ( type == QStringLiteral( "USCS" ) )
-    return QgsUnitTypes::USCSSystem;
-
-  return QgsUnitTypes::UnknownSystem;
-}
-
 QString QgsQuickUtils::formatPoint(
   const QgsPoint &point,
   QgsCoordinateFormatter::Format format,
diff --git a/src/quickgui/qgsquickutils.h b/src/quickgui/qgsquickutils.h
@@ -136,18 +136,6 @@ class QUICK_EXPORT QgsQuickUtils: public QObject
       */
     Q_INVOKABLE const QUrl getThemeIcon( const QString &name ) const;
 
-    /**
-      * QgsUnitTypes::SystemOfMeasurement factory
-      * for input type parameter:
-      *    "Metric": QgsUnitTypes::MetricSystem
-      *    "Imperial": QgsUnitTypes::ImperialSystem
-      *    "USCS": QgsUnitTypes::USCSSystem
-      *    else: QgsUnitTypes::UnknownSystem
-      *
-      * \since QGIS 3.4
-      */
-    Q_INVOKABLE static QgsUnitTypes::SystemOfMeasurement systemOfMeasurementFactory( const QString &type );
-
     /**
      * \copydoc QgsCoordinateFormatter::format()
      *
diff --git a/tests/src/quickgui/app/main.qml b/tests/src/quickgui/app/main.qml
@@ -94,7 +94,7 @@ ApplicationWindow {
     height: scaleBar.height
     mapSettings: mapCanvas.mapSettings
     preferredWidth: scaleBar.preferredWidth
-    systemOfMeasurement: QgsQuick.Utils.systemOfMeasurementFactory("Imperial")
+    systemOfMeasurement: QgsQuick.QgsUnitTypes.ImperialSystem
     z: 1
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`# The following has been generated automatically from src/core/qgsunittypes.h`
	`2`	`+QgsUnitTypes.SystemOfMeasurement.baseClass = QgsUnitTypes`
`2`	`3`	`QgsUnitTypes.DistanceUnit.baseClass = QgsUnitTypes`
`3`	`4`	`QgsUnitTypes.AreaUnit.baseClass = QgsUnitTypes`
`4`	`5`	`QgsUnitTypes.AngleUnit.baseClass = QgsUnitTypes`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ ApplicationWindow {`
`94`	`94`	`height: scaleBar.height`
`95`	`95`	`mapSettings: mapCanvas.mapSettings`
`96`	`96`	`preferredWidth: scaleBar.preferredWidth`
`97`		`- systemOfMeasurement: QgsQuick.Utils.systemOfMeasurementFactory("Imperial")`
	`97`	`+ systemOfMeasurement: QgsQuick.QgsUnitTypes.ImperialSystem`
`98`	`98`	`z: 1`
`99`	`99`	`}`
`100`	`100`