[Gcblue-commits] gcb_wx/include/sim tcMapView.h,1.18,1.19

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/include/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6167/include/sim

Modified Files:
	tcMapView.h 
Log Message:


Index: tcMapView.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/sim/tcMapView.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** tcMapView.h	3 Apr 2004 15:39:31 -0000	1.18
--- tcMapView.h	3 Apr 2004 20:24:33 -0000	1.19
***************
*** 87,91 ****
          teSymbol meSymbol;
          teAffiliation meAffiliation;
!         unsigned long mnID;
          float mfArc_deg; ///< for pie symbol
          float mfLonExtent; ///< for pie
--- 87,91 ----
          teSymbol meSymbol;
          teAffiliation meAffiliation;
!         long mnID;
          float mfArc_deg; ///< for pie symbol
          float mfLonExtent; ///< for pie
***************
*** 244,248 ****
          float mfScrollDirection;
  
!         long mnHookID;
          UINT mnHookAlliance;
          float mfHookLon,mfHookLat;
--- 244,249 ----
          float mfScrollDirection;
  
!         std::vector<long> hookedId; ///< vector of hooked obj ids
! 
          UINT mnHookAlliance;
          float mfHookLon,mfHookLat;
***************
*** 258,263 ****
  
          void UpdateNavPoints(std::vector<tcPoint> *mpPoints);
!         int Hook(wxPoint pscreen);
!         long HookSecondary(wxPoint pscreen);
          int GetClosest(wxPoint pscreen);
  
--- 259,263 ----
  
          void UpdateNavPoints(std::vector<tcPoint> *mpPoints);
!        
          int GetClosest(wxPoint pscreen);
  
***************
*** 273,277 ****
          void ScrollMap(float afDirection_deg);
          void ClearMapCmd() {meMapCmd = MC_NONE;}
!         //int CreateSurfaces(tcGraphicsEngine* apGraphicsEngine);
          int Draw(void);
          void DrawGrid(Gdiplus::Graphics *apGraphics);
--- 273,277 ----
          void ScrollMap(float afDirection_deg);
          void ClearMapCmd() {meMapCmd = MC_NONE;}
! 
          int Draw(void);
          void DrawGrid(Gdiplus::Graphics *apGraphics);
***************
*** 283,287 ****
          void DrawIndicator(int anType);
          void DrawSpecial(Gdiplus::Graphics *graphics);
!         long GetHookID() {return mnHookID;}
          bool IsMapCmdActive() {return meMapCmd != MC_NONE;}
          void OnChar(wxKeyEvent& event);
--- 283,292 ----
          void DrawIndicator(int anType);
          void DrawSpecial(Gdiplus::Graphics *graphics);
!         size_t GetHookCount();
!         long GetHookID(size_t idx = 0);
!         long Hook(wxPoint pscreen);
!         void HookGroup(wxRect& region);
!         long HookSecondary(wxPoint pscreen);
!         bool IsHooked(long id);
          bool IsMapCmdActive() {return meMapCmd != MC_NONE;}
          void OnChar(wxKeyEvent& event);
***************
*** 293,302 ****
          void OnMouseWheel(wxMouseEvent& event);
          void OnRButtonDown(wxMouseEvent& event);
!         void ActivateCmd(teMapCmdType aeCmd) {mbMapCmdActive=true;meMapCmd=aeCmd;}
!         void DeactivateCmd() {mbMapCmdActive=false;meMapCmd=MC_NONE;}
          void ClearMapObjects(void);
          void Init(void);
          void SetDateTime(std::string s) {dateTime = s;}
!         void SetHookID(long id) {mnHookID = id;}
          void ToggleShowTrackTags() {mbShowTrackID = !mbShowTrackID;}
          void UpdateViewBounds() {mpMapData->GetTheaterArea(mrectViewBounds);}
--- 298,307 ----
          void OnMouseWheel(wxMouseEvent& event);
          void OnRButtonDown(wxMouseEvent& event);
!         void ActivateCmd(teMapCmdType aeCmd) {mbMapCmdActive=true; meMapCmd=aeCmd;}
!         void DeactivateCmd() {mbMapCmdActive=false; meMapCmd=MC_NONE;}
          void ClearMapObjects(void);
          void Init(void);
          void SetDateTime(std::string s) {dateTime = s;}
!         void SetHookID(long id);
          void ToggleShowTrackTags() {mbShowTrackID = !mbShowTrackID;}
          void UpdateViewBounds() {mpMapData->GetTheaterArea(mrectViewBounds);}
***************
*** 319,323 ****
          wxPoint buttonDownPoint; ///< start point for click-drag operations
  
- 
          void Build2525();
          void BuildNTDS();
--- 324,327 ----