Merge branch 'SiChuanJiaoTou' of http://192.168.1.12:3000/maixinrong/measure into SiChuanJiaoTou

Forms/MainFrm.dfm

@@ -1298,7 +1298,7 @@ object MainForm: TMainForm
       0000000000000000000000000000000000000000000000000000F9947900FF36
       0000FD4E1E00FF360000F5C3B50000000000000000000000000000000000FA7C
       5A00FF360000F99479000000000000000000000000FF000000FF000000FF0000
-      00FF000000FF000000FF5252FAFF0C0CF9FF0C0CF9FF5252FAFF000000FF0000
+      00FF000000FFD8D8FEFF5252FAFF0D0DF9FF0D0DF9FF5252FAFFD8D8FEFF0000
       00FF000000FF000000FF000000FF000000FF0000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1306,8 +1306,8 @@ object MainForm: TMainForm
       00000000000000000000000000000000000000000000F3E6E300FE410E00FD4E
       1E0000000000FA7C5A00F5C3B500000000000000000000000000000000000000
       0000FD592D00FF360000F3E6E30000000000000000FF000000FF000000FF0000
-      00FF000000FF1010F9FF0000F9FF0000F9FF0000F9FF0000F9FF1010F9FF0000
-      00FF000000FF000000FF000000FF000000FF0000000000000000000000000000
+      00FFD7D7FEFF1010F9FF0000F9FF0000F9FF0000F9FF0000F9FF1010F9FFD7D7
+      FEFF000000FF000000FF000000FF000000FF0000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -1346,15 +1346,15 @@ object MainForm: TMainForm
       00000000000000000000000000000000000000000000F3E6E300FF360000FD59
       2D000000000000000000000000000000000000000000F5C3B500FA7C5A000000
       0000FD4D1D00FE420F00F3E6E30000000000000000FF000000FF000000FF0000
-      00FF000000FF1010F9FF0000F9FF0000F9FF0000F9FF0000F9FF1010F9FF0000
-      00FF000000FF000000FF000000FF000000FF0000000000000000000000000000
+      00FFD8D8FEFF1010F9FF0000F9FF0000F9FF0000F9FF0000F9FF1010F9FFD8D8
+      FEFF000000FF000000FF000000FF000000FF0000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000F9886900FF36
       0000FA7C5A0000000000000000000000000000000000F5C3B500FF360000FD4D
       1D00FF360000F99479000000000000000000000000FF000000FF000000FF0000
-      00FF000000FF000000FF5252FAFF0E0EF9FF0E0EF9FF5252FAFF000000FF0000
+      00FF000000FFDADAFEFF5252FAFF0E0EF9FF0E0EF9FF5252FAFFDADAFEFF0000
       00FF000000FF000000FF000000FF000000FF0000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -3062,9 +3062,9 @@ object MainForm: TMainForm
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000FFFFFFFF00000000F91FFFFF00000000
-      C10FFFFF00000000E107FFFF00000000C1E3FC3F0000000089F1F81F00000000
+      C10FFFFF00000000E107FFFF00000000C1E3F81F0000000089F1F00F00000000
       8DF1F00F000000008FF1F00F000000008FF1F00F000000008FB1F00F00000000
-      8F91F81F00000000C783FC3F00000000E087FFFF00000000E083FFFF00000000
+      8F91F00F00000000C783F81F00000000E087FFFF00000000E083FFFF00000000
       F89FFFFF00000000FFFFFFFF00000000FFFF0000F00FF00FFFFF0000C007C007
       800100008003800300000000800180013FFC000000000000000C000000000000
       0084000000000000008400000000000000000000000000000000000000000000

Frames/LeafXmjGlFme.dfm

@@ -21,6 +21,7 @@ object LeafXmjGlFrame: TLeafXmjGlFrame
     Selection.TransparentColor = False
     FrozenCol = 0
     FrozenRow = 0
+    OnCurrentChanged = zgLeafXmjCurrentChanged
     OnDrawCellText = zgLeafXmjDrawCellText
     OnMouseDown = zgLeafXmjMouseDown
     Align = alClient
