Changeset 505 for branches


Ignore:
Timestamp:
04/03/14 17:29:18 (5 years ago)
Author:
jls17
Message:
Location:
branches/work_311
Files:
7 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/work_311/ARInsideLib.vcproj

    r502 r505  
    11311131                        </File> 
    11321132                        <File 
    1133                                 RelativePath=".\output\RootLevel.cpp" 
    1134                                 > 
    1135                         </File> 
    1136                         <File 
    1137                                 RelativePath=".\output\RootLevel.h" 
     1133                                RelativePath=".\output\RootPath.cpp" 
     1134                                > 
     1135                        </File> 
     1136                        <File 
     1137                                RelativePath=".\output\RootPath.h" 
    11381138                                > 
    11391139                        </File> 
  • branches/work_311/doc/DocImageDetails.cpp

    r504 r505  
    1919#include "../core/ARImage.h" 
    2020#include "../output/WorkflowReferenceTable.h" 
    21 #include "../output/RootLevel.h" 
     21#include "../output/RootPath.h" 
    2222#include "DocOverlayHelper.h" 
    2323 
     
    7979 
    8080                stringstream imgTag; 
    81                 imgTag << "<p class=\"ars_image\"><img src=\"" << RootLevel(rootLevel) << imageLink->GetFullFileName() <<  "\" alt=\"" << image.GetType() << "\" /></p>"; 
     81                imgTag << "<p class=\"ars_image\"><img src=\"" << RootPath(rootLevel) << imageLink->GetFullFileName() <<  "\" alt=\"" << image.GetType() << "\" /></p>"; 
    8282                webPage.AddContent(imgTag.str()); 
    8383 
  • branches/work_311/output/ImageTag.cpp

    r504 r505  
    1818#include "ImageTag.h" 
    1919#include "../core/ARServerObject.h" 
    20 #include "../output/RootLevel.h" 
     20#include "../output/RootPath.h" 
    2121 
    2222namespace OUTPUT 
     
    7272 
    7373                        strm << "<img "; 
    74                         strm << "src=\"" << RootLevel(rootLevel) << "img/" << imageName << "\" "; 
     74                        strm << "src=\"" << RootPath(rootLevel) << "img/" << imageName << "\" "; 
    7575                        strm << "width=\"" << imageDim.x << "\" height=\"" << imageDim.y << "\" alt=\"" << imageName << "\" />"; 
    7676                } 
  • branches/work_311/output/RootPath.cpp

    r504 r505  
    1616 
    1717#include "stdafx.h" 
    18 #include "RootLevel.h" 
     18#include "RootPath.h" 
    1919 
    2020namespace OUTPUT  
    2121{ 
    2222 
    23         RootLevel::RootLevel(int currentRootLevel) 
     23        RootPath::RootPath(int currentRootLevel) 
    2424        { 
    2525                rootLevel = currentRootLevel; 
    2626        } 
    2727 
    28         const char* RootLevel::GetRootPath() const 
     28        const char* RootPath::GetRootPath() const 
    2929        { 
    3030                switch(rootLevel) 
     
    3737        } 
    3838 
    39         ostream& operator <<(ostream &stream, const OUTPUT::RootLevel &rootLevelObj) 
     39        ostream& operator <<(ostream &stream, const OUTPUT::RootPath &rootLevelObj) 
    4040        { 
    4141                stream << rootLevelObj.GetRootPath(); 
  • branches/work_311/output/RootPath.h

    r504 r505  
    1919namespace OUTPUT { 
    2020 
    21         class RootLevel 
     21        class RootPath 
    2222        { 
    2323        public: 
    24                 RootLevel(int rootLevel); 
     24                RootPath(int rootLevel); 
    2525                const char * GetRootPath() const; 
    2626 
     
    2929        }; 
    3030 
    31         std::ostream& operator <<(std::ostream &stream, const OUTPUT::RootLevel &rootLevelObj); 
     31        std::ostream& operator <<(std::ostream &stream, const OUTPUT::RootPath &rootLevelObj); 
    3232}; // end namespace OUTPUT 
  • branches/work_311/output/WebPage.cpp

    r504 r505  
    1616 
    1717#include "stdafx.h" 
    18 #include "RootLevel.h" 
     18#include "RootPath.h" 
    1919#include "WebPage.h" 
    2020#include "WebUtil.h" 
     
    127127                strm << "</div>" << endl; 
    128128        } 
    129         strm << "<iframe id=\"IFrameMenu\" src=\"" << RootLevel(rootLevel) << "template/navigation." << CWebUtil::WebPageSuffix() << "\" name=\"Navigation\" frameborder=\"0\">" << endl; 
     129        strm << "<iframe id=\"IFrameMenu\" src=\"" << RootPath(rootLevel) << "template/navigation." << CWebUtil::WebPageSuffix() << "\" name=\"Navigation\" frameborder=\"0\">" << endl; 
    130130        strm << "<p>IFrame not supported by this browser.</p></iframe></td><td class=\"TdMainContent\">" << endl; 
    131131} 
     
    203203void CWebPage::AddScriptReference(std::ostream &strm, const std::string &scriptPath) 
    204204{ 
    205         strm << "<script src=\"" << RootLevel(rootLevel) << scriptPath << "\" type=\"text/javascript\"></script>" << endl; 
     205        strm << "<script src=\"" << RootPath(rootLevel) << scriptPath << "\" type=\"text/javascript\"></script>" << endl; 
    206206} 
    207207 
    208208void CWebPage::AddStyleSheetReference(std::ostream &strm, const std::string &cssPath) 
    209209{ 
    210         strm << "<link rel=\"stylesheet\" type=\"text/css\" href=\"" << RootLevel(rootLevel) << cssPath << "\" />" << endl; 
     210        strm << "<link rel=\"stylesheet\" type=\"text/css\" href=\"" << RootPath(rootLevel) << cssPath << "\" />" << endl; 
    211211} 
    212212 
  • branches/work_311/output/WebUtil.cpp

    r504 r505  
    1616 
    1717#include "stdafx.h" 
    18 #include "RootLevel.h" 
     18#include "RootPath.h" 
    1919#include "WebUtil.h" 
    2020#include "../ARInside.h" 
     
    140140        if (!imgOverlay.empty()) 
    141141        { 
    142                 strm << "style=\"background:url(" << RootLevel(rootLevel) << "img/" << imgName << ")\" " 
    143                      << "src=\"" << RootLevel(rootLevel) << "img/" << imgOverlay << "\" "; 
     142                strm << "style=\"background:url(" << RootPath(rootLevel) << "img/" << imgName << ")\" " 
     143                     << "src=\"" << RootPath(rootLevel) << "img/" << imgOverlay << "\" "; 
    144144        } 
    145145        else 
    146146        { 
    147                 strm << "src=\"" << RootLevel(rootLevel) << "img/" << imgName << "\" "; 
     147                strm << "src=\"" << RootPath(rootLevel) << "img/" << imgName << "\" "; 
    148148        } 
    149149        strm << "width=\"" << width << "\" height=\"" << height << "\" alt=\"" << imgName << "\" />"; 
     
    374374string CWebUtil::LinkToHelper(string name, int objectCount, const CPageParams& page, const string& image, int rootLevel) 
    375375{ 
    376         RootLevel rootPath(rootLevel); 
     376        RootPath rootPath(rootLevel); 
    377377        stringstream strmTmp; 
    378378        strmTmp.str(""); 
     
    435435        else 
    436436        { 
    437                 strmTmp << "<a href=\"" << RootLevel(rootLevel) << linkToPage->GetFullFileName() << "\""; 
     437                strmTmp << "<a href=\"" << RootPath(rootLevel) << linkToPage->GetFullFileName() << "\""; 
    438438                if (target > TARGET_MODE_SELF) 
    439439                { 
     
    455455string CWebUtil::GetRelativeURL(int rootLevel, const CPageParams& page) 
    456456{ 
    457         RootLevel rootPath(rootLevel); 
     457        RootPath rootPath(rootLevel); 
    458458        return rootPath.GetRootPath() + page->GetFullFileName(); 
    459459} 
  • branches/work_311/output/webpage/HtmlReferenceListImpl.cpp

    r504 r505  
    1717#include "stdafx.h" 
    1818#include "HtmlReferenceListImpl.h" 
    19 #include "../RootLevel.h" 
     19#include "../RootPath.h" 
    2020#include "../WebUtil.h" 
    2121 
     
    6363void HtmlReferenceListImpl::WriteCSSReference(std::ostream &output, const std::string &cssPath) const 
    6464{ 
    65         output << "<link rel=\"stylesheet\" type=\"text/css\" href=\"" << RootLevel(rootLevel) << cssPath << "\" />" << endl; 
     65        output << "<link rel=\"stylesheet\" type=\"text/css\" href=\"" << RootPath(rootLevel) << cssPath << "\" />" << endl; 
    6666} 
    6767 
    6868void HtmlReferenceListImpl::WriteJSReference(std::ostream &output, const std::string &scriptPath) const 
    6969{ 
    70         output << "<script src=\"" << RootLevel(rootLevel) << scriptPath << "\" type=\"text/javascript\"></script>" << endl; 
     70        output << "<script src=\"" << RootPath(rootLevel) << scriptPath << "\" type=\"text/javascript\"></script>" << endl; 
    7171} 
  • branches/work_311/project.cmake/files.cmake

    r502 r505  
    187187 output/ObjectTable.cpp 
    188188 output/RoleTable.cpp 
    189  output/RootLevel.cpp 
     189 output/RootPath.cpp 
    190190 output/SchemaTable.cpp 
    191191 output/TabControl.cpp 
     
    218218 output/ObjectTable.h 
    219219 output/RoleTable.h 
    220  output/RootLevel.h 
     220 output/RootPath.h 
    221221 output/SchemaTable.h 
    222222 output/TabControl.h 
Note: See TracChangeset for help on using the changeset viewer.