Commit 430c8802 authored by Pierre Kraemer's avatar Pierre Kraemer

Merge branch 'master' of cgogn.u-strasbg.fr:CGoGN

parents 2dd3f2a4 895926cd
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>180</width> <width>207</width>
<height>545</height> <height>545</height>
</rect> </rect>
</property> </property>
...@@ -14,35 +14,8 @@ ...@@ -14,35 +14,8 @@
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="6" column="0" colspan="2">
<widget class="QLabel" name="label_2"> <widget class="QComboBox" name="combo_freeSelector">
<property name="text">
<string>Position :</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>156</width>
<height>161</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Locked selector :</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="2">
<widget class="QComboBox" name="combo_lockedSelector">
<item> <item>
<property name="text"> <property name="text">
<string>- select selector -</string> <string>- select selector -</string>
...@@ -50,20 +23,18 @@ ...@@ -50,20 +23,18 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="5" column="0" colspan="2"> <item row="0" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Handle selector :</string> <string>Position :</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" colspan="2"> <item row="5" column="0" colspan="2">
<widget class="QComboBox" name="combo_handleSelector"> <widget class="QLabel" name="label_3">
<item> <property name="text">
<property name="text"> <string>Free vertices selector :</string>
<string>- select selector -</string> </property>
</property>
</item>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
...@@ -81,20 +52,49 @@ ...@@ -81,20 +52,49 @@
</item> </item>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2"> <item row="9" column="0" colspan="2">
<widget class="Line" name="line"> <widget class="Line" name="line">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0" colspan="2"> <item row="10" column="0" colspan="2">
<widget class="QPushButton" name="button_start_stop"> <widget class="QPushButton" name="button_start_stop">
<property name="text"> <property name="text">
<string>Start</string> <string>Start</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="2">
<widget class="QComboBox" name="combo_handleSelector">
<item>
<property name="text">
<string>- select selector -</string>
</property>
</item>
</widget>
</item>
<item row="11" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>156</width>
<height>161</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Handle vertices selector :</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<tabstops> <tabstops>
......
...@@ -30,8 +30,8 @@ struct MapParameters ...@@ -30,8 +30,8 @@ struct MapParameters
VertexAttribute<PFP2::VEC3> positionAttribute; VertexAttribute<PFP2::VEC3> positionAttribute;
CellSelector<VERTEX>* lockedSelector;
CellSelector<VERTEX>* handleSelector; CellSelector<VERTEX>* handleSelector;
CellSelector<VERTEX>* freeSelector;
bool initialized; bool initialized;
...@@ -88,13 +88,13 @@ private slots: ...@@ -88,13 +88,13 @@ private slots:
void attributeAdded(unsigned int orbit, const QString& name); void attributeAdded(unsigned int orbit, const QString& name);
void cellSelectorAdded(unsigned int orbit, const QString& name); void cellSelectorAdded(unsigned int orbit, const QString& name);
void cellSelectorRemoved(unsigned int orbit, const QString& name); void cellSelectorRemoved(unsigned int orbit, const QString& name);
void selectedCellsChanged(); void selectedCellsChanged(CellSelectorGen *cs);
public slots: public slots:
// slots for Python calls // slots for Python calls
void changePositionAttribute(const QString& map, const QString& name); void changePositionAttribute(const QString& map, const QString& name);
void changeLockedSelector(const QString& map, const QString& name);
void changeHandleSelector(const QString& map, const QString& name); void changeHandleSelector(const QString& map, const QString& name);
void changeFreeSelector(const QString& map, const QString& name);
protected: protected:
void toggleMapDeformation(MapHandlerGen* map); void toggleMapDeformation(MapHandlerGen* map);
......
...@@ -29,8 +29,8 @@ private: ...@@ -29,8 +29,8 @@ private:
private slots: private slots:
void positionAttributeChanged(int index); void positionAttributeChanged(int index);
void lockedSelectorChanged(int index);
void handleSelectorChanged(int index); void handleSelectorChanged(int index);
void freeSelectorChanged(int index);
void startStopButtonClicked(); void startStopButtonClicked();
private: private:
......
...@@ -13,8 +13,8 @@ namespace SCHNApps ...@@ -13,8 +13,8 @@ namespace SCHNApps
{ {
MapParameters::MapParameters() : MapParameters::MapParameters() :
lockedSelector(NULL),
handleSelector(NULL), handleSelector(NULL),
freeSelector(NULL),
initialized(false), initialized(false),
nlContext(NULL) nlContext(NULL)
{} {}
...@@ -29,7 +29,7 @@ void MapParameters::start(MapHandlerGen* mh) ...@@ -29,7 +29,7 @@ void MapParameters::start(MapHandlerGen* mh)
{ {
if(!initialized) if(!initialized)
{ {
if(positionAttribute.isValid() && lockedSelector && handleSelector) if(positionAttribute.isValid() && handleSelector && freeSelector)
{ {
positionInit = mh->getAttribute<PFP2::VEC3, VERTEX>("positionInit", false); positionInit = mh->getAttribute<PFP2::VEC3, VERTEX>("positionInit", false);
if(!positionInit.isValid()) if(!positionInit.isValid())
...@@ -232,6 +232,7 @@ void Surface_Deformation_Plugin::mapAdded(MapHandlerGen* map) ...@@ -232,6 +232,7 @@ void Surface_Deformation_Plugin::mapAdded(MapHandlerGen* map)
connect(map, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(attributeAdded(unsigned int, const QString&))); connect(map, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(attributeAdded(unsigned int, const QString&)));
connect(map, SIGNAL(cellSelectorAdded(unsigned int, const QString&)), this, SLOT(cellSelectorAdded(unsigned int, const QString&))); connect(map, SIGNAL(cellSelectorAdded(unsigned int, const QString&)), this, SLOT(cellSelectorAdded(unsigned int, const QString&)));
connect(map, SIGNAL(cellSelectorRemoved(unsigned int, const QString&)), this, SLOT(cellSelectorRemoved(unsigned int, const QString&))); connect(map, SIGNAL(cellSelectorRemoved(unsigned int, const QString&)), this, SLOT(cellSelectorRemoved(unsigned int, const QString&)));
connect(map, SIGNAL(selectedCellsChanged(CellSelectorGen*)), this, SLOT(selectedCellsChanged(CellSelectorGen*)));
} }
void Surface_Deformation_Plugin::mapRemoved(MapHandlerGen* map) void Surface_Deformation_Plugin::mapRemoved(MapHandlerGen* map)
...@@ -239,6 +240,7 @@ void Surface_Deformation_Plugin::mapRemoved(MapHandlerGen* map) ...@@ -239,6 +240,7 @@ void Surface_Deformation_Plugin::mapRemoved(MapHandlerGen* map)
disconnect(map, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(attributeAdded(unsigned int, const QString&))); disconnect(map, SIGNAL(attributeAdded(unsigned int, const QString&)), this, SLOT(attributeAdded(unsigned int, const QString&)));
disconnect(map, SIGNAL(cellSelectorAdded(unsigned int, const QString&)), this, SLOT(cellSelectorAdded(unsigned int, const QString&))); disconnect(map, SIGNAL(cellSelectorAdded(unsigned int, const QString&)), this, SLOT(cellSelectorAdded(unsigned int, const QString&)));
disconnect(map, SIGNAL(cellSelectorRemoved(unsigned int, const QString&)), this, SLOT(cellSelectorRemoved(unsigned int, const QString&))); disconnect(map, SIGNAL(cellSelectorRemoved(unsigned int, const QString&)), this, SLOT(cellSelectorRemoved(unsigned int, const QString&)));
disconnect(map, SIGNAL(selectedCellsChanged(CellSelectorGen*)), this, SLOT(selectedCellsChanged(CellSelectorGen*)));
} }
...@@ -268,26 +270,31 @@ void Surface_Deformation_Plugin::cellSelectorRemoved(unsigned int orbit, const Q ...@@ -268,26 +270,31 @@ void Surface_Deformation_Plugin::cellSelectorRemoved(unsigned int orbit, const Q
m_dockTab->removeVertexSelector(name); m_dockTab->removeVertexSelector(name);
MapParameters& p = h_parameterSet[map]; MapParameters& p = h_parameterSet[map];
if(p.lockedSelector->getName() == name) if(p.handleSelector->getName() == name)
{ {
p.stop(map); p.stop(map);
if(!p.initialized && map->isSelectedMap()) if(!p.initialized && map->isSelectedMap())
m_dockTab->mapParametersInitialized(false); m_dockTab->mapParametersInitialized(false);
p.lockedSelector = NULL; p.handleSelector = NULL;
} }
if(p.handleSelector->getName() == name) if(p.freeSelector->getName() == name)
{ {
p.stop(map); p.stop(map);
if(!p.initialized && map->isSelectedMap()) if(!p.initialized && map->isSelectedMap())
m_dockTab->mapParametersInitialized(false); m_dockTab->mapParametersInitialized(false);
p.handleSelector = NULL; p.freeSelector = NULL;
} }
} }
void Surface_Deformation_Plugin::selectedCellsChanged() void Surface_Deformation_Plugin::selectedCellsChanged(CellSelectorGen* cs)
{ {
// nlMakeCurrent(perMap->nlContext) ; MapHandlerGen* map = static_cast<MapHandlerGen*>(QObject::sender());
// nlReset(NL_FALSE) ; MapParameters& p = h_parameterSet[map];
if(p.initialized && (p.handleSelector == cs || p.freeSelector == cs))
{
nlMakeCurrent(p.nlContext) ;
nlReset(NL_FALSE) ;
}
} }
...@@ -309,7 +316,7 @@ void Surface_Deformation_Plugin::changePositionAttribute(const QString& map, con ...@@ -309,7 +316,7 @@ void Surface_Deformation_Plugin::changePositionAttribute(const QString& map, con
} }
} }
void Surface_Deformation_Plugin::changeLockedSelector(const QString& map, const QString& name) void Surface_Deformation_Plugin::changeHandleSelector(const QString& map, const QString& name)
{ {
MapHandlerGen* m = m_schnapps->getMap(map); MapHandlerGen* m = m_schnapps->getMap(map);
if(m) if(m)
...@@ -317,14 +324,14 @@ void Surface_Deformation_Plugin::changeLockedSelector(const QString& map, const ...@@ -317,14 +324,14 @@ void Surface_Deformation_Plugin::changeLockedSelector(const QString& map, const
MapParameters& p = h_parameterSet[m]; MapParameters& p = h_parameterSet[m];
if(!p.initialized) if(!p.initialized)
{ {
p.lockedSelector = m->getCellSelector<VERTEX>(name); p.handleSelector = m->getCellSelector<VERTEX>(name);
if(m->isSelectedMap()) if(m->isSelectedMap())
m_dockTab->updateMapParameters(); m_dockTab->updateMapParameters();
} }
} }
} }
void Surface_Deformation_Plugin::changeHandleSelector(const QString& map, const QString& name) void Surface_Deformation_Plugin::changeFreeSelector(const QString& map, const QString& name)
{ {
MapHandlerGen* m = m_schnapps->getMap(map); MapHandlerGen* m = m_schnapps->getMap(map);
if(m) if(m)
...@@ -332,7 +339,7 @@ void Surface_Deformation_Plugin::changeHandleSelector(const QString& map, const ...@@ -332,7 +339,7 @@ void Surface_Deformation_Plugin::changeHandleSelector(const QString& map, const
MapParameters& p = h_parameterSet[m]; MapParameters& p = h_parameterSet[m];
if(!p.initialized) if(!p.initialized)
{ {
p.handleSelector = m->getCellSelector<VERTEX>(name); p.freeSelector = m->getCellSelector<VERTEX>(name);
if(m->isSelectedMap()) if(m->isSelectedMap())
m_dockTab->updateMapParameters(); m_dockTab->updateMapParameters();
} }
...@@ -373,7 +380,7 @@ void Surface_Deformation_Plugin::matchDiffCoord(MapHandlerGen* mh) ...@@ -373,7 +380,7 @@ void Surface_Deformation_Plugin::matchDiffCoord(MapHandlerGen* mh)
nlBegin(NL_SYSTEM) ; nlBegin(NL_SYSTEM) ;
for(int coord = 0; coord < 3; ++coord) for(int coord = 0; coord < 3; ++coord)
{ {
LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.lockedSelector->getMarker(), p.positionAttribute, coord); LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord);
nlBegin(NL_MATRIX); nlBegin(NL_MATRIX);
LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.diffCoord, coord); LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.diffCoord, coord);
nlEnd(NL_MATRIX); nlEnd(NL_MATRIX);
...@@ -503,7 +510,7 @@ void Surface_Deformation_Plugin::asRigidAsPossible(MapHandlerGen* mh) ...@@ -503,7 +510,7 @@ void Surface_Deformation_Plugin::asRigidAsPossible(MapHandlerGen* mh)
nlBegin(NL_SYSTEM); nlBegin(NL_SYSTEM);
for(int coord = 0; coord < 3; ++coord) for(int coord = 0; coord < 3; ++coord)
{ {
LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.lockedSelector->getMarker(), p.positionAttribute, coord); LinearSolving::setupVariables<PFP2>(*map, p.vIndex, p.freeSelector->getMarker(), p.positionAttribute, coord);
nlBegin(NL_MATRIX); nlBegin(NL_MATRIX);
// LinearSolving::addRowsRHS_Laplacian_Cotan<PFP2>(*map, p.vIndex, p.edgeWeight, p.vertexArea, p.rotatedDiffCoord, coord); // LinearSolving::addRowsRHS_Laplacian_Cotan<PFP2>(*map, p.vIndex, p.edgeWeight, p.vertexArea, p.rotatedDiffCoord, coord);
LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.rotatedDiffCoord, coord); LinearSolving::addRowsRHS_Laplacian_Topo<PFP2>(*map, p.vIndex, p.rotatedDiffCoord, coord);
......
...@@ -18,8 +18,8 @@ Surface_Deformation_DockTab::Surface_Deformation_DockTab(SCHNApps* s, Surface_De ...@@ -18,8 +18,8 @@ Surface_Deformation_DockTab::Surface_Deformation_DockTab(SCHNApps* s, Surface_De
setupUi(this); setupUi(this);
connect(combo_positionAttribute, SIGNAL(currentIndexChanged(int)), this, SLOT(positionAttributeChanged(int))); connect(combo_positionAttribute, SIGNAL(currentIndexChanged(int)), this, SLOT(positionAttributeChanged(int)));
connect(combo_lockedSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(lockedSelectorChanged(int)));
connect(combo_handleSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(handleSelectorChanged(int))); connect(combo_handleSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(handleSelectorChanged(int)));
connect(combo_freeSelector, SIGNAL(currentIndexChanged(int)), this, SLOT(freeSelectorChanged(int)));
connect(button_start_stop, SIGNAL(clicked()), this, SLOT(startStopButtonClicked())); connect(button_start_stop, SIGNAL(clicked()), this, SLOT(startStopButtonClicked()));
} }
...@@ -42,23 +42,23 @@ void Surface_Deformation_DockTab::positionAttributeChanged(int index) ...@@ -42,23 +42,23 @@ void Surface_Deformation_DockTab::positionAttributeChanged(int index)
} }
} }
void Surface_Deformation_DockTab::lockedSelectorChanged(int index) void Surface_Deformation_DockTab::handleSelectorChanged(int index)
{ {
if(!b_updatingUI) if(!b_updatingUI)
{ {
MapHandlerGen* map = m_schnapps->getSelectedMap(); MapHandlerGen* map = m_schnapps->getSelectedMap();
if(map) if(map)
m_plugin->h_parameterSet[map].lockedSelector = map->getCellSelector<VERTEX>(combo_lockedSelector->currentText()); m_plugin->h_parameterSet[map].handleSelector = map->getCellSelector<VERTEX>(combo_handleSelector->currentText());
} }
} }
void Surface_Deformation_DockTab::handleSelectorChanged(int index) void Surface_Deformation_DockTab::freeSelectorChanged(int index)
{ {
if(!b_updatingUI) if(!b_updatingUI)
{ {
MapHandlerGen* map = m_schnapps->getSelectedMap(); MapHandlerGen* map = m_schnapps->getSelectedMap();
if(map) if(map)
m_plugin->h_parameterSet[map].handleSelector = map->getCellSelector<VERTEX>(combo_handleSelector->currentText()); m_plugin->h_parameterSet[map].freeSelector = map->getCellSelector<VERTEX>(combo_freeSelector->currentText());
} }
} }
...@@ -89,25 +89,25 @@ void Surface_Deformation_DockTab::addVertexAttribute(const QString& name) ...@@ -89,25 +89,25 @@ void Surface_Deformation_DockTab::addVertexAttribute(const QString& name)
void Surface_Deformation_DockTab::addVertexSelector(const QString& name) void Surface_Deformation_DockTab::addVertexSelector(const QString& name)
{ {
b_updatingUI = true; b_updatingUI = true;
combo_lockedSelector->addItem(name);
combo_handleSelector->addItem(name); combo_handleSelector->addItem(name);
combo_freeSelector->addItem(name);
b_updatingUI = false; b_updatingUI = false;
} }
void Surface_Deformation_DockTab::removeVertexSelector(const QString& name) void Surface_Deformation_DockTab::removeVertexSelector(const QString& name)
{ {
b_updatingUI = true; b_updatingUI = true;
int curIndex = combo_lockedSelector->currentIndex(); int curIndex = combo_handleSelector->currentIndex();
int index = combo_lockedSelector->findText(name, Qt::MatchExactly); int index = combo_handleSelector->findText(name, Qt::MatchExactly);
if(curIndex == index)
combo_lockedSelector->setCurrentIndex(0);
combo_lockedSelector->removeItem(index);
curIndex = combo_handleSelector->currentIndex();
index = combo_handleSelector->findText(name, Qt::MatchExactly);
if(curIndex == index) if(curIndex == index)
combo_handleSelector->setCurrentIndex(0); combo_handleSelector->setCurrentIndex(0);
combo_handleSelector->removeItem(index); combo_handleSelector->removeItem(index);
curIndex = combo_freeSelector->currentIndex();
index = combo_freeSelector->findText(name, Qt::MatchExactly);
if(curIndex == index)
combo_freeSelector->setCurrentIndex(0);
combo_freeSelector->removeItem(index);
b_updatingUI = false; b_updatingUI = false;
} }
...@@ -115,8 +115,8 @@ void Surface_Deformation_DockTab::mapParametersInitialized(bool b) ...@@ -115,8 +115,8 @@ void Surface_Deformation_DockTab::mapParametersInitialized(bool b)
{ {
b_updatingUI = true; b_updatingUI = true;
combo_positionAttribute->setEnabled(!b); combo_positionAttribute->setEnabled(!b);
combo_lockedSelector->setEnabled(!b);
combo_handleSelector->setEnabled(!b); combo_handleSelector->setEnabled(!b);
combo_freeSelector->setEnabled(!b);
if(b) button_start_stop->setText("Stop"); if(b) button_start_stop->setText("Stop");
else button_start_stop->setText("Start"); else button_start_stop->setText("Start");
b_updatingUI = false; b_updatingUI = false;
...@@ -128,10 +128,10 @@ void Surface_Deformation_DockTab::updateMapParameters() ...@@ -128,10 +128,10 @@ void Surface_Deformation_DockTab::updateMapParameters()
combo_positionAttribute->clear(); combo_positionAttribute->clear();
combo_positionAttribute->addItem("- select attribute -"); combo_positionAttribute->addItem("- select attribute -");
combo_lockedSelector->clear();
combo_lockedSelector->addItem("- select selector -");
combo_handleSelector->clear(); combo_handleSelector->clear();
combo_handleSelector->addItem("- select selector -"); combo_handleSelector->addItem("- select selector -");
combo_freeSelector->clear();
combo_freeSelector->addItem("- select selector -");
MapHandlerGen* map = m_schnapps->getSelectedMap(); MapHandlerGen* map = m_schnapps->getSelectedMap();
...@@ -159,14 +159,14 @@ void Surface_Deformation_DockTab::updateMapParameters() ...@@ -159,14 +159,14 @@ void Surface_Deformation_DockTab::updateMapParameters()
const CellSelectorSet& selectors = map->getCellSelectorSet(VERTEX); const CellSelectorSet& selectors = map->getCellSelectorSet(VERTEX);
for(CellSelectorSet::const_iterator it = selectors.constBegin(); it != selectors.constEnd(); ++it) for(CellSelectorSet::const_iterator it = selectors.constBegin(); it != selectors.constEnd(); ++it)
{ {
combo_lockedSelector->addItem(it.key());
if(p.lockedSelector && it.key() == p.lockedSelector->getName())
combo_lockedSelector->setCurrentIndex(i);
combo_handleSelector->addItem(it.key()); combo_handleSelector->addItem(it.key());
if(p.handleSelector && it.key() == p.handleSelector->getName()) if(p.handleSelector && it.key() == p.handleSelector->getName())
combo_handleSelector->setCurrentIndex(i); combo_handleSelector->setCurrentIndex(i);
combo_freeSelector->addItem(it.key());
if(p.freeSelector && it.key() == p.freeSelector->getName())
combo_freeSelector->setCurrentIndex(i);
++i; ++i;
} }
......
...@@ -34,6 +34,9 @@ bool Surface_DifferentialProperties_Plugin::enable() ...@@ -34,6 +34,9 @@ bool Surface_DifferentialProperties_Plugin::enable()
connect(m_schnapps, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(mapAdded(MapHandlerGen*))); connect(m_schnapps, SIGNAL(mapAdded(MapHandlerGen*)), this, SLOT(mapAdded(MapHandlerGen*)));
connect(m_schnapps, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(mapRemoved(MapHandlerGen*))); connect(m_schnapps, SIGNAL(mapRemoved(MapHandlerGen*)), this, SLOT(mapRemoved(MapHandlerGen*)));
foreach(MapHandlerGen* map, m_schnapps->getMapSet().values())
mapAdded(map);
return true; return true;
} }
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>200</width> <width>207</width>
<height>600</height> <height>600</height>