Start on GUI work

qgis · Jan 8, 2020 · 591e1a2 · 591e1a2
1 parent 90184a5
commit 591e1a2
Show file tree

Hide file tree

Showing 32 changed files with 331 additions and 0 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -110,6 +110,7 @@ IF(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/gui/layertree
       ${CMAKE_SOURCE_DIR}/src/gui/layout
       ${CMAKE_SOURCE_DIR}/src/gui/locator
+      ${CMAKE_SOURCE_DIR}/src/gui/numericformats
       ${CMAKE_SOURCE_DIR}/src/gui/ogr
       ${CMAKE_SOURCE_DIR}/src/gui/processing
       ${CMAKE_SOURCE_DIR}/src/gui/raster

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
@@ -148,6 +148,7 @@ IF (WITH_GUI)
     ${CMAKE_SOURCE_DIR}/src/gui/layertree
     ${CMAKE_SOURCE_DIR}/src/gui/layout
     ${CMAKE_SOURCE_DIR}/src/gui/locator
+    ${CMAKE_SOURCE_DIR}/src/gui/numericformats
     ${CMAKE_SOURCE_DIR}/src/gui/processing
 
     ${CMAKE_BINARY_DIR}/src/gui

diff --git a/python/core/auto_generated/numericformats/qgsbasicnumericformat.sip.in b/python/core/auto_generated/numericformats/qgsbasicnumericformat.sip.in
@@ -27,6 +27,8 @@ Default constructor
 
     virtual QString id() const;
 
+    virtual QString visibleName() const;
+
     virtual QString formatDouble( double value, const QgsNumericFormatContext &context ) const;
 
     virtual QgsNumericFormat *clone() const /Factory/;

diff --git a/python/core/auto_generated/numericformats/qgsbearingnumericformat.sip.in b/python/core/auto_generated/numericformats/qgsbearingnumericformat.sip.in
@@ -34,6 +34,8 @@ Default constructor
 
     virtual QString id() const;
 
+    virtual QString visibleName() const;
+
     virtual QString formatDouble( double value, const QgsNumericFormatContext &context ) const;
 
     virtual QgsNumericFormat *clone() const /Factory/;

diff --git a/python/core/auto_generated/numericformats/qgscurrencynumericformat.sip.in b/python/core/auto_generated/numericformats/qgscurrencynumericformat.sip.in
@@ -27,6 +27,8 @@ Default constructor
 
     virtual QString id() const;
 
+    virtual QString visibleName() const;
+
     virtual QString formatDouble( double value, const QgsNumericFormatContext &context ) const;
 
     virtual QgsNumericFormat *clone() const /Factory/;

diff --git a/python/core/auto_generated/numericformats/qgsfallbacknumericformat.sip.in b/python/core/auto_generated/numericformats/qgsfallbacknumericformat.sip.in
@@ -26,6 +26,8 @@ Default constructor
 %End
     virtual QString id() const;
 
+    virtual QString visibleName() const;
+
     virtual QString formatDouble( double value, const QgsNumericFormatContext &context ) const;
 
     virtual QgsNumericFormat *clone() const /Factory/;

diff --git a/python/core/auto_generated/numericformats/qgsnumericformat.sip.in b/python/core/auto_generated/numericformats/qgsnumericformat.sip.in
@@ -115,6 +115,11 @@ Default constructor
 Returns a unique id for this numeric format.
 
 This id is used to identify this numeric format in the registry with :py:func:`QgsNumericFormatRegistry.format()`
+%End
+
+    virtual QString visibleName() const = 0;
+%Docstring
+Returns the translated, user-visible name for this format.
 %End
 
     virtual QString formatDouble( double value, const QgsNumericFormatContext &context ) const = 0;

diff --git a/python/core/auto_generated/numericformats/qgsnumericformatregistry.sip.in b/python/core/auto_generated/numericformats/qgsnumericformatregistry.sip.in
@@ -80,6 +80,11 @@ Returns a basic numeric formatter which can be used
 to represent any number in an default manner.
 
 The caller takes ownership of the returned object.
+%End
+
+    QString visibleName( const QString &id ) const;
+%Docstring
+Returns the translated, user-visible name for the format with matching ``id``.
 %End
 
 };

diff --git a/python/core/auto_generated/numericformats/qgspercentagenumericformat.sip.in b/python/core/auto_generated/numericformats/qgspercentagenumericformat.sip.in
@@ -33,6 +33,8 @@ Default constructor
 
     virtual QString id() const;
 
