Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
renamed QgsSiSyDialog to QgsSingleSymbolDialog
git-svn-id: http://svn.osgeo.org/qgis/trunk@4871 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Feb 18, 2006
1 parent 71a9b89 commit 548bdbf
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 52 deletions.
6 changes: 3 additions & 3 deletions src/gui/Makefile.am
Expand Up @@ -118,8 +118,8 @@ libqgis_guiHEADERS = \
qgsrubberband.h \
qgsrunprocess.h \
qgsserversourceselect.h \
qgssinglesymboldialog.h \
qgssinglesymbolrenderer.h \
qgssisydialog.h \
qgsspatialrefsys.h \
qgsuniquevalrenderer.h \
qgsuvaldialog.h \
Expand Down Expand Up @@ -171,7 +171,7 @@ libqgis_gui_la_MOC = \
qgsrasterlayerproperties.moc.cpp \
qgsrunprocess.moc.cpp \
qgsserversourceselect.moc.cpp \
qgssisydialog.moc.cpp \
qgssinglesymboldialog.moc.cpp \
qgsuvaldialog.moc.cpp \
qgsvectorlayer.moc.cpp \
qgsvectorlayerproperties.moc.cpp
Expand Down Expand Up @@ -229,8 +229,8 @@ libqgis_gui_la_SOURCES = \
qgsrubberband.cpp \
qgsrunprocess.cpp \
qgsserversourceselect.cpp \
qgssinglesymboldialog.cpp \
qgssinglesymbolrenderer.cpp \
qgssisydialog.cpp \
qgsspatialrefsys.cpp \
qgsuniquevalrenderer.cpp \
qgsuvaldialog.cpp \
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgsgrasydialog.h
Expand Up @@ -20,7 +20,7 @@
#define QGSGRASYDIALOG_H

#include "ui_qgsgrasydialogbase.h"
#include "qgssisydialog.h"
#include "qgssinglesymboldialog.h"
#include <map>

class QgsVectorLayer;
Expand Down Expand Up @@ -55,7 +55,7 @@ class QgsGraSyDialog: public QDialog, private Ui::QgsGraSyDialogBase
/**Stores the classes*/
std::map<QString,QgsSymbol*> mEntries;
/**Dialog which shows the settings of the activated class*/
QgsSiSyDialog sydialog;
QgsSingleSymbolDialog sydialog;
int mClassificationField;
private:
/**Default constructor is privat to not use is*/
Expand Down
54 changes: 27 additions & 27 deletions src/gui/qgssisydialog.cpp → src/gui/qgssinglesymboldialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
qgssisydialog.cpp - description
qgssinglesymboldialog.cpp - description
-------------------
begin : Oct 2003
copyright : (C) 2003 by Marco Hugentobler
Expand All @@ -16,7 +16,7 @@
***************************************************************************/
/* $Id$ */

#include "qgssisydialog.h"
#include "qgssinglesymboldialog.h"
#include "qgsmarkercatalogue.h"
#include "qgssinglesymbolrenderer.h"
#include "qgssvgcache.h"
Expand All @@ -28,19 +28,19 @@
#include <QPainter>


QgsSiSyDialog::QgsSiSyDialog(): QDialog(), mVectorLayer(0)
QgsSingleSymbolDialog::QgsSingleSymbolDialog(): QDialog(), mVectorLayer(0)
{
setupUi(this);
#ifdef QGISDEBUG
qWarning("constructor QgsSiSyDialog called WITHOUT a layer");
qWarning("constructor QgsSingleSymbolDialog called WITHOUT a layer");
#endif
}

