Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
renamed QgsContColDialog to QgsContinuousColorDialog
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4875 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Feb 18, 2006
1 parent da2b438 commit 0330772
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 32 deletions.
6 changes: 3 additions & 3 deletions src/gui/Makefile.am
Expand Up @@ -77,7 +77,7 @@ libqgis_guiHEADERS = \
qgsattributetable.h \
qgsbookmarks.h \
qgsclipboard.h \
qgscontcoldialog.h \
qgscontinuouscolordialog.h \
qgscontinuouscolorrenderer.h \
qgscsexception.h \
qgscoordinatetransform.h \
Expand Down Expand Up @@ -138,7 +138,7 @@ libqgis_gui_la_MOC = \
qgsattributetabledisplay.moc.cpp \
qgsattributetable.moc.cpp \
qgsbookmarks.moc.cpp \
qgscontcoldialog.moc.cpp \
qgscontinuouscolordialog.moc.cpp \
qgscoordinatetransform.moc.cpp \
qgscustomprojectiondialog.moc.cpp \
qgsdelattrdialog.moc.cpp \
Expand Down Expand Up @@ -190,7 +190,7 @@ libqgis_gui_la_SOURCES = \
qgsattributetabledisplay.cpp \
qgsbookmarks.cpp \
qgsclipboard.cpp \
qgscontcoldialog.cpp \
qgscontinuouscolordialog.cpp \
qgscoordinatetransform.cpp \
qgscontinuouscolorrenderer.cpp \
qgscustomprojectiondialog.cpp \
Expand Down
@@ -1,5 +1,5 @@
/***************************************************************************
qgscontcoldialog.cpp
qgscontinuouscolordialog.cpp
Continuous color renderer dialog
-------------------
begin : 2004-02-11
Expand All @@ -17,7 +17,7 @@
***************************************************************************/
/* $Id$ */

#include "qgscontcoldialog.h"
#include "qgscontinuouscolordialog.h"
#include "qgscontinuouscolorrenderer.h"
#include "qgsfield.h"
#include "qgssymbol.h"
Expand All @@ -27,12 +27,12 @@
#include <QColorDialog>


QgsContColDialog::QgsContColDialog(QgsVectorLayer * layer)
QgsContinuousColorDialog::QgsContinuousColorDialog(QgsVectorLayer * layer)
: QDialog(), mVectorLayer(layer)
{
setupUi(this);
#ifdef QGISDEBUG
qWarning("constructor QgsContColDialog");
qWarning("constructor QgsContinuousColorDialog");
#endif

QObject::connect(btnMinValue, SIGNAL(clicked()), this, SLOT(selectMinimumColor()));
Expand Down Expand Up @@ -61,7 +61,7 @@ QgsContColDialog::QgsContColDialog(QgsVectorLayer * layer)
}
else
{
qWarning("Warning, data provider is null in QgsContColDialog::QgsContColDialog(...)");
qWarning("Warning, data provider is null in QgsContinuousColorDialog::QgsContinuousColorDialog(...)");
return;
}

Expand Down Expand Up @@ -89,22 +89,22 @@ QgsContColDialog::QgsContColDialog(QgsVectorLayer * layer)
}
}

QgsContColDialog::QgsContColDialog()
QgsContinuousColorDialog::QgsContinuousColorDialog()
{
setupUi(this);
#ifdef QGISDEBUG
qWarning("constructor QgsContColDialog");
qWarning("constructor QgsContinuousColorDialog");
#endif
}

QgsContColDialog::~QgsContColDialog()
QgsContinuousColorDialog::~QgsContinuousColorDialog()
{
#ifdef QGISDEBUG
qWarning("destructor QgsContColDialog");
qWarning("destructor QgsContinuousColorDialog");
#endif
}

void QgsContColDialog::apply()
void QgsContinuousColorDialog::apply()
{
QString fieldstring = classificationComboBox->currentText();
if (fieldstring.isEmpty()) //don't do anything, it there is no classification field
Expand Down Expand Up @@ -162,7 +162,7 @@ void QgsContColDialog::apply()
mVectorLayer->refreshLegend();
}

void QgsContColDialog::selectMinimumColor()
void QgsContinuousColorDialog::selectMinimumColor()
{
QColor mincolor = QColorDialog::getColor(QColor(Qt::black), this);
if(mincolor.isValid())
Expand All @@ -172,7 +172,7 @@ void QgsContColDialog::selectMinimumColor()
setActiveWindow();
}