@@ -344,7 +345,7 @@ object LeafXmjGlFrame: TLeafXmjGlFrame
         Title.Font.Charset = GB2312_CHARSET
         Title.Font.Color = clWindowText
         Title.Font.Height = -12
-        Title.Font.Name = #23435#20307
+        Title.Font.Name = 'smartSimSun'
         Title.Font.Style = []
         Alignment = taCenter
         Font.Charset = GB2312_CHARSET

Frames/LeafXmjGlFme.pas

@@ -36,6 +36,7 @@ type
       var ADefaultDraw: Boolean);
     procedure actnWithoutHighLightExecute(Sender: TObject);
     procedure actnWithoutHighLightUpdate(Sender: TObject);
+    procedure zgLeafXmjCurrentChanged(Sender: TObject; Col, Row: Integer);
   private
     FLeafXmjGlData: TLeafXmjGlData;
   public
@@ -119,19 +120,9 @@ end;
 procedure TLeafXmjGlFrame.zgLeafXmjDrawCellText(ACanvas: TCanvas;
   const ARect: TRect; const ACoord: TPoint; AGrid: TZJGrid;
   const Text: String; var ADefaultDraw: Boolean);
-
-  procedure GetBitmap(var AImage: TBitmap);
-  begin
-    if (TProjectData(FLeafXmjGlData.ProjectData).ProjProperties.LeafXmjGlHighLight = 1) and
-      FLeafXmjGlData.CheckWithoutUsedQuantity(ACoord.Y - zgLeafXmj.FixedRowCount) then
-      MainForm.Images.GetBitmap(53, AImage)
-    else
-      AImage := nil;
-  end;
-
 const
-  rIconWidth = 16;
-  rIconHeight = 16;
+  rIconWidth = 8;
+  rIconHeight = 8;
 var
   Img: TBitmap;
   Cell: TZjCell;
@@ -139,19 +130,19 @@ var
 begin
   if (ACoord.X = 1) and (ACoord.Y > zgLeafXmj.FixedRowCount - 1) then
   begin
-    Cell := zgLeafXmj.Cells[ACoord.X, ACoord.Y];
-    Img := TBitmap.Create;
-    try
-      GetBitmap(Img);
-      rImg := Rect(ARect.left + (ARect.Right - ARect.Left - rIconWidth) div 2,
-          ARect.Top + (ARect.Bottom - ARect.Top - rIconHeight) div 2,
-          ARect.left + (ARect.Right - ARect.Left - rIconWidth) div 2 + rIconWidth,
-          ARect.Bottom - (ARect.Bottom - ARect.Top - rIconHeight) div 2);
-      ACanvas.StretchDraw(rImg, Img);
-      ADefaultDraw := False;
-    finally
-      Img.Free;
+    rImg := Rect(ARect.left + (ARect.Right - ARect.Left - rIconWidth) div 2,
+        ARect.Top + (ARect.Bottom - ARect.Top - rIconHeight) div 2,
+        ARect.left + (ARect.Right - ARect.Left - rIconWidth) div 2 + rIconWidth,
+        ARect.Bottom - (ARect.Bottom - ARect.Top - rIconHeight) div 2);
+    if (TProjectData(FLeafXmjGlData.ProjectData).ProjProperties.LeafXmjGlHighLight = 1) and
+      FLeafXmjGlData.CheckWithoutUsedQuantity(ACoord.Y - zgLeafXmj.FixedRowCount) then
+    begin
+      ACanvas.Pen.Width := 0;
+      ACanvas.Pen.Color := clRed;
+      ACanvas.Brush.Color := clRed;
+      ACanvas.Ellipse(rImg);
     end;
+    ADefaultDraw := False;
   end;
 end;
 
@@ -175,4 +166,10 @@ begin
   end;
 end;
 
+procedure TLeafXmjGlFrame.zgLeafXmjCurrentChanged(Sender: TObject; Col,
+  Row: Integer);
+begin
+  zgLeafXmj.InvalidateRow(Row);
+end;
+
 end.