Skip to content

Commit

Permalink
renamed QgsGraSyDialog to QgsGraduatedSymbolDialog
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4873 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Feb 18, 2006
1 parent ccbcd52 commit 522aeb1
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 36 deletions.
6 changes: 3 additions & 3 deletions src/gui/Makefile.am
View file
Expand Up @@ -87,7 +87,7 @@ libqgis_guiHEADERS = \
qgsfillstylewidget.h \
qgsgeomtypedialog.h \
qgsgraduatedsymbolrenderer.h \
qgsgrasydialog.h \
qgsgraduatedsymboldialog.h \
qgshelpviewer.h \
qgsidentifyresults.h \
qgslabeldialog.h \
Expand Down Expand Up @@ -145,7 +145,7 @@ libqgis_gui_la_MOC = \
qgsencodingfiledialog.moc.cpp \
qgsfillstylewidget.moc.cpp \
qgsgeomtypedialog.moc.cpp \
qgsgrasydialog.moc.cpp \
qgsgraduatedsymboldialog.moc.cpp \
qgshelpviewer.moc.cpp \
qgsidentifyresults.moc.cpp \
qgslabeldialog.moc.cpp \
Expand Down Expand Up @@ -199,7 +199,7 @@ libqgis_gui_la_SOURCES = \
qgsfillstylewidget.cpp \
qgsgeomtypedialog.cpp \
qgsgraduatedsymbolrenderer.cpp \
qgsgrasydialog.cpp \
qgsgraduatedsymboldialog.cpp \
qgshelpviewer.cpp \
qgsidentifyresults.cpp \
qgslabel.cpp \
Expand Down
32 changes: 16 additions & 16 deletions src/gui/qgsgrasydialog.cpp → src/gui/qgsgraduatedsymboldialog.cpp
View file
@@ -1,5 +1,5 @@
/***************************************************************************
qgsgrasydialog.cpp - description
qgsgraduatedsymboldialog.cpp - description
-------------------
begin : Oct 2003
copyright : (C) 2003 by Marco Hugentobler
Expand All @@ -16,19 +16,19 @@
***************************************************************************/
/* $Id$ */

#include "qgsgrasydialog.h"
#include "qgsgraduatedsymboldialog.h"
#include "qgsfield.h"
#include "qgsgraduatedsymbolrenderer.h"
#include "qgsludialog.h"
#include "qgsvectordataprovider.h"
#include "qgsvectorlayer.h"


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

setOrientation(Qt::Vertical);
Expand Down Expand Up @@ -59,7 +59,7 @@ QgsGraSyDialog::QgsGraSyDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(
}
else
{
qWarning("Warning, data provider is null in QgsGraSyDialog::QgsGraSyDialog(...)");
qWarning("Warning, data provider is null in QgsGraduatedSymbolDialog::QgsGraduatedSymbolDialog(...)");
return;
}

Expand Down Expand Up @@ -117,22 +117,22 @@ QgsGraSyDialog::QgsGraSyDialog(QgsVectorLayer * layer): QDialog(), mVectorLayer(
mClassBreakBox->setCurrentItem(0);
}

QgsGraSyDialog::QgsGraSyDialog(): QDialog(), mVectorLayer(0), sydialog(0)
QgsGraduatedSymbolDialog::QgsGraduatedSymbolDialog(): QDialog(), mVectorLayer(0), sydialog(0)
{
setupUi(this);
#ifdef QGISDEBUG
qWarning("constructor QgsGraSyDialog");
qWarning("constructor QgsGraduatedSymbolDialog");
#endif
}

QgsGraSyDialog::~QgsGraSyDialog()
QgsGraduatedSymbolDialog::~QgsGraduatedSymbolDialog()
{
#ifdef QGISDEBUG
qWarning("destructor QgsGraSyDialog");
qWarning("destructor QgsGraduatedSymbolDialog");
#endif
}

