|
|
@@ -186,8 +186,18 @@ int AssignWordsFromTest(std::string pathName, std::vector<std::string> &twoList,
|
|
|
CString filepath = csFullPath.Left(nPos);
|
|
|
CString FilePath1 = filepath + L"\\config.ini";
|
|
|
CString FilePath2 = filepath + L"\\words.txt";
|
|
|
- WCHAR wflagWord[10];
|
|
|
+ WCHAR wflagWord[10],wFourColScaleParam[10],wThreeColScaleParam[10],wTwoColScaleParam[10];
|
|
|
GetPrivateProfileString(L"USER", L"flagWord", L"1", wflagWord, 10, FilePath1);
|
|
|
+ GetPrivateProfileString(L"USER", L"FourColScaleParam", L"16", wTwoColScaleParam, 10, FilePath1);
|
|
|
+ GetPrivateProfileString(L"USER", L"ThreeColScaleParam", L"9", wThreeColScaleParam, 10, FilePath1);
|
|
|
+ GetPrivateProfileString(L"USER", L"FourColScaleParam", L"6", wFourColScaleParam, 10, FilePath1);
|
|
|
+ int nFourColScaleParam = 0, nThreeColScaleParam = 0, nTwoColScaleParam = 0;
|
|
|
+ nFourColScaleParam = _wtoi(wFourColScaleParam);
|
|
|
+ nFourColScaleParam = nFourColScaleParam > 0 ? nFourColScaleParam : 16;
|
|
|
+ nThreeColScaleParam = _wtoi(wThreeColScaleParam);
|
|
|
+ nThreeColScaleParam = nThreeColScaleParam > 0 ? nThreeColScaleParam : 9;
|
|
|
+ nTwoColScaleParam = _wtoi(wFourColScaleParam);
|
|
|
+ nTwoColScaleParam = nTwoColScaleParam > 0 ? nTwoColScaleParam : 6;
|
|
|
CString lpszflagWord(wflagWord);
|
|
|
std::vector<std::string> WordList;
|
|
|
WordList.push_back("vt.");
|
|
|
@@ -234,9 +244,9 @@ int AssignWordsFromTest(std::string pathName, std::vector<std::string> &twoList,
|
|
|
int cout = 0;
|
|
|
if (_access(pathName.c_str(), 00) != -1)
|
|
|
{
|
|
|
- int maxTwoWith = main_wdith / 4 - chk_width;
|
|
|
- int maxTreeWith = main_wdith*2/9 - chk_width;
|
|
|
- int maxFourWith = main_wdith * 3 / 16 - chk_width;
|
|
|
+ int maxTwoWith = main_wdith / 2 - main_wdith / nTwoColScaleParam - chk_width;
|
|
|
+ int maxTreeWith = main_wdith / 3 - main_wdith / nThreeColScaleParam - chk_width;
|
|
|
+ int maxFourWith = main_wdith / 4 - main_wdith/ nFourColScaleParam - chk_width;
|
|
|
std::ifstream fin(pathName.c_str(), std::ios::in);
|
|
|
char line[4096] = { 0 };
|
|
|
while (fin.getline(line, sizeof(line)))
|
