[Sphere-axis-commits] CVS: UOMap UOMap.rc,1.3,1.4 uomap_docs.htm,1.1.1.1,1.2 UOMapCtl.cpp,1.4,1.5

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/sphere-axis/UOMap
In directory usw-pr-cvs1:/tmp/cvs-serv29530

Modified Files:
	UOMap.rc uomap_docs.htm UOMapCtl.cpp 
Log Message:
Merged version_1_2_development branch into main trunk

Index: UOMap.rc
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/UOMap.rc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** UOMap.rc	1 May 2002 03:42:44 -0000	1.3
--- UOMap.rc	11 May 2002 05:33:31 -0000	1.4
***************
*** 23,27 ****

  //Microsoft Developer Studio generated resource script.
! //
  #include "resource.h"

--- 23,27 ----

  //Microsoft Developer Studio generated resource script.
! // Last compiled 4/30/2002 at 22:11:0
  #include "resource.h"

***************
*** 78,83 ****

  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 1,1,0,0
!  PRODUCTVERSION 1,1,0,0
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
--- 78,83 ----

  VS_VERSION_INFO VERSIONINFO
!  FILEVERSION 1,2,0,1
!  PRODUCTVERSION 1,2,0,1
   FILEFLAGSMASK 0x3fL
  #ifdef _DEBUG
***************
*** 97,101 ****
              VALUE "CompanyName", "MCI WorldCom\0"
              VALUE "FileDescription", "UOMap ActiveX Control Module\0"
!             VALUE "FileVersion", "1, 1, 0, 0\0"
              VALUE "InternalName", "UOMap\0"
              VALUE "LegalCopyright", "Copyright (C) 2001\0"
--- 97,101 ----
              VALUE "CompanyName", "MCI WorldCom\0"
              VALUE "FileDescription", "UOMap ActiveX Control Module\0"
!             VALUE "FileVersion", "1, 2, 0, 1\0"
              VALUE "InternalName", "UOMap\0"
              VALUE "LegalCopyright", "Copyright (C) 2001\0"
***************
*** 105,109 ****
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "UOMap ActiveX Control Module\0"
!             VALUE "ProductVersion", "1, 1, 0, 0\0"
              VALUE "SpecialBuild", "\0"
          END
--- 105,109 ----
              VALUE "PrivateBuild", "\0"
              VALUE "ProductName", "UOMap ActiveX Control Module\0"
!             VALUE "ProductVersion", "1, 2, 0, 1\0"
              VALUE "SpecialBuild", "\0"
          END

Index: uomap_docs.htm
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/uomap_docs.htm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** uomap_docs.htm	22 Apr 2001 18:30:18 -0000	1.1.1.1
--- uomap_docs.htm	11 May 2002 05:33:31 -0000	1.2
***************
*** 1,30 ****
- 
  <html>

  <head>
- <meta http-equiv="Content-Language" content="en-us">
  <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
  <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
  <meta name="ProgId" content="FrontPage.Editor.Document">
