개정판 1af0f150
issue #000: TextControl thikness 굵기에 따라 글씨가 보이지 않는 현상, cloudText 진행중
Change-Id: I14b60cb925673f60292e16301f43403052929441
| KCOM/Properties/AssemblyInfo.cs | ||
|---|---|---|
| 11 | 11 |
[assembly: AssemblyDescription("")]
|
| 12 | 12 |
[assembly: AssemblyConfiguration("")]
|
| 13 | 13 |
[assembly: AssemblyCompany("DOFTECH")]
|
| 14 |
[assembly: AssemblyProduct("MArkus")]
|
|
| 14 |
[assembly: AssemblyProduct("MARKUS")]
|
|
| 15 | 15 |
[assembly: AssemblyCopyright("Copyright © 2020")]
|
| 16 | 16 |
[assembly: AssemblyTrademark("")]
|
| 17 | 17 |
[assembly: AssemblyCulture("")]
|
| ... | ... | |
| 51 | 51 |
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 |
| 52 | 52 |
// 지정되도록 할 수 있습니다. |
| 53 | 53 |
// [assembly: AssemblyVersion("1.0.*")]
|
| 54 |
[assembly: AssemblyVersion("5.5.7.0")]
|
|
| 55 |
[assembly: AssemblyFileVersion("5.5.7.0")]
|
|
| 54 |
[assembly: AssemblyVersion("5.5.10.0")]
|
|
| 55 |
[assembly: AssemblyFileVersion("5.5.10.0")]
|
|
| 56 | 56 |
[assembly: log4net.Config.XmlConfigurator(ConfigFile = "Log.config", Watch = true)] |
| MarkupToPDF/Controls/Polygon/CloudControl.cs | ||
|---|---|---|
| 717 | 717 |
/// <param name="p2"></param> |
| 718 | 718 |
/// <param name="reverse"></param> |
| 719 | 719 |
/// <returns></returns> |
| 720 |
public static PathFigure GenerateLineWithCloud(Point p1, Point p2, double arcLength_, bool reverse) |
|
| 720 |
public static PathFigure GenerateLineWithCloud(Point p1, Point p2, double arcLength_, bool reverse, double linesize_ = -20)
|
|
| 721 | 721 |
{
|
| 722 | 722 |
PathFigure pathFigure = new PathFigure(); |
| 723 |
|
|
| 724 |
var radius = arcLength_; |
|
| 725 |
double overlap = 5.5D / 6D; |
|
| 726 |
|
|
| 727 |
double delta = 2 * radius * overlap; |
|
| 728 |
|
|
| 729 |
pathFigure.StartPoint = p1; |
|
| 723 |
if (linesize_ == -20) |
|
| 724 |
linesize_ = arcLength_; |
|
| 725 |
var radius = linesize_;// linesize_;// arcLength_; |
|
| 726 |
double overlap = 5.5D / 6D; |
|
| 727 |
double delta = 2 * radius * overlap; |
|
| 730 | 728 |
pathFigure.IsClosed = false; |
| 731 | 729 |
pathFigure.IsFilled = false; |
| 732 |
var prev = p2; |
|
| 733 |
|
|
| 734 | 730 |
var curr = p1; |
| 731 |
var prev = p2; |
|
| 735 | 732 |
|
| 736 | 733 |
var dx = curr.X - prev.X; |
| 737 | 734 |
var dy = curr.Y - prev.Y; |
| 738 |
|
|
| 735 |
pathFigure.StartPoint = p1; // |
|
| 739 | 736 |
var len = Math.Sqrt(dx * dx + dy * dy); |
| 740 | 737 |
|
| 741 | 738 |
dx = dx / len; |
| MarkupToPDF/Controls/Text/TextControl.cs | ||
|---|---|---|
| 316 | 316 |
|
| 317 | 317 |
public void DrawingCloud() |
| 318 | 318 |
{
|
| 319 |
|
|
| 320 | 319 |
List<Point> pCloud = new List<Point> |
| 321 | 320 |
{
|
| 322 |
new Point(0, 0),
|
|
| 323 |
new Point(0, 0 + BoxHeight + 0),
|
|
| 324 |
new Point(0 + BoxWidth + 2, 0 + BoxHeight + 0),
|
|
| 325 |
new Point(0 + BoxWidth + 2 ,0)
|
|
| 321 |
new Point(-LineSize.Left * 0.5, -LineSize.Left * 0.5),
|
|
| 322 |
new Point(-LineSize.Left * 0.5, BoxHeight + LineSize.Left * 0.5),
|
|
| 323 |
new Point(BoxWidth + LineSize.Left * 0.5, BoxHeight + LineSize.Left * 0.5),
|
|
| 324 |
new Point(BoxWidth + LineSize.Left * 0.5 ,-LineSize.Left * 0.5)
|
|
| 326 | 325 |
}; |
| 327 | 326 |
//this.Base_TextBox.Select(Base_TextBox.Text.Length, 0); |
| 328 | 327 |
if (Base_TextPath != null) |
| ... | ... | |
| 337 | 336 |
break; |
| 338 | 337 |
case 1: |
| 339 | 338 |
{
|
| 340 |
PathData = (Generate_Rect(pCloud)); |
|
| 341 |
List<Point> pCloud2 = new List<Point> |
|
| 342 |
{
|
|
| 343 |
new Point(0, 0), |
|
| 344 |
new Point(0, 0 + BoxHeight + 0), |
|
| 345 |
new Point(0 + BoxWidth + 10, 0 + BoxHeight + 0), |
|
| 346 |
new Point(0 + BoxWidth + 10 ,0) |
|
| 347 |
}; |
|
| 339 |
PathData = (Generate_Rect(pCloud)); |
|
| 348 | 340 |
PathDataInner = (GenerateInner(pCloud)); |
| 349 | 341 |
} |
| 350 | 342 |
break; |
| 351 | 343 |
case 2: |
| 352 | 344 |
{
|
| 353 |
PathData = (Generate(pCloud, this.ArcLength)); |
|
| 345 |
PathData = (Generate(pCloud, this.ArcLength, this.LineSize.Left));
|
|
| 354 | 346 |
PathDataInner = (GenerateInner(pCloud)); |
| 355 | 347 |
} |
| 356 | 348 |
break; |
| ... | ... | |
| 398 | 390 |
return rectPathGeometry; |
| 399 | 391 |
} |
| 400 | 392 |
|
| 401 |
public static PathGeometry Generate(List<Point> pData, double _ArcLength = 20) |
|
| 393 |
public static PathGeometry Generate(List<Point> pData, double _ArcLength = 20, double _LineSize = 20)
|
|
| 402 | 394 |
{
|
| 403 | 395 |
var _pathGeometry = new PathGeometry(); |
| 404 | 396 |
double area = MathSet.AreaOf(pData); |
| ... | ... | |
| 406 | 398 |
int count = pData.Count; |
| 407 | 399 |
for (int i = 0; i < count; i++) |
| 408 | 400 |
{
|
| 409 |
PathFigure pathFigure = Polygon.CloudControl.GenerateLineWithCloud(pData[i % count], pData[(i + 1) % count], _ArcLength, reverse); |
|
| 401 |
PathFigure pathFigure = Polygon.CloudControl.GenerateLineWithCloud(pData[i % count], pData[(i + 1) % count], _ArcLength, reverse, _LineSize);
|
|
| 410 | 402 |
pathFigure.IsClosed = false; |
| 411 | 403 |
pathFigure.IsFilled = true; |
| 404 |
|
|
| 412 | 405 |
_pathGeometry.Figures.Add(pathFigure); |
| 413 | 406 |
} |
| 414 | 407 |
|
내보내기 Unified diff
