[Amis-vcs] SF.net SVN: amis: [2366] branches/amis3
Brought to you by:
julienq,
marisademeglio
From: <dan...@us...> - 2008-03-02 15:39:13
|
Revision: 2366 http://amis.svn.sourceforge.net/amis/?rev=2366&view=rev Author: daniel_weck Date: 2008-03-02 07:39:17 -0800 (Sun, 02 Mar 2008) Log Message: ----------- changed 2 class names to avoid confusion or compiler collision. Modified Paths: -------------- branches/amis3/AmisCore/include/Media.h branches/amis3/AmisCore/src/Media.cpp branches/amis3/AmisGuiMFC2/include/gui/self-voicing/UiMediaTypes.h branches/amis3/AmisGuiMFC2/include/gui/self-voicing/datamodel/AccessibleUiDataReader.h branches/amis3/AmisGuiMFC2/include/gui/self-voicing/datamodel/Action.h branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp branches/amis3/AmisGuiMFC2/src/gui/self-voicing/UiMediaTypes.cpp branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/Action.cpp branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/Container.cpp branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/DataTree.cpp Modified: branches/amis3/AmisCore/include/Media.h =================================================================== --- branches/amis3/AmisCore/include/Media.h 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisCore/include/Media.h 2008-03-02 15:39:17 UTC (rev 2366) @@ -54,7 +54,8 @@ MediaNode(); ~MediaNode(); - virtual MediaNode* clone() = 0; + void cloneContents(MediaNode* p_new); + //virtual MediaNode* clone() = 0; string getId(); void setId(string); @@ -91,13 +92,15 @@ TextNode(); ~TextNode(); + void cloneContents(TextNode* p_new); + wstring getTextString(); void setTextString(wstring); TextDirection getLangDir(); void setLangDir(TextDirection); - MediaNode* clone(); + TextNode* clone(); private: wstring mText; @@ -110,7 +113,7 @@ public: AudioNode(); ~AudioNode(); - MediaNode* clone(); + AudioNode* clone(); string getClipBegin(); void setClipBegin(string); @@ -132,7 +135,9 @@ ImageNode(); ~ImageNode(); - MediaNode* clone(); + void cloneContents(ImageNode* p_new); + + ImageNode* clone(); }; //!Media group represents a group of media nodes to be rendered in parallel Modified: branches/amis3/AmisCore/src/Media.cpp =================================================================== --- branches/amis3/AmisCore/src/Media.cpp 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisCore/src/Media.cpp 2008-03-02 15:39:17 UTC (rev 2366) @@ -48,6 +48,14 @@ mLangCode.erase(); } +void amis::MediaNode::cloneContents(MediaNode* p_new) +{ + p_new->setHref(this->getHref()); + p_new->setId(this->getId()); + p_new->setLangCode(this->getLangCode()); + p_new->setMediaNodeType(this->getMediaNodeType()); + p_new->setSrc(this->getSrc()); +} void amis::MediaNode::setId(string id) { mId.assign(id); @@ -131,6 +139,12 @@ mText.erase(); } +void amis::TextNode::cloneContents(TextNode* p_new) +{ + MediaNode::cloneContents(p_new); + p_new->setTextString(this->getTextString()); + p_new->setLangDir(this->getLangDir()); +} void amis::TextNode::setTextString(wstring text) { mText.assign(text); @@ -150,15 +164,12 @@ { return mLangDir; } -amis::MediaNode* amis::TextNode::clone() +amis::TextNode* amis::TextNode::clone() { amis::TextNode* p_new = new amis::TextNode(); - p_new->setHref(this->getHref()); - p_new->setId(this->getId()); - p_new->setLangCode(this->getLangCode()); - p_new->setSrc(this->getSrc()); - p_new->setLangDir(this->getLangDir()); - p_new->setTextString(this->getTextString()); + + this->cloneContents(p_new); + return p_new; } @@ -202,18 +213,15 @@ { return mClipEnd; } -amis::MediaNode* amis::AudioNode::clone() +amis::AudioNode* amis::AudioNode::clone() { amis::AudioNode* p_new = new amis::AudioNode(); p_new->setClipBegin(this->getClipBegin()); p_new->setClipEnd(this->getClipEnd()); - p_new->setHref(this->getHref()); - p_new->setId(this->getId()); - p_new->setLangCode(this->getLangCode()); - p_new->setMediaNodeType(this->getMediaNodeType()); - p_new->setSrc(this->getSrc()); - + + MediaNode::cloneContents(p_new); + return p_new; } void amis::AudioNode::print() @@ -239,13 +247,15 @@ amis::ImageNode::~ImageNode() { } -amis::MediaNode* amis::ImageNode::clone() + +void amis::ImageNode::cloneContents(ImageNode* p_new) { + MediaNode::cloneContents(p_new); +} +amis::ImageNode* amis::ImageNode::clone() +{ amis::ImageNode* p_new = new amis::ImageNode(); - p_new->setHref(this->getHref()); - p_new->setId(this->getId()); - p_new->setLangCode(this->getLangCode()); - p_new->setSrc(this->getSrc()); + MediaNode::cloneContents(p_new); return p_new; } Modified: branches/amis3/AmisGuiMFC2/include/gui/self-voicing/UiMediaTypes.h =================================================================== --- branches/amis3/AmisGuiMFC2/include/gui/self-voicing/UiMediaTypes.h 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/include/gui/self-voicing/UiMediaTypes.h 2008-03-02 15:39:17 UTC (rev 2366) @@ -13,16 +13,16 @@ { namespace spoken { -class TextNode : public amis::TextNode +class TextNodeSV : public amis::TextNode { public: - TextNode(); - ~TextNode(); + TextNodeSV(); + ~TextNodeSV(); std::string getMnemonic(); void setMnemonic(std::string); - TextNode* clone(); + TextNodeSV* clone(); private: std::string mMnemonic; @@ -31,16 +31,18 @@ enum ImageType {SMALL_ICON, LARGE_ICON}; -class ImageNode : public amis::ImageNode +class ImageNodeSV : public amis::ImageNode { public: - ImageNode(); - ~ImageNode(); + ImageNodeSV(); + ~ImageNodeSV(); ImageType getImageType(); void setImageType(ImageType); + ImageNodeSV* clone(); + private: ImageType mImageType; @@ -52,19 +54,19 @@ TextAudioPair(); ~TextAudioPair(); - TextNode* getText(); + TextNodeSV* getText(); amis::AudioNode* getAudio(); void testPrint(std::string, int); - void setText(TextNode*); + void setText(TextNodeSV*); void setAudio(amis::AudioNode*); TextAudioPair* clone(); amis::MediaGroup* getAsAmisMediaGroup(); private: - TextNode* mpText; + TextNodeSV* mpText; amis::AudioNode* mpAudio; amis::MediaGroup* mpMediaGroupVersion; Modified: branches/amis3/AmisGuiMFC2/include/gui/self-voicing/datamodel/AccessibleUiDataReader.h =================================================================== --- branches/amis3/AmisGuiMFC2/include/gui/self-voicing/datamodel/AccessibleUiDataReader.h 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/include/gui/self-voicing/datamodel/AccessibleUiDataReader.h 2008-03-02 15:39:17 UTC (rev 2366) @@ -93,7 +93,7 @@ Label* mpRecentLabel; Switch* mpRecentSwitch; - amis::TextNode* mpRecentTextNode; + TextNodeSV* mpRecentTextNode; Prompt* mpRecentPrompt; bool mbFlag_GetChars; Modified: branches/amis3/AmisGuiMFC2/include/gui/self-voicing/datamodel/Action.h =================================================================== --- branches/amis3/AmisGuiMFC2/include/gui/self-voicing/datamodel/Action.h 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/include/gui/self-voicing/datamodel/Action.h 2008-03-02 15:39:17 UTC (rev 2366) @@ -16,7 +16,7 @@ public: Action(); ~Action(); - ImageNode* getImage(ImageType); + ImageNodeSV* getImage(ImageType); std::string getWidgetCategories(); @@ -29,7 +29,7 @@ void testPrint(std::string, int); protected: - void addImage(ImageNode*); + void addImage(ImageNodeSV*); void setWidgetCategories(std::string); void setKeyboardAccelerator(Label*); @@ -38,7 +38,7 @@ void setCondition(std::string); private: - std::vector<ImageNode*> mImages; + std::vector<ImageNodeSV*> mImages; std::string mWidgetCategories; Label* mAccelerator; Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-02 15:39:17 UTC (rev 2366) @@ -68,7 +68,7 @@ #endif #if _DEBUG -#include <vld.h> +//#include <vld.h> #endif using namespace amis::gui; Modified: branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp 2008-03-02 15:39:17 UTC (rev 2366) @@ -248,14 +248,14 @@ if (p_caption != NULL) { TextAudioPair* pair = p_caption->getContents(); if (pair != NULL) { - amis::TextNode* textNode = pair->getText(); + TextNodeSV* textNode = pair->getText(); if (textNode != NULL) { wstring str = textNode->getTextString(); if (mnemonic != NULL) { TextAudioPair* pair = mnemonic->getContents(); if (pair != NULL) { - TextNode* node = pair->getText(); + TextNodeSV* node = pair->getText(); if (node != NULL) { wstring strMnemonic = node->getTextString(); int index = str.find_first_of(strMnemonic, 0); @@ -272,7 +272,7 @@ //str.append(accelerator.c_str()); TextAudioPair* pair = accelerator->getContents(); if (pair != NULL) { - TextNode* node = pair->getText(); + TextNodeSV* node = pair->getText(); if (node != NULL) { str.append(node->getTextString()); } Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp 2008-03-02 15:39:17 UTC (rev 2366) @@ -985,7 +985,7 @@ } else { - TextNode* textN = pair->getText(); + TextNodeSV* textN = pair->getText(); if (textN != NULL) { seq->append(textN->getTextString().c_str()); @@ -1016,7 +1016,7 @@ } else { - TextNode * textN = pair->getText(); + TextNodeSV * textN = pair->getText(); if (textN != NULL) { seq->append(textN->getTextString().c_str()); @@ -1040,7 +1040,7 @@ } else { - TextNode * textN = pair->getText(); + TextNodeSV * textN = pair->getText(); if (textN != NULL) { seq->append(textN->getTextString().c_str()); @@ -1067,7 +1067,7 @@ } else { - TextNode * textN = pair->getText(); + TextNodeSV * textN = pair->getText(); if (textN != NULL) { seq->append(textN->getTextString().c_str()); Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp 2008-03-02 15:39:17 UTC (rev 2366) @@ -42,9 +42,9 @@ TextAudioPair* p_pair = new TextAudioPair(); - TextNode* p_text = NULL; + TextNodeSV* p_text = NULL; if (!textString.empty()) { - p_text = new TextNode(); + p_text = new TextNodeSV(); p_text->setTextString(textString); p_pair->setText(p_text); } @@ -61,9 +61,9 @@ TextAudioPair* p_pair = new TextAudioPair(); - TextNode* p_text = NULL; + TextNodeSV* p_text = NULL; if (!textString.empty()) { - p_text = new TextNode(); + p_text = new TextNodeSV(); p_text->setTextString(textString); p_pair->setText(p_text); } @@ -88,7 +88,7 @@ if (pMediaGroup->hasText() == true) { - TextNode* p_text = new TextNode(); + TextNodeSV* p_text = new TextNodeSV(); p_text->setTextString(pMediaGroup->getText()->getTextString()); mpContents->setText(p_text); } Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/UiMediaTypes.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/UiMediaTypes.cpp 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/UiMediaTypes.cpp 2008-03-02 15:39:17 UTC (rev 2366) @@ -6,56 +6,68 @@ //*********** //TextNode -TextNode::TextNode() +TextNodeSV::TextNodeSV() { mMnemonic = ""; } -TextNode::~TextNode() +TextNodeSV::~TextNodeSV() { mMnemonic.clear(); mMnemonic.erase(); } -std::string TextNode::getMnemonic() +std::string TextNodeSV::getMnemonic() { return mMnemonic; } -void TextNode::setMnemonic(std::string mnemonic) +void TextNodeSV::setMnemonic(std::string mnemonic) { mMnemonic.assign(mnemonic); } //just copy over the text string and the mnemonic //not complete but will do for now -TextNode* TextNode::clone() +TextNodeSV* TextNodeSV::clone() { - TextNode* p_new = new TextNode(); - p_new->setTextString(this->getTextString()); + TextNodeSV* p_new = new TextNodeSV(); + p_new->setMnemonic(this->getMnemonic()); + amis::TextNode::cloneContents(p_new); + return p_new; - } //*********** //ImageNode -ImageNode::ImageNode() +ImageNodeSV::ImageNodeSV() { mImageType = SMALL_ICON; } -ImageNode::~ImageNode() +ImageNodeSV::~ImageNodeSV() { } -ImageType ImageNode::getImageType() +ImageType ImageNodeSV::getImageType() { return mImageType; } -void ImageNode::setImageType(ImageType imgType) +void ImageNodeSV::setImageType(ImageType imgType) { mImageType = imgType; } +ImageNodeSV* ImageNodeSV::clone() +{ + ImageNodeSV* p_new = new ImageNodeSV(); + p_new->setImageType(this->getImageType()); + + amis::ImageNode::cloneContents(p_new); + + return p_new; +} + + //****************** //TextAudioPair @@ -76,7 +88,7 @@ } -TextNode* TextAudioPair::getText() +TextNodeSV* TextAudioPair::getText() { return mpText; } @@ -86,7 +98,7 @@ return mpAudio; } -void TextAudioPair::setText(TextNode* pNode) +void TextAudioPair::setText(TextNodeSV* pNode) { this->mpText = pNode; } @@ -99,7 +111,7 @@ TextAudioPair* p_new = new TextAudioPair(); amis::AudioNode* p_audio = (amis::AudioNode*)this->getAudio()->clone(); - TextNode* p_text = this->getText()->clone(); + TextNodeSV* p_text = this->getText()->clone(); p_new->setAudio(p_audio); p_new->setText(p_text); Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp 2008-03-02 15:39:17 UTC (rev 2366) @@ -82,7 +82,7 @@ //resolve prompt items - //mpData->resolvePromptItemsWithRefIds(); TODO DANIEL: restore this !! + mpData->resolvePromptItemsWithRefIds(); return (ok ? amis::OK : amis::PARSE_ERROR); } @@ -315,7 +315,7 @@ { if (mpRecentLabel != NULL && mpRecentPrompt == NULL) { - TextNode* p_text = new TextNode(); + TextNodeSV* p_text = new TextNodeSV(); string mnemonic; mnemonic.assign(SimpleAttrs::get("mnemonic", &attributes)); @@ -325,7 +325,7 @@ } - mpRecentTextNode = (amis::TextNode*)p_text; + mpRecentTextNode = p_text; TextAudioPair* p_pair = NULL; @@ -354,7 +354,7 @@ if (p_item->getPromptItemType() == PROMPT_ITEM) { - TextNode* p_text = new TextNode(); + TextNodeSV* p_text = new TextNodeSV(); string mnemonic; mnemonic.assign(SimpleAttrs::get("mnemonic", &attributes)); @@ -365,7 +365,7 @@ } - mpRecentTextNode = (amis::TextNode*)p_text; + mpRecentTextNode = p_text; mbFlag_GetChars = true; p_item->getContents()->setText(p_text); @@ -382,7 +382,7 @@ if (p_item != NULL) { - TextNode* p_text = new TextNode(); + TextNodeSV* p_text = new TextNodeSV(); string mnemonic; mnemonic.assign(SimpleAttrs::get("mnemonic", &attributes)); @@ -392,7 +392,7 @@ p_text->setMnemonic(mnemonic); } - mpRecentTextNode = (amis::TextNode*)p_text; + mpRecentTextNode = p_text; mbFlag_GetChars = true; p_item->getContents()->setText(p_text); @@ -490,7 +490,7 @@ if (p_action != NULL) { - ImageNode* p_image = new ImageNode(); + ImageNodeSV* p_image = new ImageNodeSV(); string type; type.assign(SimpleAttrs::get("type", &attributes)); Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/Action.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/Action.cpp 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/Action.cpp 2008-03-02 15:39:17 UTC (rev 2366) @@ -12,7 +12,7 @@ } Action::~Action() { - ImageNode* p_image = NULL; + ImageNodeSV* p_image = NULL; for (int i=mImages.size()-1; i>=0; i--) { p_image = mImages[i]; @@ -29,9 +29,9 @@ if (mAccelerator) delete mAccelerator; if (mMnemonic) delete mMnemonic; } -ImageNode* Action::getImage(ImageType type) +ImageNodeSV* Action::getImage(ImageType type) { - ImageNode* p_node = NULL; + ImageNodeSV* p_node = NULL; for (int i=0; i<mImages.size(); i++) { @@ -58,7 +58,7 @@ return mMnemonic; } -void Action::addImage(ImageNode* pNode) +void Action::addImage(ImageNodeSV* pNode) { mImages.push_back(pNode); } Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/Container.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/Container.cpp 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/Container.cpp 2008-03-02 15:39:17 UTC (rev 2366) @@ -43,6 +43,10 @@ delete p_container; p_container = NULL; + } else + { + UiItemType debug = p_item->getUiItemType(); + int i = 0; } } p_item = NULL; Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/DataTree.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/DataTree.cpp 2008-03-02 14:19:06 UTC (rev 2365) +++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/DataTree.cpp 2008-03-02 15:39:17 UTC (rev 2366) @@ -277,6 +277,8 @@ if (p_ref != NULL) { mNeedsResolution[i]->setReferenceContents(p_ref); + } else { + int debug = 0; } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |