*** empty log message ***
@@ -244,7 +244,7 @@ | ||
244 | 244 | //成功 |
245 | 245 | //更新 |
246 | 246 | wxGetApp().getStockManager()->updateDeletes(); |
247 | - wxGetApp().getStockManager()->updateSelects(sel); | |
247 | + wxGetApp().getStockManager()->updateSelects(*sel); | |
248 | 248 | }else{ |
249 | 249 | //失敗 |
250 | 250 | } |
@@ -150,17 +150,24 @@ | ||
150 | 150 | |
151 | 151 | //選択状態にする |
152 | 152 | sel->clear(); |
153 | - for(int i = (int)endpointList->size(); i < (int)EndpointList.size(); i ++){ | |
154 | - sel->addSelPoint(i); | |
153 | + for(int i = (int)(EndpointList.size() - endpointList->size()); | |
154 | + i < (int)EndpointList.size(); i ++) | |
155 | + { | |
156 | + int offset[2] = {0,0}; | |
157 | + sel->addSelPoint(i, offset); | |
155 | 158 | } |
156 | - for(int i = (int)lineList->size(); i < (int)LineList.size(); i ++){ | |
157 | - sel->addSelLine(i); | |
159 | + for(int i = (int)LineList.size() - (int)lineList->size(); i < (int)LineList.size(); i ++){ | |
160 | + int offset[2][2] = {{0,0},{0,0}}; | |
161 | + sel->addSelLine(i, offset); | |
158 | 162 | } |
159 | - for(int i = (int)polygonList->size(); i < (int)PolygonList.size(); i ++){ | |
160 | - sel->addSelPolygon(i); | |
163 | + for(int i = (int)PolygonList.size() - (int)polygonList->size(); i < (int)PolygonList.size(); i ++){ | |
164 | + int offset[MAXIMUM_VERTICES_PER_POLYGON][2] = {{0}}; | |
165 | + polygon_data* poly = get_polygon_data(i); | |
166 | + sel->addSelPolygon(i, offset, poly->vertex_count); | |
161 | 167 | } |
162 | - for(int i = (int)objectList->size(); i < (int)SavedObjectList.size(); i ++){ | |
163 | - sel->addSelObject(i); | |
168 | + for(int i = (int)SavedObjectList.size() - (int)objectList->size(); i < (int)SavedObjectList.size(); i ++){ | |
169 | + int offset[2] = {0}; | |
170 | + sel->addSelObject(i, offset); | |
164 | 171 | } |
165 | 172 | |
166 | 173 | storedDataDiffPointDelta[0] += COPY_AND_PASTE_DELTA_X; |