QgsSiSyDialog::QgsSiSyDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(layer)
QgsSingleSymbolDialog::QgsSingleSymbolDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(layer)
{
setupUi(this);
#ifdef QGISDEBUG
qWarning("constructor QgsSiSyDialog called WITH a layer");
qWarning("constructor QgsSingleSymbolDialog called WITH a layer");
#endif

//
Expand Down Expand Up @@ -129,7 +129,7 @@ QgsSiSyDialog::QgsSiSyDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(la
}
else
{
qWarning("Warning, layer is a null pointer in QgsSiSyDialog::QgsSiSyDialog(QgsVectorLayer)");
qWarning("Warning, layer is a null pointer in QgsSingleSymbolDialog::QgsSingleSymbolDialog(QgsVectorLayer)");
}

//do the signal/slot connections
Expand Down Expand Up @@ -166,14 +166,14 @@ QgsSiSyDialog::QgsSiSyDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(la

}

QgsSiSyDialog::~QgsSiSyDialog()
QgsSingleSymbolDialog::~QgsSingleSymbolDialog()
{
#ifdef QGISDEBUG
qWarning("destructor QgsSiSyDialog");
qWarning("destructor QgsSingleSymbolDialog");
#endif
}

void QgsSiSyDialog::selectOutlineColor()
void QgsSingleSymbolDialog::selectOutlineColor()
{
QColor c = QColorDialog::getColor(lblOutlineColor->paletteBackgroundColor(),this);

Expand All @@ -185,7 +185,7 @@ void QgsSiSyDialog::selectOutlineColor()
setActiveWindow();
}

void QgsSiSyDialog::selectFillColor()
void QgsSingleSymbolDialog::selectFillColor()
{
QColor c = QColorDialog::getColor(lblFillColor->paletteBackgroundColor(),this);

Expand All @@ -197,7 +197,7 @@ void QgsSiSyDialog::selectFillColor()
setActiveWindow();
}

void QgsSiSyDialog::apply( QgsSymbol *sy )
void QgsSingleSymbolDialog::apply( QgsSymbol *sy )
{
//query the values of the widgets and set the symbology of the vector layer
sy->setFillColor(lblFillColor->paletteBackgroundColor());
Expand Down Expand Up @@ -296,7 +296,7 @@ void QgsSiSyDialog::apply( QgsSymbol *sy )
sy->setLabel(mLabelEdit->text());
}

void QgsSiSyDialog::apply()
void QgsSingleSymbolDialog::apply()
{
QgsSymbol* sy = new QgsSymbol(mVectorLayer->vectorType());
apply(sy);
Expand All @@ -307,7 +307,7 @@ void QgsSiSyDialog::apply()
mVectorLayer->refreshLegend();
}

void QgsSiSyDialog::set ( const QgsSymbol *sy )
void QgsSingleSymbolDialog::set ( const QgsSymbol *sy )
{
// Set point symbol
for ( int i = 0; i < mMarkers.size(); i++ ) {
Expand Down Expand Up @@ -411,12 +411,12 @@ void QgsSiSyDialog::set ( const QgsSymbol *sy )
}
}

void QgsSiSyDialog::setOutlineColor(QColor& c)
void QgsSingleSymbolDialog::setOutlineColor(QColor& c)
{
lblOutlineColor->setPaletteBackgroundColor(c);
}

void QgsSiSyDialog::setOutlineStyle(Qt::PenStyle pstyle)
void QgsSingleSymbolDialog::setOutlineStyle(Qt::PenStyle pstyle)
{
// XXX use switch() instead
if (pstyle==Qt::NoPen)
Expand All @@ -433,12 +433,12 @@ void QgsSiSyDialog::setOutlineStyle(Qt::PenStyle pstyle)
(pbnLineSolid->setOn(true)); //default to solid
}

void QgsSiSyDialog::setFillColor(QColor& c)
void QgsSingleSymbolDialog::setFillColor(QColor& c)
{
lblFillColor->setPaletteBackgroundColor(c);
}

void QgsSiSyDialog::setFillStyle(Qt::BrushStyle fstyle)
void QgsSingleSymbolDialog::setFillStyle(Qt::BrushStyle fstyle)
{
#ifdef QGISDEBUG
qWarning(("Setting fill style: "+QgsSymbologyUtils::brushStyle2QString(fstyle)).toLocal8Bit().data());
Expand Down Expand Up @@ -477,17 +477,17 @@ void QgsSiSyDialog::setFillStyle(Qt::BrushStyle fstyle)
(nopen->setOn(true)); //default to no brush
}

void QgsSiSyDialog::setOutlineWidth(int width)
void QgsSingleSymbolDialog::setOutlineWidth(int width)
{
outlinewidthspinbox->setValue(width);
}

QColor QgsSiSyDialog::getOutlineColor()
QColor QgsSingleSymbolDialog::getOutlineColor()
{
return lblOutlineColor->paletteBackgroundColor();
}

Qt::PenStyle QgsSiSyDialog::getOutlineStyle()
Qt::PenStyle QgsSingleSymbolDialog::getOutlineStyle()
{
if (pbnLineNoPen->isOn())
return Qt::NoPen;
Expand All @@ -504,17 +504,17 @@ Qt::PenStyle QgsSiSyDialog::getOutlineStyle()

}

int QgsSiSyDialog::getOutlineWidth()
int QgsSingleSymbolDialog::getOutlineWidth()
{
return outlinewidthspinbox->value();
}

QColor QgsSiSyDialog::getFillColor()
QColor QgsSingleSymbolDialog::getFillColor()
{
return lblFillColor->paletteBackgroundColor();
}

Qt::BrushStyle QgsSiSyDialog::getFillStyle()
Qt::BrushStyle QgsSingleSymbolDialog::getFillStyle()
{
if (solid->isOn())
{
Expand Down Expand Up @@ -577,17 +577,17 @@ Qt::BrushStyle QgsSiSyDialog::getFillStyle()

}

void QgsSiSyDialog::resendSettingsChanged()
void QgsSingleSymbolDialog::resendSettingsChanged()
{
emit settingsChanged();
}

QString QgsSiSyDialog::label()
QString QgsSingleSymbolDialog::label()
{
return mLabelEdit->text();
}

void QgsSiSyDialog::setLabel(QString label)
void QgsSingleSymbolDialog::setLabel(QString label)
{
mLabelEdit->setText(label);
}
Expand Down
18 changes: 9 additions & 9 deletions src/gui/qgssisydialog.h → src/gui/qgssinglesymboldialog.h
@@ -1,5 +1,5 @@
/***************************************************************************
qgssisydialog.h - description
qgssinglesymboldialog.h - description
-------------------
begin : Oct 2003
copyright : (C) 2003 by Marco Hugentobler
Expand All @@ -16,23 +16,23 @@
***************************************************************************/
/* $Id$ */

#ifndef QGSSISYDIALOG_H
#define QGSSISYDIALOG_H
#ifndef QGSSINGLESYMBOLDIALOG_H
#define QGSSINGLESYMBOLDIALOG_H

#include "ui_qgssisydialogbase.h"
#include "ui_qgssinglesymboldialogbase.h"
#include <vector>

class QgsSymbol;
class QgsVectorLayer;


/**QgsSiSyDialog is a dialog to set symbology for the legend type 'single symbol'*/
class QgsSiSyDialog: public QDialog, private Ui::QgsSiSyDialogBase
/**QgsSingleSymbolDialog is a dialog to set symbology for the legend type 'single symbol'*/
class QgsSingleSymbolDialog: public QDialog, private Ui::QgsSingleSymbolDialogBase
{
Q_OBJECT
public:
QgsSiSyDialog(QgsVectorLayer* layer);
~QgsSiSyDialog();
QgsSingleSymbolDialog(QgsVectorLayer* layer);
~QgsSingleSymbolDialog();
QColor getOutlineColor();
Qt::PenStyle getOutlineStyle();
int getOutlineWidth();
Expand Down Expand Up @@ -64,7 +64,7 @@ protected slots:
void selectFillColor();
private:
/**Default constructor is privat to not use is*/
QgsSiSyDialog();
QgsSingleSymbolDialog();

/** vector of marker names for combo items */
std::vector<QString> mMarkers;
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgssinglesymbolrenderer.cpp
Expand Up @@ -21,7 +21,6 @@
#include "qgis.h"
#include "qgsvectorlayer.h"
#include "qstring.h"
#include "qgssisydialog.h"
#include "qgslegenditem.h"
#include "qgssymbologyutils.h"
#include "qgssvgcache.h"
Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgsuvaldialog.h
Expand Up @@ -20,7 +20,7 @@
#define QGSUVALDIALOG_H

#include "ui_qgsuvaldialogbase.h"
#include "qgssisydialog.h"
#include "qgssinglesymboldialog.h"
#include <map>

class QgsVectorLayer;
Expand All @@ -41,7 +41,7 @@ class QgsUValDialog: public QDialog, private Ui::QgsUValDialogBase
QgsVectorLayer* mVectorLayer;
/**Set to store the already entered values*/
std::map<QString,QgsSymbol*> mValues;
QgsSiSyDialog sydialog;
QgsSingleSymbolDialog sydialog;
/**Value for which symbology settings are displayed*/
QString currentValue;

Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsvectorlayer.cpp
Expand Up @@ -73,7 +73,6 @@
#include "qgscontinuouscolrenderer.h"
#include "qgsuniquevalrenderer.h"
#include "qgsrenderitem.h"
#include "qgssisydialog.h"
#include "qgsproviderregistry.h"
#include "qgsrect.h"
#include "qgslabelattributes.h"
Expand Down
8 changes: 4 additions & 4 deletions src/gui/qgsvectorlayerproperties.cpp
Expand Up @@ -23,7 +23,7 @@
#include "qgsgrasydialog.h"
#include "qgslabeldialog.h"
#include "qgslayerprojectionselector.h"
#include "qgssisydialog.h"
#include "qgssinglesymboldialog.h"
#include "qgsuvaldialog.h"
#include "qgsvectordataprovider.h"
#include "qgsvectorlayer.h"
Expand Down Expand Up @@ -93,7 +93,7 @@ void QgsVectorLayerProperties::alterLayerDialog(const QString & dialogString)
mRendererDialog=0;
if(dialogString == tr("Single Symbol"))
{
mRendererDialog = new QgsSiSyDialog(layer);
mRendererDialog = new QgsSingleSymbolDialog(layer);
}
else if(dialogString == tr("Graduated Symbol"))
{
Expand Down Expand Up @@ -185,7 +185,7 @@ void QgsVectorLayerProperties::reset( void )
QString rtype=layer->renderer()->name();
if(rtype=="Single Symbol")
{
mRendererDialog=new QgsSiSyDialog(layer);
mRendererDialog=new QgsSingleSymbolDialog(layer);
legendtypecombobox->setCurrentIndex(0);
}
else if(rtype=="Graduated Symbol")
Expand Down Expand Up @@ -277,7 +277,7 @@ void QgsVectorLayerProperties::on_pbnApply_clicked()
layer->setLayerName(displayName());


QgsSiSyDialog *sdialog = dynamic_cast < QgsSiSyDialog * >(widgetStackRenderers->visibleWidget());
QgsSingleSymbolDialog *sdialog = dynamic_cast < QgsSingleSymbolDialog * >(widgetStackRenderers->visibleWidget());
QgsGraSyDialog *gdialog = dynamic_cast < QgsGraSyDialog * >(widgetStackRenderers->visibleWidget());
QgsContColDialog *cdialog = dynamic_cast < QgsContColDialog * >(widgetStackRenderers->visibleWidget());
QgsUValDialog* udialog = dynamic_cast< QgsUValDialog * >(widgetStackRenderers->visibleWidget());
Expand Down
4 changes: 2 additions & 2 deletions src/ui/Makefile.am
Expand Up @@ -45,7 +45,7 @@ qgis_ui_UIC = \
qgsprojectpropertiesbase.ui \
qgsrasterlayerpropertiesbase.ui \
qgsserversourceselectbase.ui \
qgssisydialogbase.ui \
qgssinglesymboldialogbase.ui \
qgsuvaldialogbase.ui \
qgslayerprojectionselectorbase.ui \
qgscustomprojectiondialogbase.ui \
Expand Down Expand Up @@ -113,7 +113,7 @@ qgis_ui_UIHEADERS = ui_qgisappbase.h \
ui_qgsprojectpropertiesbase.h \
ui_qgsrasterlayerpropertiesbase.h \
ui_qgsserversourceselectbase.h \
ui_qgssisydialogbase.h \
ui_qgssinglesymboldialogbase.h \
ui_qgsuvaldialogbase.h \
ui_qgslayerprojectionselectorbase.h \
ui_qgscustomprojectiondialogbase.h \
Expand Down
Expand Up @@ -2,7 +2,7 @@
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsSiSyDialogBase</class>
<class>QgsSingleSymbolDialogBase</class>
<widget class="QDialog" name="QgsSiSyDialogBase" >
<property name="geometry" >
<rect>
Expand Down

0 comments on commit 548bdbf

Please sign in to comment.