[QGIS Commit] r8337 - in branches/rendercontext-branch: python/core
src/app src/core/renderer src/core/symbology src/ui
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Fri Apr 11 11:23:22 EDT 2008
Author: mhugent
Date: 2008-04-11 11:23:22 -0400 (Fri, 11 Apr 2008)
New Revision: 8337
Modified:
branches/rendercontext-branch/python/core/qgssymbol.sip
branches/rendercontext-branch/src/app/qgscontinuouscolordialog.cpp
branches/rendercontext-branch/src/app/qgsgraduatedsymboldialog.cpp
branches/rendercontext-branch/src/app/qgssinglesymboldialog.cpp
branches/rendercontext-branch/src/app/qgssinglesymboldialog.h
branches/rendercontext-branch/src/app/qgsuniquevaluedialog.cpp
branches/rendercontext-branch/src/core/renderer/qgscontinuouscolorrenderer.cpp
branches/rendercontext-branch/src/core/renderer/qgsgraduatedsymbolrenderer.cpp
branches/rendercontext-branch/src/core/renderer/qgssinglesymbolrenderer.cpp
branches/rendercontext-branch/src/core/renderer/qgsuniquevaluerenderer.cpp
branches/rendercontext-branch/src/core/symbology/qgssymbol.cpp
branches/rendercontext-branch/src/core/symbology/qgssymbol.h
branches/rendercontext-branch/src/ui/qgscontinuouscolordialogbase.ui
branches/rendercontext-branch/src/ui/qgssinglesymboldialogbase.ui
Log:
Added the possibility to specify line widths in double units. The devault is 0.4 (mm) now
Modified: branches/rendercontext-branch/python/core/qgssymbol.sip
===================================================================
--- branches/rendercontext-branch/python/core/qgssymbol.sip 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/python/core/qgssymbol.sip 2008-04-11 15:23:22 UTC (rev 8337)
@@ -27,9 +27,9 @@
/**Sets the fill color*/
virtual void setFillColor(QColor c);
/**Get the line width*/
- virtual int lineWidth() const;
+ virtual double lineWidth() const;
/**Sets the line width*/
- virtual void setLineWidth(int w);
+ virtual void setLineWidth(double w);
/**Sets the pen*/
virtual void setPen(QPen p);
/**Gets a reference to m_pen. Don't use the pen to change color/style */
Modified: branches/rendercontext-branch/src/app/qgscontinuouscolordialog.cpp
===================================================================
--- branches/rendercontext-branch/src/app/qgscontinuouscolordialog.cpp 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/app/qgscontinuouscolordialog.cpp 2008-04-11 15:23:22 UTC (rev 8337)
@@ -101,8 +101,8 @@
btnMaxValue->setColor( maxsymbol->brush().color() );
}
- outlinewidthspinbox->setMinValue(0);
- outlinewidthspinbox->setValue(minsymbol->pen().width());
+ outlinewidthspinbox->setMinimum(0);
+ outlinewidthspinbox->setValue(minsymbol->pen().widthF());
if (renderer->drawPolygonOutline())
cb_polygonOutline->setCheckState(Qt::Checked);
@@ -114,7 +114,7 @@
else
{
cb_polygonOutline->setCheckState(Qt::Checked);
- outlinewidthspinbox->setValue(1);
+ outlinewidthspinbox->setValue(0.4);
if (mVectorLayer->vectorType() != QGis::Polygon)
cb_polygonOutline->setVisible(false);
@@ -172,25 +172,31 @@
//create the render items for minimum and maximum value
QgsSymbol* minsymbol = new QgsSymbol(mVectorLayer->vectorType(), QString::number(minimum, 'f'), "", "");
+ QPen minPen;
+ minPen.setColor(btnMinValue->color());
+ minPen.setWidthF(outlinewidthspinbox->value());
if (mVectorLayer->vectorType() == QGis::Line || mVectorLayer->vectorType() == QGis::Point)
{
- minsymbol->setPen(QPen(btnMinValue->color(), outlinewidthspinbox->value()));
+ minsymbol->setPen(minPen);
}
else
{
minsymbol->setBrush(QBrush(btnMinValue->color()));
- minsymbol->setPen(QPen(QColor(0, 0, 0), outlinewidthspinbox->value()));
+ minsymbol->setPen(minPen);
}
QgsSymbol* maxsymbol = new QgsSymbol(mVectorLayer->vectorType(), QString::number(maximum, 'f'), "", "");
+ QPen maxPen;
+ maxPen.setColor(btnMaxValue->color());
+ maxPen.setWidthF(outlinewidthspinbox->value());
if (mVectorLayer->vectorType() == QGis::Line || mVectorLayer->vectorType() == QGis::Point)
{
- maxsymbol->setPen(QPen(btnMaxValue->color(), outlinewidthspinbox->value()));
+ maxsymbol->setPen(maxPen);
}
else
{
maxsymbol->setBrush(QBrush(btnMaxValue->color()));
- maxsymbol->setPen(QPen(QColor(0, 0, 0), outlinewidthspinbox->value()));
+ maxsymbol->setPen(maxPen);
}
QgsContinuousColorRenderer* renderer = new QgsContinuousColorRenderer(mVectorLayer->vectorType());
Modified: branches/rendercontext-branch/src/app/qgsgraduatedsymboldialog.cpp
===================================================================
--- branches/rendercontext-branch/src/app/qgsgraduatedsymboldialog.cpp 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/app/qgsgraduatedsymboldialog.cpp 2008-04-11 15:23:22 UTC (rev 8337)
@@ -173,7 +173,7 @@
sy->setColor(it->second->pen().color());
sy->setLineStyle(it->second->pen().style());
- sy->setLineWidth(it->second->pen().width());
+ sy->setLineWidth(it->second->pen().widthF());
if (mVectorLayer->vectorType() == QGis::Point)
{
@@ -293,7 +293,7 @@
pen.setColor(Qt::black);
}
- pen.setWidth(1);
+ pen.setWidthF(0.4);
brush.setStyle(Qt::SolidPattern);
symbol->setPen(pen);
symbol->setBrush(brush);
Modified: branches/rendercontext-branch/src/app/qgssinglesymboldialog.cpp
===================================================================
--- branches/rendercontext-branch/src/app/qgssinglesymboldialog.cpp 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/app/qgssinglesymboldialog.cpp 2008-04-11 15:23:22 UTC (rev 8337)
@@ -185,7 +185,7 @@
//do the signal/slot connections
connect(btnOutlineColor, SIGNAL(clicked()), this, SLOT(selectOutlineColor()));
connect(btnFillColor, SIGNAL(clicked()), this, SLOT(selectFillColor()));
- connect(outlinewidthspinbox, SIGNAL(valueChanged(int)), this, SLOT(resendSettingsChanged()));
+ connect(outlinewidthspinbox, SIGNAL(valueChanged(double)), this, SLOT(resendSettingsChanged()));
connect(mLabelEdit, SIGNAL(textChanged(const QString&)), this, SLOT(resendSettingsChanged()));
connect (lstSymbols,SIGNAL(currentItemChanged ( QListWidgetItem * , QListWidgetItem * )),
this, SLOT (symbolChanged (QListWidgetItem * , QListWidgetItem * )));
@@ -353,11 +353,11 @@
mScaleClassificationComboBox->setCurrentText(scaleclassfield);
- outlinewidthspinbox->setValue(sy->pen().width());
+ outlinewidthspinbox->setValue(sy->pen().widthF());
//set line width 1 as minimum to avoid confusion between line width 0 and no pen line style
// ... but, drawLine is not correct with width > 0 -> until solved set to 0
- outlinewidthspinbox->setMinValue(0);
+ outlinewidthspinbox->setMinimum(0);
btnFillColor->setColor( sy->brush().color() );
@@ -449,7 +449,7 @@
}
}
-void QgsSingleSymbolDialog::setOutlineWidth(int width)
+void QgsSingleSymbolDialog::setOutlineWidth(double width)
{
outlinewidthspinbox->setValue(width);
}
@@ -466,7 +466,7 @@
return QgsSymbologyUtils::qString2PenStyle(myLineStyle);
}
-int QgsSingleSymbolDialog::getOutlineWidth()
+double QgsSingleSymbolDialog::getOutlineWidth()
{
return outlinewidthspinbox->value();
}
Modified: branches/rendercontext-branch/src/app/qgssinglesymboldialog.h
===================================================================
--- branches/rendercontext-branch/src/app/qgssinglesymboldialog.h 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/app/qgssinglesymboldialog.h 2008-04-11 15:23:22 UTC (rev 8337)
@@ -35,12 +35,12 @@
~QgsSingleSymbolDialog();
QColor getOutlineColor();
Qt::PenStyle getOutlineStyle();
- int getOutlineWidth();
+ double getOutlineWidth();
QColor getFillColor();
Qt::BrushStyle getFillStyle();
void setOutlineColor(QColor& c);
void setOutlineStyle(Qt::PenStyle pstyle);
- void setOutlineWidth(int width);
+ void setOutlineWidth(double width);
void setFillColor(QColor& c);
void setFillStyle(Qt::BrushStyle fstyle);
void setLabel(QString label);
Modified: branches/rendercontext-branch/src/app/qgsuniquevaluedialog.cpp
===================================================================
--- branches/rendercontext-branch/src/app/qgsuniquevaluedialog.cpp 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/app/qgsuniquevaluedialog.cpp 2008-04-11 15:23:22 UTC (rev 8337)
@@ -203,7 +203,7 @@
{
pen.setColor(thecolor);
pen.setStyle(Qt::SolidLine);
- pen.setWidth(1);
+ pen.setWidthF(0.4);
}
else
{
@@ -211,7 +211,7 @@
brush.setStyle(Qt::SolidPattern);
pen.setColor(Qt::black);
pen.setStyle(Qt::SolidLine);
- pen.setWidth(1);
+ pen.setWidthF(0.4);
}
sym->setPen(pen);
sym->setBrush(brush);
Modified: branches/rendercontext-branch/src/core/renderer/qgscontinuouscolorrenderer.cpp
===================================================================
--- branches/rendercontext-branch/src/core/renderer/qgscontinuouscolorrenderer.cpp 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/core/renderer/qgscontinuouscolorrenderer.cpp 2008-04-11 15:23:22 UTC (rev 8337)
@@ -122,7 +122,7 @@
// later add support for both pen and brush to dialog
QPen pen = mMinimumSymbol->pen();
pen.setColor ( QColor(red, green, blue) );
- pen.setWidthF ( widthScale * pen.width() );
+ pen.setWidthF ( widthScale * pen.widthF() );
QBrush brush = mMinimumSymbol->brush();
@@ -139,8 +139,10 @@
}
else if ( mVectorType == QGis::Line )
{
- p->setPen( QPen(QColor(red, green, blue),
- (int)(widthScale*mMinimumSymbol->pen().width()) ));//make sure the correct line width is used
+ QPen linePen;
+ linePen.setColor(QColor(red, green, blue));
+ linePen.setWidthF(widthScale*mMinimumSymbol->pen().widthF());
+ p->setPen(linePen);
}
else
{
@@ -149,7 +151,7 @@
{
QPen pen;
pen.setColor(QColor(0,0,0));
- pen.setWidthF(widthScale*mMinimumSymbol->pen().width());
+ pen.setWidthF(widthScale*mMinimumSymbol->pen().widthF());
p->setPen(pen);
}
else
Modified: branches/rendercontext-branch/src/core/renderer/qgsgraduatedsymbolrenderer.cpp
===================================================================
--- branches/rendercontext-branch/src/core/renderer/qgsgraduatedsymbolrenderer.cpp 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/core/renderer/qgsgraduatedsymbolrenderer.cpp 2008-04-11 15:23:22 UTC (rev 8337)
@@ -140,7 +140,7 @@
if( !selected )
{
QPen pen=theSymbol->pen();
- pen.setWidthF ( widthScale * pen.width() );
+ pen.setWidthF ( widthScale * pen.widthF() );
p->setPen(pen);
p->setBrush(theSymbol->brush());
}
@@ -148,7 +148,7 @@
{
QPen pen=theSymbol->pen();
pen.setColor(mSelectionColor);
- pen.setWidthF ( widthScale * pen.width() );
+ pen.setWidthF ( widthScale * pen.widthF() );
QBrush brush=theSymbol->brush();
brush.setColor(mSelectionColor);
p->setPen(pen);
Modified: branches/rendercontext-branch/src/core/renderer/qgssinglesymbolrenderer.cpp
===================================================================
--- branches/rendercontext-branch/src/core/renderer/qgssinglesymbolrenderer.cpp 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/core/renderer/qgssinglesymbolrenderer.cpp 2008-04-11 15:23:22 UTC (rev 8337)
@@ -53,7 +53,7 @@
sy->setFillStyle(Qt::SolidPattern);
sy->setColor(QColor(0, 0, 0));
}
- sy->setLineWidth(1);
+ sy->setLineWidth(0.4);
mSymbol=sy;
updateSymbolAttributes();
}
@@ -123,14 +123,14 @@
if( !selected )
{
QPen pen=mSymbol->pen();
- pen.setWidthF ( widthScale * pen.width() );
+ pen.setWidthF ( widthScale * pen.widthF() );
p->setPen(pen);
p->setBrush(mSymbol->brush());
}
else
{
QPen pen=mSymbol->pen();
- pen.setWidthF ( widthScale * pen.width() );
+ pen.setWidthF ( widthScale * pen.widthF() );
// We set pen color in case it is an area with no brush (transparent).
// Previously, this was only done for lines. Why?
pen.setColor(mSelectionColor);
Modified: branches/rendercontext-branch/src/core/renderer/qgsuniquevaluerenderer.cpp
===================================================================
--- branches/rendercontext-branch/src/core/renderer/qgsuniquevaluerenderer.cpp 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/core/renderer/qgsuniquevaluerenderer.cpp 2008-04-11 15:23:22 UTC (rev 8337)
@@ -147,14 +147,14 @@
if( !selected )
{
QPen pen=symbol->pen();
- pen.setWidthF ( widthScale * pen.width() );
+ pen.setWidthF ( widthScale * pen.widthF() );
p->setPen(pen);
p->setBrush(symbol->brush());
}
else
{
QPen pen=symbol->pen();
- pen.setWidthF ( widthScale * pen.width() );
+ pen.setWidthF ( widthScale * pen.widthF() );
pen.setColor(mSelectionColor);
QBrush brush=symbol->brush();
brush.setColor(mSelectionColor);
Modified: branches/rendercontext-branch/src/core/symbology/qgssymbol.cpp
===================================================================
--- branches/rendercontext-branch/src/core/symbology/qgssymbol.cpp 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/core/symbology/qgssymbol.cpp 2008-04-11 15:23:22 UTC (rev 8337)
@@ -147,14 +147,14 @@
mCacheUpToDate = mCacheUpToDate2 = false;
}
-int QgsSymbol::lineWidth() const
+double QgsSymbol::lineWidth() const
{
- return mPen.width();
+ return mPen.widthF();
}
-void QgsSymbol::setLineWidth(int w)
+void QgsSymbol::setLineWidth(double w)
{
- mPen.setWidth(w);
+ mPen.setWidthF(w);
mCacheUpToDate = mCacheUpToDate2 = false;
}
@@ -299,8 +299,8 @@
QImage preRotateImage;
QPen pen = mPen;
- double newWidth = mPen.width() * widthScale * scale;
- pen.setWidth(mPen.width() * widthScale * scale);
+ double newWidth = mPen.widthF() * widthScale * scale;
+ pen.setWidth(mPen.widthF() * widthScale * scale);
if ( selected )
{
@@ -419,7 +419,7 @@
outlinestyle.appendChild(outlinestyletxt);
symbol.appendChild(outlinestyle);
QDomElement outlinewidth=document.createElement("outlinewidth");
- QDomText outlinewidthtxt=document.createTextNode(QString::number(mPen.width()));
+ QDomText outlinewidthtxt=document.createTextNode(QString::number(mPen.widthF()));
outlinewidth.appendChild(outlinewidthtxt);
symbol.appendChild(outlinewidth);
QDomElement fillcolor=document.createElement("fillcolor");
@@ -515,7 +515,7 @@
QDomNode outlwnode = synode.namedItem("outlinewidth");
QDomElement outlwelement = outlwnode.toElement();
- setLineWidth(outlwelement.text().toInt());
+ setLineWidth(outlwelement.text().toDouble());
QDomNode fillcnode = synode.namedItem("fillcolor");
QDomElement fillcelement = fillcnode.toElement();
Modified: branches/rendercontext-branch/src/core/symbology/qgssymbol.h
===================================================================
--- branches/rendercontext-branch/src/core/symbology/qgssymbol.h 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/core/symbology/qgssymbol.h 2008-04-11 15:23:22 UTC (rev 8337)
@@ -53,9 +53,9 @@
/**Sets the fill color*/
virtual void setFillColor(QColor c);
/**Get the line width*/
- virtual int lineWidth() const;
+ virtual double lineWidth() const;
/**Sets the line width*/
- virtual void setLineWidth(int w);
+ virtual void setLineWidth(double w);
/**Sets the pen*/
virtual void setPen(QPen p);
/**Gets a reference to m_pen. Don't use the pen to change color/style */
Modified: branches/rendercontext-branch/src/ui/qgscontinuouscolordialogbase.ui
===================================================================
--- branches/rendercontext-branch/src/ui/qgscontinuouscolordialogbase.ui 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/ui/qgscontinuouscolordialogbase.ui 2008-04-11 15:23:22 UTC (rev 8337)
@@ -5,7 +5,7 @@
<rect>
<x>0</x>
<y>0</y>
- <width>425</width>
+ <width>575</width>
<height>155</height>
</rect>
</property>
@@ -14,55 +14,36 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
- <number>8</number>
+ <number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="3" column="1" >
- <widget class="QSpinBox" name="outlinewidthspinbox" />
+ <widget class="QDoubleSpinBox" name="outlinewidthspinbox" />
</item>
- <item row="3" column="2" >
- <widget class="QCheckBox" name="cb_polygonOutline" >
- <property name="text" >
- <string>Draw polygon outline</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="classvarlabel" >
+ <item row="0" column="1" >
+ <widget class="QComboBox" name="classificationComboBox" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>20</height>
</size>
</property>
- <property name="text" >
- <string>Classification Field:</string>
- </property>
- <property name="buddy" >
- <cstring>classificationComboBox</cstring>
- </property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="mincolorlabel" >
+ <item row="1" column="1" >
+ <widget class="QgsColorButton" name="btnMinValue" >
<property name="minimumSize" >
<size>
- <width>0</width>
- <height>20</height>
+ <width>100</width>
+ <height>0</height>
</size>
</property>
- <property name="text" >
- <string>Minimum Value:</string>
- </property>
- <property name="buddy" >
- <cstring>btnMinValue</cstring>
- </property>
</widget>
</item>
- <item row="3" column="0" >
- <widget class="QLabel" name="outlinewidthlabel" >
+ <item row="2" column="0" >
+ <widget class="QLabel" name="maxcolorlabel" >
<property name="minimumSize" >
<size>
<width>0</width>
@@ -70,10 +51,10 @@
</size>
</property>
<property name="text" >
- <string>Outline Width:</string>
+ <string>Maximum Value:</string>
</property>
<property name="buddy" >
- <cstring>outlinewidthspinbox</cstring>
+ <cstring>btnMaxValue</cstring>
</property>
</widget>
</item>
@@ -87,8 +68,8 @@
</property>
</widget>
</item>
- <item row="2" column="0" >
- <widget class="QLabel" name="maxcolorlabel" >
+ <item row="3" column="0" >
+ <widget class="QLabel" name="outlinewidthlabel" >
<property name="minimumSize" >
<size>
<width>0</width>
@@ -96,33 +77,49 @@
</size>
</property>
<property name="text" >
- <string>Maximum Value:</string>
+ <string>Outline Width:</string>
</property>
- <property name="buddy" >
- <cstring>btnMaxValue</cstring>
- </property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QgsColorButton" name="btnMinValue" >
+ <item row="1" column="0" >
+ <widget class="QLabel" name="mincolorlabel" >
<property name="minimumSize" >
<size>
- <width>100</width>
- <height>0</height>
+ <width>0</width>
+ <height>20</height>
</size>
</property>
+ <property name="text" >
+ <string>Minimum Value:</string>
+ </property>
+ <property name="buddy" >
+ <cstring>btnMinValue</cstring>
+ </property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QComboBox" name="classificationComboBox" >
+ <item row="0" column="0" >
+ <widget class="QLabel" name="classvarlabel" >
<property name="minimumSize" >
<size>
<width>0</width>
<height>20</height>
</size>
</property>
+ <property name="text" >
+ <string>Classification Field:</string>
+ </property>
+ <property name="buddy" >
+ <cstring>classificationComboBox</cstring>
+ </property>
</widget>
</item>
+ <item row="3" column="2" >
+ <widget class="QCheckBox" name="cb_polygonOutline" >
+ <property name="text" >
+ <string>Draw polygon outline</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
Modified: branches/rendercontext-branch/src/ui/qgssinglesymboldialogbase.ui
===================================================================
--- branches/rendercontext-branch/src/ui/qgssinglesymboldialogbase.ui 2008-04-11 12:17:37 UTC (rev 8336)
+++ branches/rendercontext-branch/src/ui/qgssinglesymboldialogbase.ui 2008-04-11 15:23:22 UTC (rev 8337)
@@ -6,7 +6,7 @@
<x>0</x>
<y>0</y>
<width>480</width>
- <height>566</height>
+ <height>618</height>
</rect>
</property>
<property name="sizePolicy" >
@@ -27,123 +27,6 @@
<property name="spacing" >
<number>6</number>
</property>
- <item row="1" column="0" >
- <widget class="QGroupBox" name="mGroupPoint" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="title" >
- <string>Point Symbol</string>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>9</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item row="2" column="2" >
- <widget class="QSpinBox" name="mPointSizeSpinBox" >
- <property name="maximum" >
- <number>1000</number>
- </property>
- <property name="minimum" >
- <number>3</number>
- </property>
- <property name="singleStep" >
- <number>1</number>
- </property>
- <property name="value" >
- <number>3</number>
- </property>
- </widget>
- </item>
- <item row="1" column="2" >
- <widget class="QLabel" name="textLabel1_2" >
- <property name="text" >
- <string>Size</string>
- </property>
- <property name="buddy" >
- <cstring>mPointSizeSpinBox</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1" >
- <widget class="QLabel" name="textLabel9" >
- <property name="text" >
- <string>Area scale field</string>
- </property>
- <property name="buddy" >
- <cstring>mScaleClassificationComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textLabel1_3" >
- <property name="text" >
- <string>Rotation field</string>
- </property>
- <property name="buddy" >
- <cstring>mRotationClassificationComboBox</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="0" colspan="3" >
- <widget class="QListWidget" name="lstSymbols" >
- <property name="dragDropMode" >
- <enum>QAbstractItemView::DragDrop</enum>
- </property>
- <property name="alternatingRowColors" >
- <bool>false</bool>
- </property>
- <property name="iconSize" >
- <size>
- <width>0</width>
- <height>-1</height>
- </size>
- </property>
- <property name="resizeMode" >
- <enum>QListView::Adjust</enum>
- </property>
- <property name="viewMode" >
- <enum>QListView::IconMode</enum>
- </property>
- <property name="uniformItemSizes" >
- <bool>true</bool>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <widget class="QComboBox" name="mRotationClassificationComboBox" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="2" column="1" >
- <widget class="QComboBox" name="mScaleClassificationComboBox" >
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
<item row="2" column="0" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="sizePolicy" >
@@ -206,9 +89,6 @@
<property name="text" >
<string>Outline width</string>
</property>
- <property name="buddy" >
- <cstring>outlinewidthspinbox</cstring>
- </property>
</widget>
</item>
<item row="3" column="0" >
@@ -249,7 +129,7 @@
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2" >
+ <item row="1" column="1" >
<widget class="QgsColorButton" name="btnOutlineColor" >
<property name="sizePolicy" >
<sizepolicy>
@@ -276,8 +156,8 @@
</property>
</widget>
</item>
- <item row="2" column="1" colspan="2" >
- <widget class="QSpinBox" name="outlinewidthspinbox" >
+ <item row="3" column="1" >
+ <widget class="QgsColorButton" name="btnFillColor" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
@@ -286,42 +166,148 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="minimumSize" >
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
<property name="maximumSize" >
<size>
<width>172</width>
- <height>32767</height>
+ <height>16777215</height>
</size>
</property>
+ <property name="text" >
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="2" >
+ <widget class="QDoubleSpinBox" name="outlinewidthspinbox" >
+ <property name="maximumSize" >
+ <size>
+ <width>172</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QGroupBox" name="mGroupPoint" >
+ <property name="sizePolicy" >
+ <sizepolicy>
+ <hsizetype>7</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="title" >
+ <string>Point Symbol</string>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+ <item row="2" column="2" >
+ <widget class="QSpinBox" name="mPointSizeSpinBox" >
+ <property name="maximum" >
+ <number>1000</number>
+ </property>
<property name="minimum" >
- <number>0</number>
+ <number>3</number>
</property>
+ <property name="singleStep" >
+ <number>1</number>
+ </property>
+ <property name="value" >
+ <number>3</number>
+ </property>
</widget>
</item>
- <item row="3" column="1" colspan="2" >
- <widget class="QgsColorButton" name="btnFillColor" >
- <property name="sizePolicy" >
- <sizepolicy>
- <hsizetype>7</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <item row="1" column="2" >
+ <widget class="QLabel" name="textLabel1_2" >
+ <property name="text" >
+ <string>Size</string>
</property>
+ <property name="buddy" >
+ <cstring>mPointSizeSpinBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLabel" name="textLabel9" >
+ <property name="text" >
+ <string>Area scale field</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mScaleClassificationComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="textLabel1_3" >
+ <property name="text" >
+ <string>Rotation field</string>
+ </property>
+ <property name="buddy" >
+ <cstring>mRotationClassificationComboBox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0" colspan="3" >
+ <widget class="QListWidget" name="lstSymbols" >
+ <property name="dragDropMode" >
+ <enum>QAbstractItemView::DragDrop</enum>
+ </property>
+ <property name="alternatingRowColors" >
+ <bool>false</bool>
+ </property>
+ <property name="iconSize" >
+ <size>
+ <width>0</width>
+ <height>-1</height>
+ </size>
+ </property>
+ <property name="resizeMode" >
+ <enum>QListView::Adjust</enum>
+ </property>
+ <property name="viewMode" >
+ <enum>QListView::IconMode</enum>
+ </property>
+ <property name="uniformItemSizes" >
+ <bool>true</bool>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QComboBox" name="mRotationClassificationComboBox" >
<property name="minimumSize" >
<size>
- <width>100</width>
- <height>0</height>
+ <width>0</width>
+ <height>20</height>
</size>
</property>
- <property name="maximumSize" >
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QComboBox" name="mScaleClassificationComboBox" >
+ <property name="minimumSize" >
<size>
- <width>172</width>
- <height>16777215</height>
+ <width>0</width>
+ <height>20</height>
</size>
</property>
- <property name="text" >
- <string/>
- </property>
</widget>
</item>
</layout>
@@ -395,7 +381,6 @@
<tabstop>mPointSizeSpinBox</tabstop>
<tabstop>cboOutlineStyle</tabstop>
<tabstop>btnOutlineColor</tabstop>
- <tabstop>outlinewidthspinbox</tabstop>
<tabstop>btnFillColor</tabstop>
<tabstop>cboFillStyle</tabstop>
<tabstop>toolSelectTexture</tabstop>
More information about the QGIS-commit
mailing list