void QgsGraSyDialog::adjustNumberOfClasses()
void QgsGraduatedSymbolDialog::adjustNumberOfClasses()
{
//find out the number of the classification field
QString fieldstring = classificationComboBox->currentText();
Expand All @@ -147,7 +147,7 @@ void QgsGraSyDialog::adjustNumberOfClasses()
int field = iter->second;
}

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

void QgsGraSyDialog::adjustClassification()
void QgsGraduatedSymbolDialog::adjustClassification()
{
mClassBreakBox->clear();
QGis::VectorType m_type = mVectorLayer->vectorType();
Expand Down Expand Up @@ -259,7 +259,7 @@ void QgsGraSyDialog::adjustClassification()
minimum = provider->minValue(field).toDouble();
maximum = provider->maxValue(field).toDouble();
}
else //don't waste performance if mMode is QgsGraSyDialog::EMPTY
else //don't waste performance if mMode is QgsGraduatedSymbolDialog::EMPTY
{
minimum = 0;
maximum = 0;
Expand Down Expand Up @@ -334,7 +334,7 @@ void QgsGraSyDialog::adjustClassification()
mClassBreakBox->setCurrentItem(0);
}

void QgsGraSyDialog::changeCurrentValue()
void QgsGraduatedSymbolDialog::changeCurrentValue()
{
sydialog.blockSignals(true);//block signals to prevent sydialog from changing the current QgsRenderItem
Q3ListBoxItem* item=mClassBreakBox->selectedItem();
Expand All @@ -351,7 +351,7 @@ void QgsGraSyDialog::changeCurrentValue()
sydialog.blockSignals(false);
}

void QgsGraSyDialog::applySymbologyChanges()
void QgsGraduatedSymbolDialog::applySymbologyChanges()
{
Q3ListBoxItem* item=mClassBreakBox->selectedItem();
if(item)
Expand All @@ -366,7 +366,7 @@ void QgsGraSyDialog::applySymbologyChanges()
}
}