+    virtual QString visibleName() const;
+
     virtual QString formatDouble( double value, const QgsNumericFormatContext &context ) const;
 
     virtual QgsNumericFormat *clone() const /Factory/;

diff --git a/python/core/auto_generated/numericformats/qgsscientificnumericformat.sip.in b/python/core/auto_generated/numericformats/qgsscientificnumericformat.sip.in
@@ -27,6 +27,8 @@ Default constructor
 
     virtual QString id() const;
 
+    virtual QString visibleName() const;
+
     virtual QString formatDouble( double value, const QgsNumericFormatContext &context ) const;
 
     virtual QgsNumericFormat *clone() const /Factory/;

diff --git a/python/gui/auto_generated/numericformats/qgsnumericformatselectorwidget.sip.in b/python/gui/auto_generated/numericformats/qgsnumericformatselectorwidget.sip.in
@@ -0,0 +1,46 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/numericformats/qgsnumericformatselectorwidget.h              *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
+class QgsNumericFormatSelectorWidget : QgsPanelWidget
+{
+
+%TypeHeaderCode
+#include "qgsnumericformatselectorwidget.h"
+%End
+  public:
+
+    QgsNumericFormatSelectorWidget( QWidget *parent /TransferThis/ = 0 );
+%Docstring
+Constructor for QgsNumericFormatSelectorWidget with the specified ``parent`` widget.
+%End
+
+    void setFormat( const QgsNumericFormat *format );
+%Docstring
+Sets the format to show in the widget.
+%End
+
+    QgsNumericFormat *format() const /TransferBack/;
+%Docstring
+Returns a new format object representing the settings currently configured in the widget.
+
+The caller takes ownership of the returned object.
+%End
+
+};
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/gui/numericformats/qgsnumericformatselectorwidget.h              *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
@@ -294,6 +294,7 @@
 %Include auto_generated/layout/qgslayoutviewtooltemporarymousepan.sip
 %Include auto_generated/layout/qgslayoutviewtoolzoom.sip
 %Include auto_generated/locator/qgslocatorwidget.sip
+%Include auto_generated/numericformats/qgsnumericformatselectorwidget.sip
 %Include auto_generated/processing/qgsprocessingalgorithmconfigurationwidget.sip
 %Include auto_generated/processing/qgsprocessingalgorithmdialogbase.sip
 %Include auto_generated/processing/qgsprocessinggui.sip

diff --git a/src/core/numericformats/qgsbasicnumericformat.cpp b/src/core/numericformats/qgsbasicnumericformat.cpp
@@ -46,6 +46,11 @@ QString QgsBasicNumericFormat::id() const
   return QStringLiteral( "basic" );
 }
 
+QString QgsBasicNumericFormat::visibleName() const
+{
+  return QObject::tr( "Number" );
+}
+
 QString QgsBasicNumericFormat::formatDouble( double value, const QgsNumericFormatContext &context ) const
 {
   std::ostringstream os;

diff --git a/src/core/numericformats/qgsbasicnumericformat.h b/src/core/numericformats/qgsbasicnumericformat.h
@@ -38,6 +38,7 @@ class CORE_EXPORT QgsBasicNumericFormat : public QgsNumericFormat
     QgsBasicNumericFormat();
 
     QString id() const override;
+    QString visibleName() const override;
     QString formatDouble( double value, const QgsNumericFormatContext &context ) const override;
     QgsNumericFormat *clone() const override SIP_FACTORY;
     QgsNumericFormat *create( const QVariantMap &configuration, const QgsReadWriteContext &context ) const override SIP_FACTORY;

diff --git a/src/core/numericformats/qgsbearingnumericformat.cpp b/src/core/numericformats/qgsbearingnumericformat.cpp
@@ -27,6 +27,11 @@ QString QgsBearingNumericFormat::id() const
   return QStringLiteral( "bearing" );
 }
 
