X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctgraphics%2Fsgp.cpp;h=d3ea434b9b27a2cd8946f41b516d6d7bdced3543;hb=739e435359d44546dd812fff8c86b815a214d587;hp=f291245b4548a0d5246b4d08453f4f47f0df0ef3;hpb=f46d464bb065716c6738c23a4d7e7dbedd0b93b9;p=ctsim.git diff --git a/libctgraphics/sgp.cpp b/libctgraphics/sgp.cpp index f291245..d3ea434 100644 --- a/libctgraphics/sgp.cpp +++ b/libctgraphics/sgp.cpp @@ -7,7 +7,7 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: sgp.cpp,v 1.21 2000/12/18 06:32:13 kevin Exp $ +** $Id: sgp.cpp,v 1.22 2000/12/18 06:47:03 kevin Exp $ ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License (version 2) as @@ -505,10 +505,11 @@ SGP::getCharHeight () #if HAVE_WXWINDOWS if (m_driver.isWX()) { dHeight = m_driver.idWX()->GetCharHeight(); - dHeight /= static_cast(m_iPhysicalYSize); + dHeight /= static_cast(m_iPhysicalYSize); + dHeight /= (yv_max - yv_min); // scale to viewport; } #endif - dHeight *= (yw_max - yw_min); + dHeight *= (yw_max - yw_min); // scale to world coordinates return dHeight; } @@ -520,10 +521,11 @@ SGP::getCharWidth () #if HAVE_WXWINDOWS if (m_driver.isWX()) { dWidth = m_driver.idWX()->GetCharWidth(); - dWidth /= static_cast(m_iPhysicalXSize); + dWidth /= static_cast(m_iPhysicalXSize); + dWidth /= (xv_max - xv_min); // scale to viewport } #endif - dWidth *= (xw_max - xw_min); + dWidth *= (xw_max - xw_min); //scale to world coordinates return dWidth; }