개정판 5a9353a9
Change arc depth for cloud from 0.8 to 0.55
| KCOM/Controls/AdornerFinal.xaml.cs | ||
|---|---|---|
| 253 | 253 |
DragThumb.RenderTransform = new RotateTransform() |
| 254 | 254 |
{
|
| 255 | 255 |
Angle = (member as TextControl).Angle, |
| 256 |
//CenterX = middle.X, |
|
| 257 |
//CenterY = middle.Y, |
|
| 258 | 256 |
}; |
| 259 | 257 |
|
| 260 | 258 |
AdornerBorder.RenderTransformOrigin = new Point(0.0, 0.0); |
| 261 | 259 |
AdornerBorder.RenderTransform = new RotateTransform() |
| 262 | 260 |
{
|
| 263 | 261 |
Angle = (member as TextControl).Angle, |
| 264 |
//CenterX = middle.X, |
|
| 265 |
//CenterY = middle.Y, |
|
| 266 | 262 |
}; |
| 267 | 263 |
Observable.FromEventPattern(((TextControl)member), "PropertyChanged").Subscribe(a => |
| 268 | 264 |
{
|
| ... | ... | |
| 279 | 275 |
this.ContainerContent.Children.Remove(member); |
| 280 | 276 |
this.Visibility = Visibility.Collapsed; |
| 281 | 277 |
} |
| 282 |
|
|
| 283 |
//((TextControl)member).UnEditingMode(); |
|
| 284 |
//((TextControl)member).Base_TextBlock.Visibility = Visibility.Collapsed; |
|
| 285 |
//((TextControl)member).Base_Border.Visibility = Visibility.Collapsed; |
|
| 286 |
//((TextControl)member).Base_TextPath.Visibility = Visibility.Collapsed; |
|
| 287 | 278 |
}); |
| 288 | 279 |
break; |
| 289 | 280 |
default: |
| ... | ... | |
| 439 | 430 |
{
|
| 440 | 431 |
if ((MemberSet.First().DrawingData as TextControl).Angle != 0) |
| 441 | 432 |
{
|
| 433 |
///TODO: 원점 설정 |
|
| 442 | 434 |
trRotate.Angle = (MemberSet.First().DrawingData as TextControl).Angle; |
| 443 | 435 |
trRotateThumb.Angle = (MemberSet.First().DrawingData as TextControl).Angle; |
| 444 | 436 |
} |
| ... | ... | |
| 2213 | 2205 |
CenterPoint = MathSet.FindCentroid(AllPointSet); |
| 2214 | 2206 |
Point pt = Mouse.GetPosition(this); |
| 2215 | 2207 |
|
| 2216 |
//if ((MemberSet.First() as AdornerMember).DrawingData.GetType().Name != "TextControl") |
|
| 2217 |
{
|
|
| 2218 |
Point vec1 = new Point(this.rotatePoint.X - CenterPoint.X, this.rotatePoint.Y - CenterPoint.Y); |
|
| 2219 |
Point vec2 = new Point(pt.X - CenterPoint.X, pt.Y - CenterPoint.Y); |
|
| 2220 |
dDeltaAngle = (MathSet.getAngleBetweenVectors(vec1, vec2)); |
|
| 2221 |
} |
|
| 2222 |
//else |
|
| 2223 |
//{
|
|
| 2224 |
// //if (IsTextAngle || RotateFlag) |
|
| 2225 |
// //{
|
|
| 2226 |
// // AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle + 5; |
|
| 2227 |
// //} |
|
| 2228 |
// //else |
|
| 2229 |
// //{
|
|
| 2230 |
// // AngleValue = ((MemberSet.First() as AdornerMember).DrawingData as TextControl).Angle - 5; |
|
| 2231 |
// //} |
|
| 2232 |
//} |
|
| 2208 |
Point vec1 = new Point(this.rotatePoint.X - CenterPoint.X, this.rotatePoint.Y - CenterPoint.Y); |
|
| 2209 |
Point vec2 = new Point(pt.X - CenterPoint.X, pt.Y - CenterPoint.Y); |
|
| 2210 |
dDeltaAngle = (MathSet.getAngleBetweenVectors(vec1, vec2)); |
|
| 2233 | 2211 |
|
| 2234 | 2212 |
AngleValue += dDeltaAngle; |
| 2235 | 2213 |
if (AngleValue > 360) AngleValue -= 360; |
내보내기 Unified diff
