[Gcblue-commits] gcb_wx/include/graphics tcMapObject.h, 1.13, 1.14 tcMapOverlay.h, 1.6, 1.7

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

Update of /cvsroot/gcblue/gcb_wx/include/graphics
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32556/include/graphics

Modified Files:
	tcMapObject.h tcMapOverlay.h 
Log Message:
Interactive GUI icon for CAP station

Index: tcMapOverlay.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapOverlay.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tcMapOverlay.h	11 Dec 2006 01:20:41 -0000	1.6
--- tcMapOverlay.h	13 Dec 2006 02:10:58 -0000	1.7
***************
*** 58,63 ****
      void ClearMapObjects();
      void Draw();
!     /// declared public here to allow parent MapView to call
!     void OnSize(wxSizeEvent& event);
      /// redraw overlay during next call to Draw()
      void Redraw();
--- 58,62 ----
      void ClearMapObjects();
      void Draw();
! 
      /// redraw overlay during next call to Draw()
      void Redraw();
***************
*** 66,73 ****
      bool IsInteracting() const;
  
      void OnLButtonDown(wxMouseEvent& event);
  	void OnLButtonUp(wxMouseEvent& event);
  	void OnMouseMove(wxMouseEvent& event);
! 
  
      virtual tcUpdateStream& operator<<(tcUpdateStream& stream);
--- 65,73 ----
      bool IsInteracting() const;
  
+     void OnChar(wxKeyEvent& event);
      void OnLButtonDown(wxMouseEvent& event);
  	void OnLButtonUp(wxMouseEvent& event);
  	void OnMouseMove(wxMouseEvent& event);
!     void OnSize(wxSizeEvent& event);
  
      virtual tcUpdateStream& operator<<(tcUpdateStream& stream);
***************
*** 87,91 ****
      size_t hookedIdx;
  
!     void ClearInteraction();
      void HookObject(size_t idx);
  };
--- 87,92 ----
      size_t hookedIdx;
  
!     void ClearInteraction();  
!     void DeleteFlaggedObjects();
      void HookObject(size_t idx);
  };

Index: tcMapObject.h
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/include/graphics/tcMapObject.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** tcMapObject.h	11 Dec 2006 01:20:41 -0000	1.13
--- tcMapObject.h	13 Dec 2006 02:10:58 -0000	1.14
***************
*** 74,82 ****
      bool IsInteractive() const;
      void SetInteractive(bool state);
  
      float GetScreenDistanceFrom(const wxPoint& pos);
      void SetIsHooked(bool state);
  
!     void MoveToScreenPoint(const wxPoint& pos);
  
      static void SetMapView(tcMapView *mv); 
--- 74,88 ----
      bool IsInteractive() const;
      void SetInteractive(bool state);
+     
+     void FlagForDelete();
+     bool IsFlaggedForDelete() const;
  
      float GetScreenDistanceFrom(const wxPoint& pos);
      void SetIsHooked(bool state);
  
!     virtual void MoveToScreenPoint(const wxPoint& pos);
!     bool IsDragActive() const;
!     virtual void SetDragActive(bool state);
!     virtual bool ProcessKey(int keyCode);
  
      static void SetMapView(tcMapView *mv); 
***************
*** 93,97 ****
  	bool markerEnabled; ///< true to draw X marker with text
      bool isInteractive; ///< true if object can be hooked on map
!     bool isHooked; /// true if obj is hooked
  
      tcPoint GetScreenPoint() const;
--- 99,109 ----
  	bool markerEnabled; ///< true to draw X marker with text
      bool isInteractive; ///< true if object can be hooked on map
!     bool isHooked; ///< true if obj is hooked
!     bool flaggedForDelete; ///< true to safely delete (in overlay)
!     bool dragActive;
! 
! 	bool useRelativeCoords; ///< interpret lat_rad and lon_rad as rel screen coords [0-1]
!     double _x; ///< radian latitude or relative screen x coord
!     double _y; ///< radian longitude or relative screen y coord
  
      tcPoint GetScreenPoint() const;
***************
*** 101,107 ****
  
  private:
- 	bool useRelativeCoords; ///< interpret lat_rad and lon_rad as rel screen coords [0-1]
-     double _x; ///< radian latitude or relative screen x coord
-     double _y; ///< radian longitude or relative screen y coord
  };
  
--- 113,116 ----