Unify behaviour of more rotation controls

2025-03-01 00:46:20 -05:00 · 2017-05-30 16:46:46 +10:00 · 2017-05-30 16:46:46 +10:00 · 0e53226598
commit 0e53226598
parent 21a4ac4d3a
13 changed files with 127 additions and 52 deletions
--- a/src/gui/symbology-ng/qgssymbollayerwidget.cpp
+++ b/src/gui/symbology-ng/qgssymbollayerwidget.cpp
@ -391,6 +391,7 @@ QgsSimpleMarkerSymbolLayerWidget::QgsSimpleMarkerSymbolLayerWidget( const QgsVec

  spinOffsetX->setClearValue( 0.0 );
  spinOffsetY->setClearValue( 0.0 );
+  spinAngle->setClearValue( 0.0 );

  //make a temporary symbol for the size assistant preview
  mAssistantPreviewSymbol.reset( new QgsMarkerSymbol() );
@ -803,6 +804,7 @@ QgsFilledMarkerSymbolLayerWidget::QgsFilledMarkerSymbolLayerWidget( const QgsVec

  spinOffsetX->setClearValue( 0.0 );
  spinOffsetY->setClearValue( 0.0 );
+  spinAngle->setClearValue( 0.0 );

  //make a temporary symbol for the size assistant preview
  mAssistantPreviewSymbol.reset( new QgsMarkerSymbol() );
@ -987,6 +989,7 @@ QgsGradientFillSymbolLayerWidget::QgsGradientFillSymbolLayerWidget( const QgsVec

  spinOffsetX->setClearValue( 0.0 );
  spinOffsetY->setClearValue( 0.0 );
+  mSpinAngle->setClearValue( 0.0 );

  connect( btnChangeColor, &QgsColorButton::colorChanged, this, &QgsGradientFillSymbolLayerWidget::setColor );
  connect( btnChangeColor2, &QgsColorButton::colorChanged, this, &QgsGradientFillSymbolLayerWidget::setColor2 );
@ -1735,6 +1738,7 @@ QgsSvgMarkerSymbolLayerWidget::QgsSvgMarkerSymbolLayerWidget( const QgsVectorLay

  spinOffsetX->setClearValue( 0.0 );
  spinOffsetY->setClearValue( 0.0 );
+  spinAngle->setClearValue( 0.0 );

  populateList();

@ -2114,6 +2118,8 @@ QgsSVGFillSymbolLayerWidget::QgsSVGFillSymbolLayerWidget( const QgsVectorLayer *
  mSvgTreeView->setHeaderHidden( true );
  insertIcons();

+  mRotationSpinBox->setClearValue( 0.0 );
+
  mChangeColorButton->setColorDialogTitle( tr( "Select fill color" ) );
  mChangeColorButton->setContext( QStringLiteral( "symbology" ) );
  mChangeStrokeColorButton->setColorDialogTitle( tr( "Select stroke color" ) );
@ -2399,6 +2405,7 @@ QgsLinePatternFillSymbolLayerWidget::QgsLinePatternFillSymbolLayerWidget( const
  mOffsetUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
  mOffsetSpinBox->setClearValue( 0 );
+  mAngleSpinBox->setClearValue( 0 );
 }

 void QgsLinePatternFillSymbolLayerWidget::setSymbolLayer( QgsSymbolLayer *layer )
@ -2657,6 +2664,7 @@ QgsFontMarkerSymbolLayerWidget::QgsFontMarkerSymbolLayerWidget( const QgsVectorL

  spinOffsetX->setClearValue( 0.0 );
  spinOffsetY->setClearValue( 0.0 );
+  spinAngle->setClearValue( 0.0 );

  //make a temporary symbol for the size assistant preview
  mAssistantPreviewSymbol.reset( new QgsMarkerSymbol() );
@ -2918,6 +2926,7 @@ QgsRasterFillSymbolLayerWidget::QgsRasterFillSymbolLayerWidget( const QgsVectorL

  mSpinOffsetX->setClearValue( 0.0 );
  mSpinOffsetY->setClearValue( 0.0 );
+  mRotationSpinBox->setClearValue( 0.0 );

  connect( cboCoordinateMode, static_cast<void ( QComboBox::* )( int )>( &QComboBox::currentIndexChanged ), this, &QgsRasterFillSymbolLayerWidget::setCoordinateMode );
  connect( mSpinOffsetX, static_cast < void ( QDoubleSpinBox::* )( double ) > ( &QDoubleSpinBox::valueChanged ), this, &QgsRasterFillSymbolLayerWidget::offsetChanged );
--- a/src/gui/symbology-ng/qgssymbolslistwidget.cpp
+++ b/src/gui/symbology-ng/qgssymbolslistwidget.cpp
@ -51,6 +51,7 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbol *symbol, QgsStyle *style,
  , mMapCanvas( nullptr )
 {
  setupUi( this );
+  spinAngle->setClearValue( 0 );

  mSymbolUnitWidget->setUnits( QgsUnitTypes::RenderUnitList() << QgsUnitTypes::RenderMillimeters << QgsUnitTypes::RenderMapUnits << QgsUnitTypes::RenderPixels
                               << QgsUnitTypes::RenderPoints << QgsUnitTypes::RenderInches );
--- a/src/ui/qgstextformatwidgetbase.ui
+++ b/src/ui/qgstextformatwidgetbase.ui
@ -3409,14 +3409,17 @@ font-style: italic;</string>
                             </item>
                             <item>
                              <widget class="QgsSpinBox" name="mShadowOffsetAngleSpnBx">
+                               <property name="wrapping">
+                                <bool>true</bool>
+                               </property>
                               <property name="suffix">
                                <string>˚</string>
                               </property>
                               <property name="minimum">
-                                <number>-180</number>
+                                <number>-360</number>
                               </property>
                               <property name="maximum">
-                                <number>180</number>
+                                <number>360</number>
                               </property>
                               <property name="showClearButton" stdset="0">
                                <bool>false</bool>
--- a/src/ui/symbollayer/widget_ellipse.ui
+++ b/src/ui/symbollayer/widget_ellipse.ui
@ -6,7 +6,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>305</width>
+    <width>334</width>
    <height>680</height>
   </rect>
  </property>
@ -228,6 +228,9 @@
    <layout class="QHBoxLayout" name="horizontalLayout_10">
     <item>
      <widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
+       <property name="wrapping">
+        <bool>true</bool>
+       </property>
       <property name="suffix">
        <string> °</string>
       </property>
@ -599,17 +602,17 @@
   <extends>QDoubleSpinBox</extends>
   <header>qgsdoublespinbox.h</header>
  </customwidget>
+  <customwidget>
+   <class>QgsPenJoinStyleComboBox</class>
+   <extends>QComboBox</extends>
+   <header>qgspenstylecombobox.h</header>
+  </customwidget>
  <customwidget>
   <class>QgsUnitSelectionWidget</class>
   <extends>QWidget</extends>
   <header>qgsunitselectionwidget.h</header>
   <container>1</container>
  </customwidget>
-  <customwidget>
-   <class>QgsPenJoinStyleComboBox</class>
-   <extends>QComboBox</extends>
-   <header>qgspenstylecombobox.h</header>
-  </customwidget>
  <customwidget>
   <class>QgsPenStyleComboBox</class>
   <extends>QComboBox</extends>
--- a/src/ui/symbollayer/widget_filledmarker.ui
+++ b/src/ui/symbollayer/widget_filledmarker.ui
@ -79,12 +79,18 @@
   </item>
   <item row="1" column="1">
    <widget class="QgsDoubleSpinBox" name="spinAngle">
+     <property name="wrapping">
+      <bool>true</bool>
+     </property>
     <property name="suffix">
      <string> °</string>
     </property>
     <property name="decimals">
      <number>2</number>
     </property>
+     <property name="minimum">
+      <double>-360.000000000000000</double>
+     </property>
     <property name="maximum">
      <double>360.000000000000000</double>
     </property>
--- a/src/ui/symbollayer/widget_fontmarker.ui
+++ b/src/ui/symbollayer/widget_fontmarker.ui
@ -399,12 +399,18 @@
    <layout class="QHBoxLayout" name="horizontalLayout_4">
     <item>
      <widget class="QgsDoubleSpinBox" name="spinAngle">
+       <property name="wrapping">
+        <bool>true</bool>
+       </property>
       <property name="suffix">
        <string> °</string>
       </property>
       <property name="decimals">
        <number>2</number>
       </property>
+       <property name="minimum">
+        <double>-360.000000000000000</double>
+       </property>
       <property name="maximum">
        <double>360.000000000000000</double>
       </property>
@ -453,33 +459,33 @@
  </layout>
 </widget>
 <customwidgets>
-  <customwidget>
-   <class>QgsScrollArea</class>
-   <extends>QScrollArea</extends>
-   <header>qgsscrollarea.h</header>
-   <container>1</container>
-  </customwidget>
  <customwidget>
   <class>QgsColorButton</class>
   <extends>QToolButton</extends>
   <header>qgscolorbutton.h</header>
   <container>1</container>
  </customwidget>
-  <customwidget>
-   <class>QgsDoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header>qgsdoublespinbox.h</header>
-  </customwidget>
  <customwidget>
   <class>QgsPropertyOverrideButton</class>
   <extends>QToolButton</extends>
   <header>qgspropertyoverridebutton.h</header>
  </customwidget>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
  <customwidget>
   <class>QgsPenJoinStyleComboBox</class>
   <extends>QComboBox</extends>
   <header>qgspenstylecombobox.h</header>
  </customwidget>
+  <customwidget>
+   <class>QgsScrollArea</class>
+   <extends>QScrollArea</extends>
+   <header>qgsscrollarea.h</header>
+   <container>1</container>
+  </customwidget>
  <customwidget>
   <class>QgsUnitSelectionWidget</class>
   <extends>QWidget</extends>
--- a/src/ui/symbollayer/widget_gradientfill.ui
+++ b/src/ui/symbollayer/widget_gradientfill.ui
@ -404,9 +404,15 @@
    <layout class="QHBoxLayout" name="horizontalLayout_9">
     <item>
      <widget class="QgsDoubleSpinBox" name="mSpinAngle">
+       <property name="wrapping">
+        <bool>true</bool>
+       </property>
       <property name="suffix">
        <string> °</string>
       </property>
+       <property name="minimum">
+        <double>-360.000000000000000</double>
+       </property>
       <property name="maximum">
        <double>360.000000000000000</double>
       </property>
@ -517,6 +523,11 @@
    </spacer>
   </item>
  </layout>
+  <zorder>btnChangeColor2</zorder>
+  <zorder>btnColorRamp</zorder>
+  <zorder>btnChangeColor</zorder>
+  <zorder>checkRefPoint1Centroid</zorder>
+  <zorder>checkRefPoint2Centroid</zorder>
  <zorder>label_6</zorder>
  <zorder>label_3</zorder>
  <zorder>radioColorRamp</zorder>
@ -546,12 +557,6 @@
   <header>qgscolorbutton.h</header>
   <container>1</container>
  </customwidget>
-  <customwidget>
-   <class>QgsColorRampButton</class>
-   <extends>QToolButton</extends>
-   <header>qgscolorrampbutton.h</header>
-   <container>1</container>
-  </customwidget>
  <customwidget>
   <class>QgsPropertyOverrideButton</class>
   <extends>QToolButton</extends>
@ -568,6 +573,12 @@
   <header>qgsunitselectionwidget.h</header>
   <container>1</container>
  </customwidget>
+  <customwidget>
+   <class>QgsColorRampButton</class>
+   <extends>QToolButton</extends>
+   <header>qgscolorrampbutton.h</header>
+   <container>1</container>
+  </customwidget>
 </customwidgets>
 <tabstops>
  <tabstop>radioTwoColor</tabstop>
--- a/src/ui/symbollayer/widget_linepatternfill.ui
+++ b/src/ui/symbollayer/widget_linepatternfill.ui
@ -121,9 +121,15 @@
    <layout class="QHBoxLayout" name="horizontalLayout_2">
     <item>
      <widget class="QgsDoubleSpinBox" name="mAngleSpinBox">
+       <property name="wrapping">
+        <bool>true</bool>
+       </property>
       <property name="suffix">
        <string> °</string>
       </property>
+       <property name="minimum">
+        <double>-360.000000000000000</double>
+       </property>
       <property name="maximum">
        <double>360.000000000000000</double>
       </property>
--- a/src/ui/symbollayer/widget_rasterfill.ui
+++ b/src/ui/symbollayer/widget_rasterfill.ui
@ -77,9 +77,15 @@
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
+       <property name="wrapping">
+        <bool>true</bool>
+       </property>
       <property name="suffix">
        <string> °</string>
       </property>
+       <property name="minimum">
+        <double>-360.000000000000000</double>
+       </property>
       <property name="maximum">
        <double>360.000000000000000</double>
       </property>
--- a/src/ui/symbollayer/widget_simplemarker.ui
+++ b/src/ui/symbollayer/widget_simplemarker.ui
@ -6,7 +6,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>305</width>
+    <width>318</width>
    <height>637</height>
   </rect>
  </property>
@ -121,12 +121,18 @@
    <layout class="QHBoxLayout" name="horizontalLayout_6">
     <item>
      <widget class="QgsDoubleSpinBox" name="spinAngle">
+       <property name="wrapping">
+        <bool>true</bool>
+       </property>
       <property name="suffix">
        <string> °</string>
       </property>
       <property name="decimals">
        <number>2</number>
       </property>
+       <property name="minimum">
+        <double>-360.000000000000000</double>
+       </property>
       <property name="maximum">
        <double>360.000000000000000</double>
       </property>
@ -535,17 +541,17 @@
   <extends>QDoubleSpinBox</extends>
   <header>qgsdoublespinbox.h</header>
  </customwidget>
+  <customwidget>
+   <class>QgsPenJoinStyleComboBox</class>
+   <extends>QComboBox</extends>
+   <header>qgspenstylecombobox.h</header>
+  </customwidget>
  <customwidget>
   <class>QgsUnitSelectionWidget</class>
   <extends>QWidget</extends>
   <header>qgsunitselectionwidget.h</header>
   <container>1</container>
  </customwidget>
-  <customwidget>
-   <class>QgsPenJoinStyleComboBox</class>
-   <extends>QComboBox</extends>
-   <header>qgspenstylecombobox.h</header>
-  </customwidget>
  <customwidget>
   <class>QgsPenStyleComboBox</class>
   <extends>QComboBox</extends>
--- a/src/ui/symbollayer/widget_svgfill.ui
+++ b/src/ui/symbollayer/widget_svgfill.ui
@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>300</width>
-    <height>459</height>
+    <width>322</width>
+    <height>509</height>
   </rect>
  </property>
  <property name="windowTitle">
@ -18,9 +18,15 @@
    <layout class="QHBoxLayout" name="horizontalLayout_5">
     <item>
      <widget class="QgsDoubleSpinBox" name="mRotationSpinBox">
+       <property name="wrapping">
+        <bool>true</bool>
+       </property>
       <property name="suffix">
        <string> °</string>
       </property>
+       <property name="minimum">
+        <double>-360.000000000000000</double>
+       </property>
       <property name="maximum">
        <double>360.000000000000000</double>
       </property>
@ -274,18 +280,18 @@
     </item>
     <item row="1" column="1">
      <widget class="QListView" name="mSvgListView">
-       <property name="minimumSize">
-        <size>
-         <width>0</width>
-         <height>250</height>
-        </size>
-       </property>
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>5</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>250</height>
+        </size>
+       </property>
       <property name="iconSize">
        <size>
         <width>32</width>
@ -327,6 +333,12 @@
  </layout>
 </widget>
 <customwidgets>
+  <customwidget>
+   <class>QgsColorButton</class>
+   <extends>QToolButton</extends>
+   <header>qgscolorbutton.h</header>
+   <container>1</container>
+  </customwidget>
  <customwidget>
   <class>QgsPropertyOverrideButton</class>
   <extends>QToolButton</extends>
@ -343,12 +355,6 @@
   <header>qgsunitselectionwidget.h</header>
   <container>1</container>
  </customwidget>
-  <customwidget>
-   <class>QgsColorButton</class>
-   <extends>QToolButton</extends>
-   <header>qgscolorbutton.h</header>
-   <container>1</container>
-  </customwidget>
 </customwidgets>
 <tabstops>
  <tabstop>mTextureWidthSpinBox</tabstop>
--- a/src/ui/symbollayer/widget_svgmarker.ui
+++ b/src/ui/symbollayer/widget_svgmarker.ui
@ -91,12 +91,18 @@
    <layout class="QHBoxLayout" name="horizontalLayout_7">
     <item>
      <widget class="QgsDoubleSpinBox" name="spinAngle">
+       <property name="wrapping">
+        <bool>true</bool>
+       </property>
       <property name="suffix">
        <string> °</string>
       </property>
       <property name="decimals">
        <number>2</number>
       </property>
+       <property name="minimum">
+        <double>-360.000000000000000</double>
+       </property>
       <property name="maximum">
        <double>360.000000000000000</double>
       </property>
@ -525,6 +531,12 @@
  </layout>
 </widget>
 <customwidgets>
+  <customwidget>
+   <class>QgsColorButton</class>
+   <extends>QToolButton</extends>
+   <header>qgscolorbutton.h</header>
+   <container>1</container>
+  </customwidget>
  <customwidget>
   <class>QgsPropertyOverrideButton</class>
   <extends>QToolButton</extends>
@ -541,12 +553,6 @@
   <header>qgsunitselectionwidget.h</header>
   <container>1</container>
  </customwidget>
-  <customwidget>
-   <class>QgsColorButton</class>
-   <extends>QToolButton</extends>
-   <header>qgscolorbutton.h</header>
-   <container>1</container>
-  </customwidget>
 </customwidgets>
 <tabstops>
  <tabstop>spinSize</tabstop>
--- a/src/ui/symbollayer/widget_symbolslist.ui
+++ b/src/ui/symbollayer/widget_symbolslist.ui
@ -320,17 +320,23 @@
           </property>
           <item>
            <widget class="QgsDoubleSpinBox" name="spinAngle">
+             <property name="wrapping">
+              <bool>true</bool>
+             </property>
             <property name="suffix">
              <string> °</string>
             </property>
             <property name="decimals">
              <number>2</number>
             </property>
+             <property name="minimum">
+              <double>-360.000000000000000</double>
+             </property>
             <property name="maximum">
              <double>360.000000000000000</double>
             </property>
             <property name="singleStep">
-              <double>0.500000000000000</double>
+              <double>1.000000000000000</double>
             </property>
            </widget>
           </item>