Revert "[processing] Fix clipping of long WKT strings for geometry pa…

…rameters by using our geometry widget"
qgis · Oct 24, 2024 · d5aead3 · d5aead3
1 parent 296b3f4
commit d5aead3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 30 deletions.
diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp b/src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
@@ -68,8 +68,6 @@
 #include "qgsprocessingpointcloudexpressionlineedit.h"
 #include "qgsprocessingrastercalculatorexpressionlineedit.h"
 #include "qgsunittypes.h"
-#include "qgsgeometrywidget.h"
-
 #include <QToolButton>
 #include <QLabel>
 #include <QHBoxLayout>
@@ -4429,24 +4427,23 @@ QgsProcessingGeometryParameterDefinitionWidget::QgsProcessingGeometryParameterDe
 
   vlayout->addWidget( new QLabel( tr( "Default value" ) ) );
 
-  mGeometryWidget = new QgsGeometryWidget();
+  mDefaultLineEdit = new QLineEdit();
+  mDefaultLineEdit->setToolTip( tr( "Geometry as WKT" ) );
+  mDefaultLineEdit->setPlaceholderText( tr( "Geometry as WKT" ) );
   if ( const QgsProcessingParameterGeometry *geometryParam = dynamic_cast<const QgsProcessingParameterGeometry *>( definition ) )
   {
     QgsGeometry g = QgsProcessingParameters::parameterAsGeometry( geometryParam, geometryParam->defaultValueForGui(), context );
     if ( !g.isNull() )
-    {
-      mGeometryWidget->setGeometryValue( QgsReferencedGeometry( g, QgsCoordinateReferenceSystem() ) );
-    }
+      mDefaultLineEdit->setText( g.asWkt() );
   }
 
-  vlayout->addWidget( mGeometryWidget );
+  vlayout->addWidget( mDefaultLineEdit );
   setLayout( vlayout );
 }
 
 QgsProcessingParameterDefinition *QgsProcessingGeometryParameterDefinitionWidget::createParameter( const QString &name, const QString &description, Qgis::ProcessingParameterFlags flags ) const
 {
-  const QgsReferencedGeometry geometry = mGeometryWidget->geometryValue();
-  auto param = std::make_unique< QgsProcessingParameterGeometry >( name, description, geometry.isEmpty() ? QVariant() : geometry.asWkt() );
+  auto param = std::make_unique< QgsProcessingParameterGeometry >( name, description, mDefaultLineEdit->text() );
   param->setFlags( flags );
   return param.release();
 }
@@ -4465,45 +4462,36 @@ QWidget *QgsProcessingGeometryWidgetWrapper::createWidget()
     case QgsProcessingGui::Modeler:
     case QgsProcessingGui::Batch:
     {
-      mGeometryWidget = new QgsGeometryWidget();
-      mGeometryWidget->setToolTip( parameterDefinition()->toolTip() );
-      connect( mGeometryWidget, &QgsGeometryWidget::geometryValueChanged, this, [ = ]( const QgsReferencedGeometry & )
+      mLineEdit = new QLineEdit();
+      mLineEdit->setToolTip( parameterDefinition()->toolTip() );
+      connect( mLineEdit, &QLineEdit::textChanged, this, [ = ]
       {
         emit widgetValueHasChanged( this );
       } );
-      return mGeometryWidget;
+      return mLineEdit;
     }
   }
   return nullptr;
 }
 
 void QgsProcessingGeometryWidgetWrapper::setWidgetValue( const QVariant &value, QgsProcessingContext &context )
 {
-  if ( mGeometryWidget )
+  if ( mLineEdit )
   {
     QgsGeometry g = QgsProcessingParameters::parameterAsGeometry( parameterDefinition(), value, context );
     if ( !g.isNull() )
-    {
-      mGeometryWidget->setGeometryValue( QgsReferencedGeometry( g, QgsCoordinateReferenceSystem() ) );
-    }
+      mLineEdit->setText( g.asWkt() );
     else
-    {
-      mGeometryWidget->clearGeometry();
-    }
+      mLineEdit->clear();
   }
 }
 
 QVariant QgsProcessingGeometryWidgetWrapper::widgetValue() const
 {
-  if ( mGeometryWidget )
-  {
-    const QgsReferencedGeometry geometry = mGeometryWidget->geometryValue();
-    return geometry.isEmpty() ? QVariant() : geometry.asWkt();
-  }
+  if ( mLineEdit )
+    return mLineEdit->text().isEmpty() ? QVariant() : mLineEdit->text();
   else
-  {
     return QVariant();
-  }
 }
 
 QStringList QgsProcessingGeometryWidgetWrapper::compatibleParameterTypes() const

diff --git a/src/gui/processing/qgsprocessingwidgetwrapperimpl.h b/src/gui/processing/qgsprocessingwidgetwrapperimpl.h
@@ -75,7 +75,6 @@ class QgsProcessingPointCloudExpressionLineEdit;
 class QgsProcessingRasterCalculatorExpressionLineEdit;
 class QgsRubberBand;
 class QgsHighlightableLineEdit;
-class QgsGeometryWidget;
 
 ///@cond PRIVATE
 
@@ -1239,7 +1238,7 @@ class GUI_EXPORT QgsProcessingGeometryParameterDefinitionWidget : public QgsProc
 
   private:
 
-    QgsGeometryWidget *mGeometryWidget = nullptr;
+    QLineEdit *mDefaultLineEdit = nullptr;
 
 };
 
@@ -1275,7 +1274,7 @@ class GUI_EXPORT QgsProcessingGeometryWidgetWrapper : public QgsAbstractProcessi
     QString modelerExpressionFormatString() const override;
   private:
 
-    QgsGeometryWidget *mGeometryWidget = nullptr;
+    QLineEdit *mLineEdit = nullptr;
 
     friend class TestProcessingGui;
 };