Fixed: #1301 Fixed "full cycle" flag with empty list and added comments in list_zones_widget.
--HG-- branch : gsoc2011-worldeditorqt
This commit is contained in:
parent
e487fac6c7
commit
bdda6ac1c6
2 changed files with 15 additions and 4 deletions
|
@ -122,10 +122,13 @@ QString ListZonesWidget::currentZoneName()
|
||||||
else if (m_ui.zoneSelectComboBox->currentIndex() == 2)
|
else if (m_ui.zoneSelectComboBox->currentIndex() == 2)
|
||||||
{
|
{
|
||||||
// Full cycle
|
// Full cycle
|
||||||
|
if (m_listSelection.size() > 0)
|
||||||
|
{
|
||||||
zoneName = m_listSelection[m_zoneNameCycle];
|
zoneName = m_listSelection[m_zoneNameCycle];
|
||||||
m_zoneNameCycle++;
|
m_zoneNameCycle++;
|
||||||
m_zoneNameCycle = m_zoneNameCycle % m_listSelection.size();
|
m_zoneNameCycle = m_zoneNameCycle % m_listSelection.size();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return zoneName;
|
return zoneName;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -44,14 +44,22 @@ public:
|
||||||
~ListZonesWidget();
|
~ListZonesWidget();
|
||||||
|
|
||||||
void updateUi();
|
void updateUi();
|
||||||
|
|
||||||
|
// Set zone builder, call this method before using this class
|
||||||
void setZoneBuilder(ZoneBuilder *zoneBuilder);
|
void setZoneBuilder(ZoneBuilder *zoneBuilder);
|
||||||
|
|
||||||
|
// Get current zone name which user selected from list.
|
||||||
QString currentZoneName();
|
QString currentZoneName();
|
||||||
|
|
||||||
|
// Get current rotation value which user selected (Rot 0-0deg, 1-90deg, 2-180deg, 3-270deg).
|
||||||
int currentRot();
|
int currentRot();
|
||||||
|
|
||||||
|
// Get current flip value which user selected (Flip 0-false, 1-true).
|
||||||
int currentFlip();
|
int currentFlip();
|
||||||
|
|
||||||
bool isNotPropogate() const;
|
bool isNotPropogate() const;
|
||||||
bool isForce() const;
|
bool isForce() const;
|
||||||
|
|
||||||
Q_SIGNALS:
|
|
||||||
private Q_SLOTS:
|
private Q_SLOTS:
|
||||||
void updateFilters_1(const QString &value);
|
void updateFilters_1(const QString &value);
|
||||||
void updateFilters_2(const QString &value);
|
void updateFilters_2(const QString &value);
|
||||||
|
|
Loading…
Reference in a new issue