+QString QgsBearingNumericFormat::visibleName() const
+{
+  return QObject::tr( "Bearing" );
+}
+
 QString QgsBearingNumericFormat::formatDouble( double value, const QgsNumericFormatContext &context ) const
 {
   switch ( mDirectionFormat )

diff --git a/src/core/numericformats/qgsbearingnumericformat.h b/src/core/numericformats/qgsbearingnumericformat.h
@@ -46,6 +46,7 @@ class CORE_EXPORT QgsBearingNumericFormat : public QgsBasicNumericFormat
     QgsBearingNumericFormat();
 
     QString id() const override;
+    QString visibleName() const override;
     QString formatDouble( double value, const QgsNumericFormatContext &context ) const override;
     QgsNumericFormat *clone() const override SIP_FACTORY;
     QgsNumericFormat *create( const QVariantMap &configuration, const QgsReadWriteContext &context ) const override SIP_FACTORY;

diff --git a/src/core/numericformats/qgscurrencynumericformat.cpp b/src/core/numericformats/qgscurrencynumericformat.cpp
@@ -28,6 +28,11 @@ QString QgsCurrencyNumericFormat::id() const
   return QStringLiteral( "currency" );
 }
 
+QString QgsCurrencyNumericFormat::visibleName() const
+{
+  return QObject::tr( "Currency" );
+}
+
 QString QgsCurrencyNumericFormat::formatDouble( double value, const QgsNumericFormatContext &context ) const
 {
   QString res = QgsBasicNumericFormat::formatDouble( value, context );

diff --git a/src/core/numericformats/qgscurrencynumericformat.h b/src/core/numericformats/qgscurrencynumericformat.h
@@ -35,6 +35,7 @@ class CORE_EXPORT QgsCurrencyNumericFormat : public QgsBasicNumericFormat
     QgsCurrencyNumericFormat();
 
     QString id() const override;
+    QString visibleName() const override;
     QString formatDouble( double value, const QgsNumericFormatContext &context ) const override;
     QgsNumericFormat *clone() const override SIP_FACTORY;
     QgsNumericFormat *create( const QVariantMap &configuration, const QgsReadWriteContext &context ) const override SIP_FACTORY;

diff --git a/src/core/numericformats/qgsfallbacknumericformat.cpp b/src/core/numericformats/qgsfallbacknumericformat.cpp
@@ -22,6 +22,11 @@ QString QgsFallbackNumericFormat::id() const
   return QStringLiteral( "default" );
 }
 
+QString QgsFallbackNumericFormat::visibleName() const
+{
+  return QObject::tr( "General" );
+}
+
 QString QgsFallbackNumericFormat::formatDouble( double value, const QgsNumericFormatContext & ) const
 {
   return QString::number( value );

diff --git a/src/core/numericformats/qgsfallbacknumericformat.h b/src/core/numericformats/qgsfallbacknumericformat.h
@@ -34,6 +34,7 @@ class CORE_EXPORT QgsFallbackNumericFormat : public QgsNumericFormat
       */
     QgsFallbackNumericFormat() = default;
     QString id() const override;
+    QString visibleName() const override;
     QString formatDouble( double value, const QgsNumericFormatContext &context ) const override;
     QgsNumericFormat *clone() const override SIP_FACTORY;
     QgsNumericFormat *create( const QVariantMap &configuration, const QgsReadWriteContext &context ) const override SIP_FACTORY;

diff --git a/src/core/numericformats/qgsnumericformat.h b/src/core/numericformats/qgsnumericformat.h
@@ -147,6 +147,11 @@ class CORE_EXPORT QgsNumericFormat
      */
     virtual QString id() const = 0;
 
+    /**
+     * Returns the translated, user-visible name for this format.
+     */
+    virtual QString visibleName() const = 0;
+
     /**
      * Returns a formatted string representation of a numeric double value.
      */

diff --git a/src/core/numericformats/qgsnumericformatregistry.cpp b/src/core/numericformats/qgsnumericformatregistry.cpp
@@ -25,6 +25,7 @@
 
 QgsNumericFormatRegistry::QgsNumericFormatRegistry()
 {
+  addFormat( new QgsFallbackNumericFormat() );
   addFormat( new QgsBasicNumericFormat() );
   addFormat( new QgsBearingNumericFormat() );
   addFormat( new QgsCurrencyNumericFormat() );
@@ -89,3 +90,11 @@ QgsNumericFormat *QgsNumericFormatRegistry::fallbackFormat() const
 {
   return new QgsFallbackNumericFormat();
 }
+
+QString QgsNumericFormatRegistry::visibleName( const QString &id ) const
+{
+  if ( mFormats.contains( id ) )
+    return mFormats.value( id )->visibleName();
+
+  return QString();
+}
diff --git a/src/core/numericformats/qgsnumericformatregistry.h b/src/core/numericformats/qgsnumericformatregistry.h
@@ -97,6 +97,11 @@ class CORE_EXPORT QgsNumericFormatRegistry
      */
     QgsNumericFormat *fallbackFormat() const SIP_FACTORY;
 
+    /**
+     * Returns the translated, user-visible name for the format with matching \a id.
+     */
+    QString visibleName( const QString &id ) const;
+
   private:
     QHash<QString, QgsNumericFormat *> mFormats;
 };

diff --git a/src/core/numericformats/qgspercentagenumericformat.cpp b/src/core/numericformats/qgspercentagenumericformat.cpp
@@ -27,6 +27,11 @@ QString QgsPercentageNumericFormat::id() const
   return QStringLiteral( "percentage" );
 }
 
