[QGIS Commit] r11064 - in branches/symbology-ng-branch: python/core
python/gui src/core/symbology-ng src/gui/symbology-ng src/ui
src/ui/symbollayer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Jul 14 05:49:45 EDT 2009
Author: wonder
Date: 2009-07-14 05:49:44 -0400 (Tue, 14 Jul 2009)
New Revision: 11064
Modified:
branches/symbology-ng-branch/python/core/symbology-ng-core.sip
branches/symbology-ng-branch/python/gui/symbology-ng-gui.sip
branches/symbology-ng-branch/src/core/symbology-ng/qgslinesymbollayerv2.cpp
branches/symbology-ng-branch/src/core/symbology-ng/qgslinesymbollayerv2.h
branches/symbology-ng-branch/src/core/symbology-ng/qgssymbollayerv2.h
branches/symbology-ng-branch/src/core/symbology-ng/qgssymbolv2.cpp
branches/symbology-ng-branch/src/core/symbology-ng/qgssymbolv2.h
branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.h
branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.h
branches/symbology-ng-branch/src/ui/qgsrendererv2propsdialogbase.ui
branches/symbology-ng-branch/src/ui/qgssymbolv2selectordialogbase.ui
branches/symbology-ng-branch/src/ui/symbollayer/widget_markerline.ui
branches/symbology-ng-branch/src/ui/symbollayer/widget_simpleline.ui
branches/symbology-ng-branch/src/ui/symbollayer/widget_simplemarker.ui
branches/symbology-ng-branch/src/ui/symbollayer/widget_svgmarker.ui
Log:
Changed line width to be double, fixed width retrieval from symbol, proportional scaling of symbol layers when settings size/width.
Modified: branches/symbology-ng-branch/python/core/symbology-ng-core.sip
===================================================================
--- branches/symbology-ng-branch/python/core/symbology-ng-core.sip 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/python/core/symbology-ng-core.sip 2009-07-14 09:49:44 UTC (rev 11064)
@@ -315,8 +315,8 @@
public:
virtual void renderPolyline(const QPolygonF& points, QgsRenderContext& context) = 0;
- void setWidth(int width);
- int width() const;
+ void setWidth(double width);
+ double width() const;
void drawPreviewIcon(QPainter* painter, QSize size);
@@ -450,8 +450,8 @@
public:
QgsLineSymbolV2(QgsSymbolLayerV2List layers /Transfer/ = QgsSymbolLayerV2List());
- void setWidth(int width);
- int width();
+ void setWidth(double width);
+ double width();
void renderPolyline(const QPolygonF& points, QgsRenderContext& context, int layer = -1);
Modified: branches/symbology-ng-branch/python/gui/symbology-ng-gui.sip
===================================================================
--- branches/symbology-ng-branch/python/gui/symbology-ng-gui.sip 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/python/gui/symbology-ng-gui.sip 2009-07-14 09:49:44 UTC (rev 11064)
@@ -86,7 +86,7 @@
void setSymbolFromStyle(const QModelIndex & index);
void setSymbolColor();
void setMarkerAngle(double angle);
- void setMarkerSize(int size);
- void setLineWidth(int width);
+ void setMarkerSize(double size);
+ void setLineWidth(double width);
};
Modified: branches/symbology-ng-branch/src/core/symbology-ng/qgslinesymbollayerv2.cpp
===================================================================
--- branches/symbology-ng-branch/src/core/symbology-ng/qgslinesymbollayerv2.cpp 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/core/symbology-ng/qgslinesymbollayerv2.cpp 2009-07-14 09:49:44 UTC (rev 11064)
@@ -8,7 +8,7 @@
#include <cmath>
-QgsSimpleLineSymbolLayerV2::QgsSimpleLineSymbolLayerV2(QColor color, int width, Qt::PenStyle penStyle)
+QgsSimpleLineSymbolLayerV2::QgsSimpleLineSymbolLayerV2(QColor color, double width, Qt::PenStyle penStyle)
: mPenStyle(penStyle), mOffset(0)
{
mColor = color;
@@ -19,13 +19,13 @@
QgsSymbolLayerV2* QgsSimpleLineSymbolLayerV2::create(const QgsStringMap& props)
{
QColor color = DEFAULT_SIMPLELINE_COLOR;
- int width = DEFAULT_SIMPLELINE_WIDTH;
+ double width = DEFAULT_SIMPLELINE_WIDTH;
Qt::PenStyle penStyle = DEFAULT_SIMPLELINE_PENSTYLE;
if (props.contains("color"))
color = QgsSymbolLayerV2Utils::decodeColor(props["color"]);
if (props.contains("width"))
- width = props["width"].toInt();
+ width = props["width"].toDouble();
if (props.contains("penstyle"))
penStyle = QgsSymbolLayerV2Utils::decodePenStyle(props["penstyle"]);
Modified: branches/symbology-ng-branch/src/core/symbology-ng/qgslinesymbollayerv2.h
===================================================================
--- branches/symbology-ng-branch/src/core/symbology-ng/qgslinesymbollayerv2.h 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/core/symbology-ng/qgslinesymbollayerv2.h 2009-07-14 09:49:44 UTC (rev 11064)
@@ -15,7 +15,7 @@
{
public:
QgsSimpleLineSymbolLayerV2(QColor color = DEFAULT_SIMPLELINE_COLOR,
- int width = DEFAULT_SIMPLELINE_WIDTH,
+ double width = DEFAULT_SIMPLELINE_WIDTH,
Qt::PenStyle penStyle = DEFAULT_SIMPLELINE_PENSTYLE);
// static stuff
Modified: branches/symbology-ng-branch/src/core/symbology-ng/qgssymbollayerv2.h
===================================================================
--- branches/symbology-ng-branch/src/core/symbology-ng/qgssymbollayerv2.h 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/core/symbology-ng/qgssymbollayerv2.h 2009-07-14 09:49:44 UTC (rev 11064)
@@ -89,15 +89,15 @@
public:
virtual void renderPolyline(const QPolygonF& points, QgsRenderContext& context) = 0;
- void setWidth(int width) { mWidth = width; }
- int width() const { return mWidth; }
+ void setWidth(double width) { mWidth = width; }
+ double width() const { return mWidth; }
void drawPreviewIcon(QPainter* painter, QSize size);
protected:
QgsLineSymbolLayerV2(bool locked = false);
- int mWidth;
+ double mWidth;
};
class QgsFillSymbolLayerV2 : public QgsSymbolLayerV2
Modified: branches/symbology-ng-branch/src/core/symbology-ng/qgssymbolv2.cpp
===================================================================
--- branches/symbology-ng-branch/src/core/symbology-ng/qgssymbolv2.cpp 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/core/symbology-ng/qgssymbolv2.cpp 2009-07-14 09:49:44 UTC (rev 11064)
@@ -252,13 +252,21 @@
return 0;
}
-void QgsMarkerSymbolV2::setSize(double size)
+void QgsMarkerSymbolV2::setSize(double s)
{
- // TODO: proportionally set size of layers
+ double origSize = size();
+
for (QgsSymbolLayerV2List::iterator it = mLayers.begin(); it != mLayers.end(); ++it)
{
QgsMarkerSymbolLayerV2* layer = (QgsMarkerSymbolLayerV2*) *it;
- layer->setSize(size);
+ if (layer->size() == origSize)
+ layer->setSize(s);
+ else
+ {
+ // proportionally scale size
+ if (origSize != 0)
+ layer->setSize(layer->size() * s / origSize);
+ }
}
}
@@ -308,24 +316,34 @@
mLayers.append(new QgsSimpleLineSymbolLayerV2());
}
-void QgsLineSymbolV2::setWidth(int width)
+void QgsLineSymbolV2::setWidth(double w)
{
- // TODO: proportionally set width of layers
+ double origWidth = width();
+
for (QgsSymbolLayerV2List::iterator it = mLayers.begin(); it != mLayers.end(); ++it)
{
QgsLineSymbolLayerV2* layer = (QgsLineSymbolLayerV2*) *it;
- layer->setWidth(width);
+ if (layer->width() == origWidth)
+ {
+ layer->setWidth(w);
+ }
+ else
+ {
+ // proportionally scale the width
+ if (origWidth != 0)
+ layer->setWidth( layer->width() * w / origWidth );
+ }
}
}
-int QgsLineSymbolV2::width()
+double QgsLineSymbolV2::width()
{
- int maxWidth = 0;
+ double maxWidth = 0;
for (QgsSymbolLayerV2List::const_iterator it = mLayers.begin(); it != mLayers.end(); ++it)
{
const QgsLineSymbolLayerV2* layer = (const QgsLineSymbolLayerV2*) *it;
- int width = layer->width();
- if (maxWidth > width)
+ double width = layer->width();
+ if (width > maxWidth)
maxWidth = width;
}
return maxWidth;
Modified: branches/symbology-ng-branch/src/core/symbology-ng/qgssymbolv2.h
===================================================================
--- branches/symbology-ng-branch/src/core/symbology-ng/qgssymbolv2.h 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/core/symbology-ng/qgssymbolv2.h 2009-07-14 09:49:44 UTC (rev 11064)
@@ -106,8 +106,8 @@
public:
QgsLineSymbolV2(QgsSymbolLayerV2List layers = QgsSymbolLayerV2List());
- void setWidth(int width);
- int width();
+ void setWidth(double width);
+ double width();
void renderPolyline(const QPolygonF& points, QgsRenderContext& context, int layer = -1);
Modified: branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
===================================================================
--- branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.cpp 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.cpp 2009-07-14 09:49:44 UTC (rev 11064)
@@ -32,7 +32,7 @@
setupUi(this);
- connect(spinWidth, SIGNAL(valueChanged(int)), this, SLOT(penWidthChanged()));
+ connect(spinWidth, SIGNAL(valueChanged(double)), this, SLOT(penWidthChanged()));
connect(btnChangeColor, SIGNAL(clicked()), this, SLOT(colorChanged()));
connect(cboPenStyle, SIGNAL(currentIndexChanged(int)), this, SLOT(penStyleChanged()));
connect(spinOffset, SIGNAL(valueChanged(double)), this, SLOT(offsetChanged()));
@@ -114,7 +114,7 @@
connect(lstNames, SIGNAL(currentRowChanged(int)), this, SLOT(setName()));
connect(btnChangeColorBorder, SIGNAL(clicked()), this, SLOT(setColorBorder()));
connect(btnChangeColorFill, SIGNAL(clicked()), this, SLOT(setColorFill()));
- connect(spinSize, SIGNAL(valueChanged(int)), this, SLOT(setSize()));
+ connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(setSize()));
connect(spinAngle, SIGNAL(valueChanged(double)), this, SLOT(setAngle()));
connect(spinOffsetX, SIGNAL(valueChanged(double)), this, SLOT(setOffset()));
connect(spinOffsetY, SIGNAL(valueChanged(double)), this, SLOT(setOffset()));
@@ -270,7 +270,7 @@
setupUi(this);
- connect(spinInterval, SIGNAL(valueChanged(int)), this, SLOT(setInterval(int)));
+ connect(spinInterval, SIGNAL(valueChanged(double)), this, SLOT(setInterval(double)));
connect(btnChangeMarker, SIGNAL(clicked()), this, SLOT(setMarker()));
connect(chkRotateMarker, SIGNAL(clicked()), this, SLOT(setRotate()));
connect(spinOffset, SIGNAL(valueChanged(double)), this, SLOT(setOffset()));
@@ -296,7 +296,7 @@
return mLayer;
}
-void QgsMarkerLineSymbolLayerV2Widget::setInterval(int val)
+void QgsMarkerLineSymbolLayerV2Widget::setInterval(double val)
{
mLayer->setInterval(val);
emit changed();
@@ -345,7 +345,7 @@
populateList();
connect(viewImages->selectionModel(), SIGNAL(currentChanged(const QModelIndex&, const QModelIndex&)), this, SLOT(setName(const QModelIndex&)));
- connect(spinSize, SIGNAL(valueChanged(int)), this, SLOT(setSize()));
+ connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(setSize()));
connect(spinAngle, SIGNAL(valueChanged(double)), this, SLOT(setAngle()));
connect(spinOffsetX, SIGNAL(valueChanged(double)), this, SLOT(setOffset()));
connect(spinOffsetY, SIGNAL(valueChanged(double)), this, SLOT(setOffset()));
Modified: branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.h
===================================================================
--- branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.h 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbollayerv2widget.h 2009-07-14 09:49:44 UTC (rev 11064)
@@ -131,7 +131,7 @@
public slots:
- void setInterval(int val);
+ void setInterval(double val);
void setMarker();
void setRotate();
void setOffset();
Modified: branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp
===================================================================
--- branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp 2009-07-14 09:49:44 UTC (rev 11064)
@@ -36,8 +36,8 @@
connect(btnSetColor, SIGNAL(clicked()), this, SLOT(setSymbolColor()));
connect(spinAngle, SIGNAL(valueChanged(double)), this, SLOT(setMarkerAngle(double)));
- connect(spinSize, SIGNAL(valueChanged(int)), this, SLOT(setMarkerSize(int)));
- connect(spinWidth, SIGNAL(valueChanged(int)), this, SLOT(setLineWidth(int)));
+ connect(spinSize, SIGNAL(valueChanged(double)), this, SLOT(setMarkerSize(double)));
+ connect(spinWidth, SIGNAL(valueChanged(double)), this, SLOT(setLineWidth(double)));
}
@@ -154,7 +154,7 @@
updateSymbolPreview();
}
-void QgsSymbolV2SelectorDialog::setMarkerSize(int size)
+void QgsSymbolV2SelectorDialog::setMarkerSize(double size)
{
QgsMarkerSymbolV2* markerSymbol = static_cast<QgsMarkerSymbolV2*>(mSymbol);
if (markerSymbol->size() == size)
@@ -163,7 +163,7 @@
updateSymbolPreview();
}
-void QgsSymbolV2SelectorDialog::setLineWidth(int width)
+void QgsSymbolV2SelectorDialog::setLineWidth(double width)
{
QgsLineSymbolV2* lineSymbol = static_cast<QgsLineSymbolV2*>(mSymbol);
if (lineSymbol->width() == width)
Modified: branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.h
===================================================================
--- branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.h 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/gui/symbology-ng/qgssymbolv2selectordialog.h 2009-07-14 09:49:44 UTC (rev 11064)
@@ -28,8 +28,8 @@
void setSymbolFromStyle(const QModelIndex & index);
void setSymbolColor();
void setMarkerAngle(double angle);
- void setMarkerSize(int size);
- void setLineWidth(int width);
+ void setMarkerSize(double size);
+ void setLineWidth(double width);
protected:
QgsStyleV2* mStyle;
Modified: branches/symbology-ng-branch/src/ui/qgsrendererv2propsdialogbase.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/qgsrendererv2propsdialogbase.ui 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/ui/qgsrendererv2propsdialogbase.ui 2009-07-14 09:49:44 UTC (rev 11064)
@@ -95,7 +95,7 @@
<item row="0" column="2">
<widget class="QStackedWidget" name="stackedWidget">
<property name="currentIndex">
- <number>1</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="pageSingleSymbol">
<layout class="QGridLayout">
@@ -394,7 +394,11 @@
</layout>
</item>
<item>
- <widget class="QTreeView" name="viewGraduated"/>
+ <widget class="QTreeView" name="viewGraduated">
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ </widget>
</item>
<item>
<layout class="QHBoxLayout">
Modified: branches/symbology-ng-branch/src/ui/qgssymbolv2selectordialogbase.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/qgssymbolv2selectordialogbase.ui 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/ui/qgssymbolv2selectordialogbase.ui 2009-07-14 09:49:44 UTC (rev 11064)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>QgsSymbolV2SelectorDialogBase</class>
- <widget class="QDialog" name="QgsSymbolV2SelectorDialogBase" >
- <property name="geometry" >
+ <widget class="QDialog" name="QgsSymbolV2SelectorDialogBase">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,114 +10,120 @@
<height>397</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Symbol selector</string>
</property>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <layout class="QGridLayout" >
- <item rowspan="2" row="0" column="0" >
- <widget class="QLabel" name="lblPreview" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+ <layout class="QGridLayout">
+ <item row="0" column="0" rowspan="2">
+ <widget class="QLabel" name="lblPreview">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::Box</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QPushButton" name="btnSymbolProperties" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QPushButton" name="btnSymbolProperties">
+ <property name="text">
<string>Properties</string>
</property>
</widget>
</item>
- <item rowspan="2" row="0" column="2" >
- <widget class="QStackedWidget" name="stackedWidget" >
- <property name="currentIndex" >
- <number>0</number>
+ <item row="0" column="2" rowspan="2">
+ <widget class="QStackedWidget" name="stackedWidget">
+ <property name="currentIndex">
+ <number>1</number>
</property>
- <widget class="QWidget" name="pageMarker" >
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="label_2" >
- <property name="text" >
+ <widget class="QWidget" name="pageMarker">
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
<string>Size:</string>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QSpinBox" name="spinSize" >
- <property name="minimum" >
- <number>1</number>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Angle:</string>
</property>
- <property name="maximum" >
- <number>1000</number>
- </property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="label_3" >
- <property name="text" >
- <string>Angle:</string>
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="spinAngle">
+ <property name="decimals">
+ <number>1</number>
</property>
+ <property name="maximum">
+ <double>360.000000000000000</double>
+ </property>
+ <property name="singleStep">
+ <double>5.000000000000000</double>
+ </property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QDoubleSpinBox" name="spinAngle" >
- <property name="decimals" >
+ <item row="0" column="1">
+ <widget class="QDoubleSpinBox" name="spinSize">
+ <property name="decimals">
<number>1</number>
</property>
- <property name="maximum" >
- <double>360.000000000000000</double>
+ <property name="value">
+ <double>1.000000000000000</double>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="pageLine" >
- <layout class="QHBoxLayout" >
+ <widget class="QWidget" name="pageLine">
+ <layout class="QHBoxLayout">
<item>
- <widget class="QLabel" name="label_4" >
- <property name="text" >
+ <widget class="QLabel" name="label_4">
+ <property name="text">
<string>Width:</string>
</property>
</widget>
</item>
<item>
- <widget class="QSpinBox" name="spinWidth" >
- <property name="minimum" >
+ <widget class="QDoubleSpinBox" name="spinWidth">
+ <property name="decimals">
<number>1</number>
</property>
+ <property name="value">
+ <double>1.000000000000000</double>
+ </property>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="pageFill" />
+ <widget class="QWidget" name="pageFill"/>
</widget>
</item>
- <item rowspan="2" row="0" column="3" >
+ <item row="0" column="3" rowspan="2">
<spacer>
- <property name="orientation" >
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Preferred</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0">
<size>
<width>50</width>
<height>81</height>
@@ -124,9 +131,9 @@
</property>
</spacer>
</item>
- <item row="1" column="1" >
- <widget class="QPushButton" name="btnSetColor" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QPushButton" name="btnSetColor">
+ <property name="text">
<string>Set color</string>
</property>
</widget>
@@ -134,41 +141,41 @@
</layout>
</item>
<item>
- <widget class="QLabel" name="label" >
- <property name="text" >
+ <widget class="QLabel" name="label">
+ <property name="text">
<string>Symbols from style:</string>
</property>
</widget>
</item>
<item>
- <widget class="QListView" name="viewSymbols" >
- <property name="iconSize" >
+ <widget class="QListView" name="viewSymbols">
+ <property name="iconSize">
<size>
<width>48</width>
<height>48</height>
</size>
</property>
- <property name="flow" >
+ <property name="flow">
<enum>QListView::LeftToRight</enum>
</property>
- <property name="resizeMode" >
+ <property name="resizeMode">
<enum>QListView::Adjust</enum>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>5</number>
</property>
- <property name="viewMode" >
+ <property name="viewMode">
<enum>QListView::IconMode</enum>
</property>
</widget>
</item>
<item>
- <widget class="QDialogButtonBox" name="buttonBox" >
- <property name="orientation" >
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="standardButtons" >
- <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@@ -182,11 +189,11 @@
<receiver>QgsSymbolV2SelectorDialogBase</receiver>
<slot>accept()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
@@ -198,11 +205,11 @@
<receiver>QgsSymbolV2SelectorDialogBase</receiver>
<slot>reject()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
Modified: branches/symbology-ng-branch/src/ui/symbollayer/widget_markerline.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/symbollayer/widget_markerline.ui 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/ui/symbollayer/widget_markerline.ui 2009-07-14 09:49:44 UTC (rev 11064)
@@ -53,13 +53,6 @@
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinInterval">
- <property name="minimum">
- <number>1</number>
- </property>
- </widget>
- </item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="chkRotateMarker">
<property name="text">
@@ -76,11 +69,24 @@
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="spinOffset">
+ <property name="decimals">
+ <number>1</number>
+ </property>
<property name="minimum">
- <double>-99.989999999999995</double>
+ <double>-100.000000000000000</double>
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="spinInterval">
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
Modified: branches/symbology-ng-branch/src/ui/symbollayer/widget_simpleline.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/symbollayer/widget_simpleline.ui 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/ui/symbollayer/widget_simpleline.ui 2009-07-14 09:49:44 UTC (rev 11064)
@@ -59,22 +59,6 @@
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinWidth">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- </widget>
- </item>
<item row="2" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
@@ -94,11 +78,36 @@
</item>
<item row="3" column="1">
<widget class="QDoubleSpinBox" name="spinOffset">
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="decimals">
+ <number>1</number>
+ </property>
<property name="minimum">
- <double>-99.989999999999995</double>
+ <double>-100.000000000000000</double>
</property>
</widget>
</item>
+ <item row="1" column="1">
+ <widget class="QDoubleSpinBox" name="spinWidth">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
Modified: branches/symbology-ng-branch/src/ui/symbollayer/widget_simplemarker.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/symbollayer/widget_simplemarker.ui 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/ui/symbollayer/widget_simplemarker.ui 2009-07-14 09:49:44 UTC (rev 11064)
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>394</width>
- <height>270</height>
+ <height>275</height>
</rect>
</property>
<property name="windowTitle">
@@ -67,13 +67,6 @@
</property>
</widget>
</item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="spinSize">
- <property name="minimum">
- <number>1</number>
- </property>
- </widget>
- </item>
<item row="3" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
@@ -89,6 +82,9 @@
<property name="maximum">
<double>360.000000000000000</double>
</property>
+ <property name="singleStep">
+ <double>5.000000000000000</double>
+ </property>
</widget>
</item>
<item row="4" column="0">
@@ -122,6 +118,16 @@
</item>
</layout>
</item>
+ <item row="2" column="1">
+ <widget class="QDoubleSpinBox" name="spinSize">
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
Modified: branches/symbology-ng-branch/src/ui/symbollayer/widget_svgmarker.ui
===================================================================
--- branches/symbology-ng-branch/src/ui/symbollayer/widget_svgmarker.ui 2009-07-14 09:04:28 UTC (rev 11063)
+++ branches/symbology-ng-branch/src/ui/symbollayer/widget_svgmarker.ui 2009-07-14 09:49:44 UTC (rev 11064)
@@ -29,22 +29,6 @@
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spinSize">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="value">
- <number>5</number>
- </property>
- </widget>
- </item>
<item row="0" column="2" rowspan="3">
<spacer>
<property name="orientation">
@@ -73,6 +57,9 @@
<property name="maximum">
<double>360.000000000000000</double>
</property>
+ <property name="singleStep">
+ <double>5.000000000000000</double>
+ </property>
</widget>
</item>
<item row="2" column="1">
@@ -106,6 +93,22 @@
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <widget class="QDoubleSpinBox" name="spinSize">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="decimals">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <double>1.000000000000000</double>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item>
More information about the QGIS-commit
mailing list