void QgsContColDialog::selectMaximumColor()
void QgsContinuousColorDialog::selectMaximumColor()
{
QColor maxcolor = QColorDialog::getColor(QColor(Qt::black), this);
if(maxcolor.isValid())
Expand Down
@@ -1,5 +1,5 @@
/***************************************************************************
qgscontcoldialog.h
qgscontinuouscolordialog.h
Continuous color renderer dialog
-------------------
begin : 2004-02-12
Expand All @@ -17,21 +17,21 @@
***************************************************************************/
/* $Id$ */

#ifndef QGSCONTCOLDIALOG_H
#define QGSCONTCOLDIALOG_H
#ifndef QGSCONTINUOUSCOLORDIALOG_H
#define QGSCONTINUOUSCOLORDIALOG_H

#include "ui_qgscontcoldialogbase.h"
#include "ui_qgscontinuouscolordialogbase.h"
#include <map>

class QgsVectorLayer;


class QgsContColDialog: public QDialog, private Ui::QgsContColDialogBase
class QgsContinuousColorDialog: public QDialog, private Ui::QgsContinuousColorDialogBase
{
Q_OBJECT
public:
QgsContColDialog(QgsVectorLayer* layer);
~QgsContColDialog();
QgsContinuousColorDialog(QgsVectorLayer* layer);
~QgsContinuousColorDialog();
public slots:
void apply();
protected slots:
Expand All @@ -42,7 +42,7 @@ class QgsContColDialog: public QDialog, private Ui::QgsContColDialogBase
/**Stores the names and numbers of the fields with numeric values*/
std::map<QString,int> mFieldMap;
private:
QgsContColDialog();
QgsContinuousColorDialog();
};

#endif
1 change: 0 additions & 1 deletion src/gui/qgscontinuouscolorrenderer.cpp
Expand Up @@ -20,7 +20,6 @@
#include "qgsvectorlayer.h"
#include <cfloat>
#include "qgslegenditem.h"
#include "qgscontcoldialog.h"
#include "qgssymbologyutils.h"
#include "qgsmarkercatalogue.h"
#include "qgssymbol.h"
Expand Down
8 changes: 4 additions & 4 deletions src/gui/qgsvectorlayerproperties.cpp
Expand Up @@ -19,7 +19,7 @@

#include "qgsvectorlayerproperties.h"
#include "qgsattributeactiondialog.h"
#include "qgscontcoldialog.h"
#include "qgscontinuouscolordialog.h"
#include "qgsgraduatedsymboldialog.h"
#include "qgslabeldialog.h"
#include "qgslayerprojectionselector.h"
Expand Down Expand Up @@ -101,7 +101,7 @@ void QgsVectorLayerProperties::alterLayerDialog(const QString & dialogString)
}
else if(dialogString == tr("Continuous Color"))
{
mRendererDialog = new QgsContColDialog(layer);
mRendererDialog = new QgsContinuousColorDialog(layer);
}
else if(dialogString == tr("Unique Value"))
{
Expand Down Expand Up @@ -195,7 +195,7 @@ void QgsVectorLayerProperties::reset( void )
}
else if(rtype=="Continuous Color")
{
mRendererDialog=new QgsContColDialog(layer);
mRendererDialog=new QgsContinuousColorDialog(layer);
legendtypecombobox->setCurrentIndex(2);
}
else if(rtype == "Unique Value")
Expand Down Expand Up @@ -279,7 +279,7 @@ void QgsVectorLayerProperties::on_pbnApply_clicked()

QgsSingleSymbolDialog *sdialog = dynamic_cast < QgsSingleSymbolDialog * >(widgetStackRenderers->visibleWidget());
QgsGraduatedSymbolDialog *gdialog = dynamic_cast < QgsGraduatedSymbolDialog * >(widgetStackRenderers->visibleWidget());
QgsContColDialog *cdialog = dynamic_cast < QgsContColDialog * >(widgetStackRenderers->visibleWidget());
QgsContinuousColorDialog *cdialog = dynamic_cast < QgsContinuousColorDialog * >(widgetStackRenderers->visibleWidget());
QgsUValDialog* udialog = dynamic_cast< QgsUValDialog * >(widgetStackRenderers->visibleWidget());

if (sdialog)
Expand Down
6 changes: 3 additions & 3 deletions src/ui/Makefile.am
Expand Up @@ -23,7 +23,7 @@ qgis_ui_UIC = \
qgsattributeactiondialogbase.ui \
qgsattributetablebase.ui \
qgsbookmarksbase.ui \
qgscontcoldialogbase.ui \
qgscontinuouscolordialogbase.ui \
qgsdelattrdialogbase.ui \
qgsvectorlayerpropertiesbase.ui \
qgsgeomtypedialogbase.ui \
Expand Down Expand Up @@ -58,7 +58,7 @@ qgis_ui_UIC = \
qgscomposerpicturebase.ui \
qgscomposerscalebarbase.ui \
qgscomposervectorlegendbase.ui \
qgscontcoldialogbase.ui \
qgscontinuouscolordialogbase.ui \
qgsattributedialogbase.ui \
qgsfillstylewidgetbase.ui \
qgsgraduatedsymboldialogbase.ui \
Expand Down Expand Up @@ -91,7 +91,7 @@ qgis_ui_UIHEADERS = ui_qgisappbase.h \
ui_qgsattributeactiondialogbase.h \
ui_qgsattributetablebase.h \
ui_qgsbookmarksbase.h \
ui_qgscontcoldialogbase.h \
ui_qgscontinuouscolordialogbase.h \
ui_qgsdelattrdialogbase.h \
ui_qgsvectorlayerpropertiesbase.h \
ui_qgsgeomtypedialogbase.h \
Expand Down
Expand Up @@ -2,7 +2,7 @@
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsContColDialogBase</class>
<class>QgsContinuousColorDialogBase</class>
<widget class="QDialog" name="QgsContColDialogBase" >
<property name="geometry" >
<rect>
Expand Down

0 comments on commit 0330772

Please sign in to comment.