+QString QgsPercentageNumericFormat::visibleName() const
+{
+  return QObject::tr( "Perctange" );
+}
+
 QString QgsPercentageNumericFormat::formatDouble( double value, const QgsNumericFormatContext &context ) const
 {
   switch ( mInputValues )

diff --git a/src/core/numericformats/qgspercentagenumericformat.h b/src/core/numericformats/qgspercentagenumericformat.h
@@ -42,6 +42,7 @@ class CORE_EXPORT QgsPercentageNumericFormat : public QgsBasicNumericFormat
     QgsPercentageNumericFormat();
 
     QString id() const override;
+    QString visibleName() const override;
     QString formatDouble( double value, const QgsNumericFormatContext &context ) const override;
     QgsNumericFormat *clone() const override SIP_FACTORY;
     QgsNumericFormat *create( const QVariantMap &configuration, const QgsReadWriteContext &context ) const override SIP_FACTORY;

diff --git a/src/core/numericformats/qgsscientificnumericformat.cpp b/src/core/numericformats/qgsscientificnumericformat.cpp
@@ -28,6 +28,11 @@ QString QgsScientificNumericFormat::id() const
   return QStringLiteral( "scientific" );
 }
 
+QString QgsScientificNumericFormat::visibleName() const
+{
+  return QObject::tr( "Scientific" );
+}
+
 QString QgsScientificNumericFormat::formatDouble( double value, const QgsNumericFormatContext &context ) const
 {
   return QgsBasicNumericFormat::formatDouble( value, context );

diff --git a/src/core/numericformats/qgsscientificnumericformat.h b/src/core/numericformats/qgsscientificnumericformat.h
@@ -35,6 +35,7 @@ class CORE_EXPORT QgsScientificNumericFormat : public QgsBasicNumericFormat
     QgsScientificNumericFormat();
 
     QString id() const override;
+    QString visibleName() const override;
     QString formatDouble( double value, const QgsNumericFormatContext &context ) const override;
     QgsNumericFormat *clone() const override SIP_FACTORY;
     QgsNumericFormat *create( const QVariantMap &configuration, const QgsReadWriteContext &context ) const override SIP_FACTORY;

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -202,6 +202,8 @@ SET(QGIS_GUI_SRCS
 
   locator/qgslocatorwidget.cpp
 
+  numericformats/qgsnumericformatselectorwidget.cpp
+
   ogr/qgsogrhelperfunctions.cpp
   ogr/qgsnewogrconnection.cpp
   ogr/qgsvectorlayersaveasdialog.cpp
@@ -791,6 +793,8 @@ SET(QGIS_GUI_HDRS
 
   locator/qgslocatorwidget.h
 
+  numericformats/qgsnumericformatselectorwidget.h
+
   ogr/qgsnewogrconnection.h
   ogr/qgsogrhelperfunctions.h
   ogr/qgsvectorlayersaveasdialog.h
@@ -964,6 +968,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/gui/labeling
   ${CMAKE_SOURCE_DIR}/src/gui/layertree
   ${CMAKE_SOURCE_DIR}/src/gui/layout
+  ${CMAKE_SOURCE_DIR}/src/gui/numericformats
   ${CMAKE_SOURCE_DIR}/src/gui/ogr
   ${CMAKE_SOURCE_DIR}/src/gui/processing
   ${CMAKE_SOURCE_DIR}/src/gui/providers/gdal
@@ -980,6 +985,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/src/core/layout
   ${CMAKE_SOURCE_DIR}/src/core/locator
   ${CMAKE_SOURCE_DIR}/src/core/metadata
+  ${CMAKE_SOURCE_DIR}/src/core/numericformats
   ${CMAKE_SOURCE_DIR}/src/core/processing
   ${CMAKE_SOURCE_DIR}/src/core/mesh
   ${CMAKE_SOURCE_DIR}/src/core/pal