• R/O
  • SSH
  • HTTPS

marathon: コミット


コミットメタ情報

リビジョン287 (tree)
日時2007-05-07 21:27:58
作者hogepiyo

ログメッセージ

*** empty log message ***

変更サマリ

差分

--- marathon/trunk/MapEditorOne/src/MapEditorSDI.cpp (revision 286)
+++ marathon/trunk/MapEditorOne/src/MapEditorSDI.cpp (revision 287)
@@ -179,11 +179,17 @@
179179 mapeditorone::MapEditorOneInnerSetting innerSetting =
180180 mapeditorone::MapEditorOneInnerSetting(tagNameFilePath, innerDataFilePath);
181181
182-
183182 //Zoom
184183 //innerSetting.getInt(mapeditorone::TagType::ZOOM_DIVISION_DEFAULT);
185184 zoomDivision = ZOOM_DIVISION_DEFAULT;
186-
185+ hpl::aleph::view::ZoomProperties zoomProp;
186+ zoomProp.zoomDivisionStep = innerSetting.getInt(mapeditorone::TagType::ZOOM_DIVISION_STEP);
187+ zoomProp.zoomDivisionDefault = innerSetting.getInt(mapeditorone::TagType::ZOOM_DIVISION_DEFAULT);
188+ zoomProp.zoomDivisionMin = innerSetting.getInt(mapeditorone::TagType::ZOOM_DIVISION_MIN);
189+ zoomProp.zoomDivisionMax = innerSetting.getInt(mapeditorone::TagType::ZOOM_DIVISION_MAX);
190+ zoomProp.zoomDivStepThreshold = innerSetting.getInt(mapeditorone::TagType::ZOOM_DIV_STEP_THRESHOLD);
191+ zoomProp.zoomDivisionStepDetail = innerSetting.getInt(mapeditorone::TagType::ZOOM_DIVISION_STEP_DETAIL);
192+ this->gridManager = new hpl::aleph::view::HPLViewGridManager(&zoomProp);
187193 isPressLButtonWithCtrl = false;
188194
189195 offset.x = 0;
--- marathon/trunk/MapEditorOne/src/MapEditorOneInnerSetting.cpp (revision 286)
+++ marathon/trunk/MapEditorOne/src/MapEditorOneInnerSetting.cpp (revision 287)
@@ -5,6 +5,8 @@
55
66 #include <windows.h>
77
8+const int MAX_FILE_PATH = 260;
9+
810 mapeditorone::MapEditorOneInnerSetting::MapEditorOneInnerSetting(const char* tagNameFilePath, const char* dataFilePath)
911 {
1012 std::ifstream ifs;
@@ -13,6 +15,16 @@
1315 MessageBox(NULL, L"Cannot open tag file", L"", MB_OK);
1416 exit(-1);
1517 }
18+ //タグ読み取り
19+ char buf[MAX_FILE_PATH];
20+ int counter = 0;
21+ while(ifs.readLine(buf, MAX_FILE_PATH) != NULL){
22+ if(strcmp(buf, "")){
23+ continue;
24+ }
25+ std::string src(buf);
26+ tagMap[counter] = src;
27+ }
1628 ifs.close();
1729
1830 ifs.open(dataFilePath);
@@ -20,6 +32,15 @@
2032 MessageBox(NULL, L"Cannot open inner data file", L"", MB_OK);
2133 exit(-1);
2234 }
35+ while(ifs.readLine(buf, MAX_FILE_PATH) != NULL){
36+ std::string src(buf);
37+ std::vector<std::string> pair = hpl::string::Split(src, "=");
38+ for(int i = 0; i < mapeditorone::TagType::MaxTagTypes; i ++){
39+ if(pair[0].compare(tagMap[i]) == 0){
40+
41+ }
42+ }
43+ }
2344 ifs.close();
2445 }
2546 mapeditorone::MapEditorOneInnerSetting::~MapEditorOneInnerSetting()
--- marathon/trunk/MapEditorOne/src/MapEditorSDI.h (revision 286)
+++ marathon/trunk/MapEditorOne/src/MapEditorSDI.h (revision 287)
@@ -207,6 +207,9 @@
207207 /**選択中の倍率*/
208208 int zoomDivision;
209209
210+ //
211+ hpl::aleph::view::HPLViewGridManager* gridManager;
212+
210213 /**グリッド表示用間隔(世界距離に対応し、拡大縮小で大きさ変化)*/
211214 int gridIntervals[NUMBER_OF_GLID];
212215
--- marathon/trunk/HPLLib/HPLViewGridManager.h (revision 286)
+++ marathon/trunk/HPLLib/HPLViewGridManager.h (revision 287)
@@ -26,6 +26,8 @@
2626 /**最小値*/
2727 int zoomDivisionMin;
2828
29+ /**初期値・規定値*/
30+ int zoomDivisionDefault;
2931 };
3032 /**
3133 拡大縮小、スクロールなどの管理
旧リポジトリブラウザで表示