Changeset 1106 for Scheduling/trunk/cs/bsdx0200GUISourceCode/CalendarGrid.cs

Timestamp:

Mar 20, 2011, 3:22:11 AM (13 years ago)

Author:

Sam Habiel

Message:

CalendarGrid:

• Support for Autoscrolling corrected.
• A little optimization: Grid is only drawn once now when starting, not twice (don't know why original code did that).

CGAppointment:

• Added member Patient (new Class)

CGDocument:

• OnOpenDocument now accepts input of DateTime to decide where to open document.
• SlotsAvailable algorithm now includes code for scaling according to timescale and code to merge Blocks if they are adjacent.

CGDocumentManager:

• Fix bug having to do with canceling log-in after first retry. BMX lib threw an exception which was not caught.

CGView: Many changes:

• SlotsAvailable signature changed in CGDocument. All references to it had to be changed.
• Opening a node in the tvSchedules by clicking on the plus sign did not select it. Code changes to make it select it.
• UpdateStatusBar now uses a string builder; and shows a more comprehensive message on the availability in the Status Bar.
• Focus issues on various controls.
• Support for printing a slip after an appointment is made automatically has been added.

CustomPrinting:

• now includes a method to print a single appointment slip

DAppointPage:

• Checkbox to decide whether to print appt slip added.
• New readonly property to get the appointment that has been made (of type CGAppointment).

DApptSearch:

• StartDate and EndDate now autoadjust based on each other.
• lblMessage added to show user message if no appointments are found.

File:

• Scheduling/trunk/cs/bsdx0200GUISourceCode/CalendarGrid.cs (modified) (11 diffs)

Scheduling/trunk/cs/bsdx0200GUISourceCode/CalendarGrid.cs

@@ -24 +24 @@
         private bool m_bDrawWalkIns = true;
         private bool m_bGridEnter;
-        private bool m_bInitialUpdate;
+        //private bool m_bInitialUpdate;
         private bool m_bMouseDown;
         private bool m_bScroll;
@@ -49 +49 @@
         private StringFormat m_sfRight;
         private ArrayList m_sResourcesArray;
-        private Timer m_Timer;                  // Timeer used in Drag and Drop Operations
+        private Timer m_Timer;                  // Timer used in Drag and Drop Operations
         private ToolTip m_toolTip;
         private const int WM_HSCROLL = 0x114;       // Horizontal Scrolling Windows Message
         private const int WM_VSCROLL = 0x115;       // Vertical Scrolling Windows Message
         private const int WM_MOUSEWHEEL = 0x20a;    // Windows Mouse Scrolling Message
+        private System.Diagnostics.Stopwatch watch = new System.Diagnostics.Stopwatch();
+
 
         public delegate void CGAppointmentChangedHandler(object sender, CGAppointmentChangedArgs e);
@@ -90 +92 @@
             this.m_sfHour.LineAlignment = StringAlignment.Center;
             this.m_sfHour.Alignment = StringAlignment.Far;
-            this.m_bInitialUpdate = false;
+            // this.m_bInitialUpdate = false;
         }
 
@@ -113 +115 @@
             {
                 this.m_Timer.Stop();
+                this.m_Timer.Tick -= new EventHandler(this.tickEventHandler);
                 this.m_Timer.Dispose();
                 this.m_Timer = null;
@@ -232 +235 @@
         private void CalendarGrid_MouseDown(object sender, MouseEventArgs e)
         {
+            //watch.Restart();
             if (e.Button == MouseButtons.Left)
             {
@@ -247 +251 @@
         private void CalendarGrid_MouseMove(object Sender, MouseEventArgs e)
         {
+            //test
+            //System.Diagnostics.Debug.Write(watch.ElapsedMilliseconds + "\n");
+            //test
+
+            //if the left mouse button is down and we are moving the mouse...
             if (this.m_bMouseDown)
             {
+                //if Y axis is outside the top or bottom
                 if ((e.Y >= base.ClientRectangle.Bottom) || (e.Y <= base.ClientRectangle.Top))
                 {
+                    //start auto scrolling. m_bScrollDown decides whether we scroll up or down.
                     this.m_bScrollDown = e.Y >= base.ClientRectangle.Bottom;
-                }
+                    AutoDragStart();
+                }
+
+                //if Y axis within client rectagle, stop dragging (whether you started or not)
                 if ((e.Y < base.ClientRectangle.Bottom) && (e.Y > base.ClientRectangle.Top))
                 {
-                    bool bAutoDrag = this.m_bAutoDrag;
+                    AutoDragStop();
                 }
                 if (this.m_bSelectingRange)
@@ -278 +292 @@
             else
             {
+                //test
+                AutoDragStop(); //is this needed?
+                //test
                 int y = e.Y - base.AutoScrollPosition.Y;
                 int x = e.X - base.AutoScrollPosition.X;
@@ -348 +365 @@
             {
                 this.DrawGrid(e.Graphics);
+                /*
                 if (!this.m_bInitialUpdate)
                 {
@@ -354 +372 @@
                     this.m_bInitialUpdate = true;
                 }
+                 */
             }
         }
@@ -602 +621 @@
                         if (this.m_sResourcesArray.Count > 0)
                         {
+                            //IMP
+                            //this is the place where we the selected cells are drawn in Light Light Blue.
+                            //IMP
                             if (this.m_selectedRange.CellIsInRange(cellFromRowCol))
                             {
                                 g.FillRectangle(Brushes.Aquamarine, r);
+                                //g.FillRectangle(Brushes.AntiqueWhite, r);
                             }
                             else
@@ -1142 +1165 @@
         }
 
+        /// <summary>
+        /// Handles scrolling when the mouse button is down
+        /// </summary>
+        /// <param name="o"></param>
+        /// <param name="e"></param>
         private void tickEventHandler(object o, EventArgs e)
         {
+            //if there are still WM_TIME messages in the Queue after the timer is dead, don't do anything.
+            if (this.m_Timer == null) return;
+
             Point point = new Point(base.AutoScrollPosition.X, base.AutoScrollPosition.Y);
             int x = point.X;
             int num = point.Y * -1;
-            num = this.m_bScrollDown ? (num + 5) : (num - 5);
+            num = this.m_bScrollDown ? (num + 2) : (num - 2);
             point.Y = num;
             base.AutoScrollPosition = point;