void QgsGraSyDialog::changeClass(Q3ListBoxItem* item)
void QgsGraduatedSymbolDialog::changeClass(Q3ListBoxItem* item)
{
QString currenttext=item->text();
QgsSymbol* symbol=0;
Expand Down
16 changes: 8 additions & 8 deletions src/gui/qgsgrasydialog.h → src/gui/qgsgraduatedsymboldialog.h
View file
@@ -1,5 +1,5 @@
/***************************************************************************
qgsgrasydialog.h - description
qgsgraduatedsymboldialog.h - description
-------------------
begin : Oct 2003
copyright : (C) 2003 by Marco Hugentobler
Expand All @@ -16,24 +16,24 @@
***************************************************************************/
/* $Id$ */

#ifndef QGSGRASYDIALOG_H
#define QGSGRASYDIALOG_H
#ifndef QGSGRADUATEDSYMBOLDIALOG_H
#define QGSGRADUATEDSYMBOLDIALOG_H

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

class QgsVectorLayer;


class QgsGraSyDialog: public QDialog, private Ui::QgsGraSyDialogBase
class QgsGraduatedSymbolDialog: public QDialog, private Ui::QgsGraduatedSymbolDialogBase
{
Q_OBJECT
public:
/**Enumeration describing the automatic settings of values*/
enum mode{EMPTY, EQUAL_INTERVAL, QUANTILES};
QgsGraSyDialog(QgsVectorLayer* layer);
~QgsGraSyDialog();
QgsGraduatedSymbolDialog(QgsVectorLayer* layer);
~QgsGraduatedSymbolDialog();
public slots:
void apply();
protected slots:
Expand All @@ -59,7 +59,7 @@ class QgsGraSyDialog: public QDialog, private Ui::QgsGraSyDialogBase
int mClassificationField;
private:
/**Default constructor is privat to not use is*/
QgsGraSyDialog();
QgsGraduatedSymbolDialog();
};

#endif
1 change: 0 additions & 1 deletion src/gui/qgsgraduatedsymbolrenderer.cpp
View file
Expand Up @@ -19,7 +19,6 @@
#include "qgis.h"
#include "qgsfeature.h"
#include "qgsgraduatedsymbolrenderer.h"
#include "qgsgrasydialog.h"
#include "qgslegendsymbologyitem.h"
#include "qgssymbologyutils.h"
#include "qgssvgcache.h"
Expand Down
8 changes: 4 additions & 4 deletions src/gui/qgsvectorlayerproperties.cpp
View file
Expand Up @@ -20,7 +20,7 @@
#include "qgsvectorlayerproperties.h"
#include "qgsattributeactiondialog.h"
#include "qgscontcoldialog.h"
#include "qgsgrasydialog.h"
#include "qgsgraduatedsymboldialog.h"
#include "qgslabeldialog.h"
#include "qgslayerprojectionselector.h"
#include "qgssinglesymboldialog.h"
Expand Down Expand Up @@ -97,7 +97,7 @@ void QgsVectorLayerProperties::alterLayerDialog(const QString & dialogString)
}
else if(dialogString == tr("Graduated Symbol"))
{
mRendererDialog = new QgsGraSyDialog(layer);
mRendererDialog = new QgsGraduatedSymbolDialog(layer);
}
else if(dialogString == tr("Continuous Color"))
{
Expand Down Expand Up @@ -190,7 +190,7 @@ void QgsVectorLayerProperties::reset( void )
}
else if(rtype=="Graduated Symbol")
{
mRendererDialog=new QgsGraSyDialog(layer);
mRendererDialog=new QgsGraduatedSymbolDialog(layer);
legendtypecombobox->setCurrentIndex(1);
}
else if(rtype=="Continuous Color")
Expand Down Expand Up @@ -278,7 +278,7 @@ void QgsVectorLayerProperties::on_pbnApply_clicked()


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

Expand Down
6 changes: 3 additions & 3 deletions src/ui/Makefile.am
View file
Expand Up @@ -27,7 +27,7 @@ qgis_ui_UIC = \
qgsdelattrdialogbase.ui \
qgsvectorlayerpropertiesbase.ui \
qgsgeomtypedialogbase.ui \
qgsgrasydialogbase.ui \
qgsgraduatedsymboldialogbase.ui \
qgshelpviewerbase.ui \
qgsidentifyresultsbase.ui \
qgslabeldialogbase.ui \
Expand Down Expand Up @@ -61,7 +61,7 @@ qgis_ui_UIC = \
qgscontcoldialogbase.ui \
qgsattributedialogbase.ui \
qgsfillstylewidgetbase.ui \
qgsgrasydialogbase.ui \
qgsgraduatedsymboldialogbase.ui \
qgslabeldialogbase.ui \
qgslinestylewidgetbase.ui \
qgsmeasurebase.ui \
Expand Down Expand Up @@ -95,7 +95,7 @@ qgis_ui_UIHEADERS = ui_qgisappbase.h \
ui_qgsdelattrdialogbase.h \
ui_qgsvectorlayerpropertiesbase.h \
ui_qgsgeomtypedialogbase.h \
ui_qgsgrasydialogbase.h \
ui_qgsgraduatedsymboldialogbase.h \
ui_qgshelpviewerbase.h \
ui_qgsidentifyresultsbase.h \
ui_qgslabeldialogbase.h \
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsgrasydialogbase.ui → src/ui/qgsgraduatedsymboldialogbase.ui
View file
Expand Up @@ -2,7 +2,7 @@
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsGraSyDialogBase</class>
<class>QgsGraduatedSymbolDialogBase</class>
<widget class="QDialog" name="QgsGraSyDialogBase" >
<property name="geometry" >
<rect>
Expand Down

0 comments on commit 522aeb1

Please sign in to comment.