diff options
| -rw-r--r-- | Project/Project.mk | 2 | ||||
| -rw-r--r-- | Project/TransferFunction.cpp | 19 | ||||
| -rw-r--r-- | Project/TransferFunction.h | 1 |
3 files changed, 18 insertions, 4 deletions
diff --git a/Project/Project.mk b/Project/Project.mk index 0d908f4..aee1449 100644 --- a/Project/Project.mk +++ b/Project/Project.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=Thales -Date :=25/01/2017 +Date :=26/01/2017 CodeLitePath :="C:/Program Files/CodeLite" LinkerName :=C:/TDM-GCC-64/bin/g++.exe SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC diff --git a/Project/TransferFunction.cpp b/Project/TransferFunction.cpp index 6bb03ae..3175686 100644 --- a/Project/TransferFunction.cpp +++ b/Project/TransferFunction.cpp @@ -15,8 +15,8 @@ TransferFunction::TransferFunction() m_supNumber[9] = L'\u2079'; wxString str = ""; - for(int i = 0; i < 10; i++) { - str += "0,1s" + wxString(m_supNumber[i]) + " "; + for(int i = 0; i < 20; i++) { + str += "0,1s" + GetSuperscriptNumber(i) + " "; } SetText(str, ""); @@ -38,7 +38,7 @@ void TransferFunction::Draw(wxPoint2DDouble translation, double scale) const DrawRectangle(m_position, m_width, m_height); glColor4d(0.0, 0.0, 0.0, 1.0); DrawRectangle(m_position, m_width, m_height, GL_LINE_LOOP); - + glEnable(GL_TEXTURE_2D); glColor4d(0.0, 0.0, 0.0, 1.0); m_glStringNum->bind(); @@ -59,3 +59,16 @@ void TransferFunction::SetText(wxString numerator, wxString denominator) m_glStringNum->setFont(font); m_glStringNum->consolidate(&dc); } + +wxString TransferFunction::GetSuperscriptNumber(int number) +{ + wxString strNumber = wxString::Format("%d", number); + wxString superscriptStr = ""; + for(int i = 0; i < (int)strNumber.length(); ++i) { + wxString digitStr = strNumber[i]; + long digit = 0; + digitStr.ToLong(&digit); + superscriptStr += wxString(m_supNumber[digit]); + } + return superscriptStr; +} diff --git a/Project/TransferFunction.h b/Project/TransferFunction.h index fa48354..f4e09a1 100644 --- a/Project/TransferFunction.h +++ b/Project/TransferFunction.h @@ -17,6 +17,7 @@ public: virtual bool Intersects(wxRect2DDouble rect) const { return m_rect.Intersects(rect); } virtual bool AddParent(Element* parent, wxPoint2DDouble position) { return false; } virtual void SetText(wxString numerator, wxString denominator); + virtual wxString GetSuperscriptNumber(int number); protected: wchar_t m_supNumber[10]; |