! <style>
! <!--
! P            { line-height: 100%; font-family: Tahoma; font-size: 10pt; margin-left: 10px; margin-right:10px;
!                margin-top: 0; margin-bottom: 0 }
! A            { font-family: Tahoma; font-size: 10pt; line-height: 100%; color: #0077FF; 
!                margin-top: 0; margin-bottom: 0 }
! .Method      { font-family: Tahoma; font-size: 10pt; line-height: 100%; color: #0000FF; }
! .Property    { font-family: Tahoma; font-size: 10pt; line-height: 100%; color: #007700; }
! -->
! </style>
! <title>UOMap ActiveX Control Documentation</title>
  </head>

! <body>

! <b>UOMap ActiveX Control<br>
  <br>
  Example Applications:<br>
! </b><a href="http://cdbar.fingolfin.net/dev/uomap_vb.zip">For Visual Basic</a><br>
! <a href="http://cdbar.fingolfin.net/dev/uomap_vcc.zip">For Visual C++</a><br><br><br>

  <b>Properties</b><br>
--- 1,25 ----
  <html>

  <head>
  <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
  <meta name="GENERATOR" content="Microsoft FrontPage 4.0">
  <meta name="ProgId" content="FrontPage.Editor.Document">
! <title>UOActiveX UOMap Docs</title>
! <base target="_self">
! <link rel="stylesheet" type="text/css" href="uoax.css">
  </head>

! <body bgcolor="#FFFFFF">
! 
! <b><span class="title">UOMap ActiveX Control</span><br>
! Download:<br>
! </b><a href="http://uoactivex.fingolfin.net/uomap_control.zip">UOMap Control and
! documentation</a><br>

! <b>
  <br>
  Example Applications:<br>
! </b><a href="http://uoactivex.fingolfin.net/uomap_vb.zip">For Visual Basic</a><br>
! <a href="http://uoactivex.fingolfin.net/uomap_vcc.zip">For Visual C++</a><br><br><br>

  <b>Properties</b><br>
***************
*** 41,47 ****
  - Retrieves the center x and y position of the map.<br><br>
  <span class="method">Scroll(short direction, short distance)</span>
! - Scrolls the map in the direction specified by the specified distance in map units.<br><br>
! The direction value is one of the following:&nbsp; (0 = North, 1 = NorthEast,
! 2 = East, 3 = SouthEast, 4 = South, 5 = SouthWest, 6 = West, 7 = NorthWest).<br><br>
  <span class="method">SetCenter(short x, short y)</span>
  - Sets the center of the map to the specified position.<br><br>
--- 36,51 ----
  - Retrieves the center x and y position of the map.<br><br>
  <span class="method">Scroll(short direction, short distance)</span>
! - Scrolls the map in the direction specified by the specified distance in map units.<br>
! The direction value is one of the following:<br>
! <div class="enum">
! 0 = North<br>
! 1 = NorthEast<br>
! 2 = East<br>
! 3 = SouthEast<br>
! 4 = South<br>
! 5 = SouthWest<br>
! 6 = West<br>
! 7 = NorthWest<br>
! </div><br>
  <span class="method">SetCenter(short x, short y)</span>
  - Sets the center of the map to the specified position.<br><br>
***************
*** 69,73 ****
  <br>
  <span class="method">short GetMapHeight(short x, short y)</span>
! - Determines the map altitude for the map location x, y
  </body>

--- 73,136 ----
  <br>
  <span class="method">short GetMapHeight(short x, short y)</span>
! - Determines the map altitude for the map location x, y<br>
! <br>
! <span class="method">long AddDrawObject(short x, short y, short type, short size, long color)</span>
! - Adds a draw object to an internal storage array in the control.&nbsp; Returns the
! array index of the inserted object, or -1 if unable to add the object.&nbsp; The
! x and y values represent the map coordinates of the object.&nbsp; The type value
! is one of the following:<br>
! &nbsp;&nbsp;&nbsp; 0 = No object<br>
! &nbsp;&nbsp;&nbsp; 1 = Cross (plus sign)<br>
! &nbsp;&nbsp;&nbsp; 2 = Square<br>
! &nbsp;&nbsp;&nbsp; 3 = Diamond<br>
! &nbsp;&nbsp;&nbsp; 4 = Dot<br>
! &nbsp;&nbsp;&nbsp; 5 = Circle<br>
! &nbsp;&nbsp;&nbsp; 6 = Triangle<br>
! The size value is the number of pixels for the radius of the object.&nbsp; The
! color value is a standard RGB value, where the four bytes are denoted (in hex)
! by 0x00bbggrr, with bb being the blue value, gg being the green value, and rr
! being the red value.&nbsp;<br>
! <br>
! <span class="method">boolean RemoveDrawObject(short x, short y, short type, short size, long color)</span>
! - Removes a draw object from internal storage that matches the provided
! parameters.&nbsp; Returns true if successful, or false if no match could be
! found. <br>
! <br>
! <span class="method">boolean RemoveDrawObjectAt(long index)</span>
! - Removes a draw object from internal storage at the given index.&nbsp; Returns
! true if successful, or false if there was no object at the supplied index. <br>
! <br>
! <span class="method">boolean RemoveDrawObjects()</span>
! - Removes all draw objects from internal storage.&nbsp; Returns true if
! successful, or false if an error occurred. <br>
! <br>
! <span class="method">long AddDrawRect(short xleft, short ytop, short width, short height, short mode,
! long color)</span>
! - Adds a drawing rectangle to an internal storage array in the control.&nbsp;
! Returns the index of the inserted object, or -1 if unable to add the
! rectangle.&nbsp; The x and y values represent the map coordinates of the
! object.&nbsp; The width and height represent the width and height (in map
! coordinates) of the rectangle.&nbsp; The mode value is one of the following:<br>
! &nbsp;&nbsp;&nbsp; 0 = Fill solid<br>
! &nbsp;&nbsp;&nbsp; 1 = Fill blend<br>
! &nbsp;&nbsp;&nbsp; 2 = Outline <br>
! The color value is a standard RGB value, where the four bytes are denoted (in
! hex) by 0x00bbggrr, with bb being the blue value, gg being the green value, and
! rr being the red value.<br>
! <br>
! <span class="method">boolean RemoveDrawRect(short x, short y, short width, short height, short mode,
! long color)</span>
! - Removes a drawing rectangle from internal storage that matches the
! provided parameters.&nbsp; Returns true if successful, or false if no match
! could be found.<br>
! <br>
! <span class="method">boolean RemoteDrawRectAt(long index)</span>
!  - Removes a drawing rectangle from internal
! storage at the given index.&nbsp; Returns true if successful, or false if there
! was no object at the supplied index.<br>
! <br>
! <span class="method">boolean RemoveDrawRects()</span>
! - Removes all drawing rectangles from internal storage.&nbsp; Returns true if successful, or false if an error occurred.<br>
! 
  </body>

Index: UOMapCtl.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/UOMap/UOMapCtl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** UOMapCtl.cpp	1 May 2002 03:42:44 -0000	1.4
--- UOMapCtl.cpp	11 May 2002 05:33:31 -0000	1.5
***************
*** 464,467 ****
--- 464,471 ----
  {
  	m_zoomLevel = nNewValue;
+ 	if ( m_zoomLevel > 8 )
+ 		m_zoomLevel = 8;
+ 	if ( m_zoomLevel < -4 )
+ 		m_zoomLevel = -4;
  	SetInvalid();
  }