Commit 217a0950 authored by Dieter Devlaminck's avatar Dieter Devlaminck

inverted undo.png colors, added undo picture to 5b10gird-wp-gray_v3 layout and...

inverted undo.png colors, added undo picture to 5b10gird-wp-gray_v3 layout and fixed a bug in the screen layout reader
parent 3889f164
......@@ -316,10 +316,10 @@
</Key>
<Key x="0" y="0" width="0.1" height="0.2">
<Action>undo</Action>
<Event id="noflash"><TextSymbol><Label>UNDO</Label></TextSymbol></Event>
<Event id="target"><TextSymbol><Label>UNDO</Label></TextSymbol></Event>
<Event id="correct_feedback"><TextSymbol><Label>UNDO</Label></TextSymbol></Event>
<Event id="wrong_feedback"><TextSymbol><Label>UNDO</Label></TextSymbol></Event>
<Event id="noflash"><PictureSymbol><Source>openvibe/applications/externalP300Stimulator/undo.png</Source></PictureSymbol></Event>
<Event id="target"><PictureSymbol><Source>openvibe/applications/externalP300Stimulator/undo.png</Source></PictureSymbol></Event>
<Event id="correct_feedback"><PictureSymbol><Source>openvibe/applications/externalP300Stimulator/undo.png</Source></PictureSymbol></Event>
<Event id="wrong_feedback"><PictureSymbol><Source>openvibe/applications/externalP300Stimulator/undo.png</Source></PictureSymbol></Event>
</Key>
<Key x="0.2" y="0.2" width="0.1" height="0.2">
<Action>write</Action>
......
......@@ -73,17 +73,7 @@ void P300ScreenLayoutReader::openChild(const char* sName, const char** sAttribut
m_bKeyboardIsGrid = true;
m_pKey->setDimensions(dim);
}
}
void P300ScreenLayoutReader::processChildData(const char* sData)
{
writeElement(m_vNode.top().toASCIIString(), sData);
if (m_vNode.top()==CString("Action"))
{
CString l_sAction = CString(sData);
m_pKey->addAction(l_sAction);
}
if (m_bDefaultKeyProperties && m_vNode.top()==CString("TextSymbol"))
{
m_mDefaultIsTextSymbol->insert(std::pair<VisualState,boolean>(m_iState,true));
......@@ -99,7 +89,18 @@ void P300ScreenLayoutReader::processChildData(const char* sData)
if (!m_bDefaultKeyProperties && m_vNode.top()==CString("PictureSymbol"))
{
m_pKey->setIfTextSymbol(m_iState, false);
}
}
}
void P300ScreenLayoutReader::processChildData(const char* sData)
{
writeElement(m_vNode.top().toASCIIString(), sData);
if (m_vNode.top()==CString("Action"))
{
CString l_sAction = CString(sData);
m_pKey->addAction(l_sAction);
}
if (m_bDefaultKeyProperties && m_bEventElement)
{
if (m_vNode.top()==CString("ScaleSize"))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment