Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
8e7db605
Kaydet (Commit)
8e7db605
authored
Kas 04, 2014
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
rename nNeuWink->nNewAngle
Change-Id: Ic0b63a516d56ffc12e08e25d33c874162ce19d69
üst
69ae25ed
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
37 deletions
+37
-37
svddrgmt.cxx
svx/source/svdraw/svddrgmt.cxx
+37
-37
No files found.
svx/source/svdraw/svddrgmt.cxx
Dosyayı görüntüle @
8e7db605
...
@@ -1087,12 +1087,12 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
...
@@ -1087,12 +1087,12 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
{
{
Point
aRef
(
pH
->
GetPos
());
Point
aRef
(
pH
->
GetPos
());
long
nWink
=
NormAngle360
(
GetAngle
(
aPnt
-
aRef
));
long
nWink
=
NormAngle360
(
GetAngle
(
aPnt
-
aRef
));
long
nNe
uWink
=
nWink
;
long
nNe
wAngle
=
nWink
;
nNe
uWink
+=
nSA
/
2
;
nNe
wAngle
+=
nSA
/
2
;
nNe
uWink
/=
nSA
;
nNe
wAngle
/=
nSA
;
nNe
uWink
*=
nSA
;
nNe
wAngle
*=
nSA
;
nNe
uWink
=
NormAngle360
(
nNeuWink
);
nNe
wAngle
=
NormAngle360
(
nNewAngle
);
double
a
=
(
nNe
uWink
-
nWink
)
*
nPi180
;
double
a
=
(
nNe
wAngle
-
nWink
)
*
nPi180
;
double
nSin
=
sin
(
a
);
double
nSin
=
sin
(
a
);
double
nCos
=
cos
(
a
);
double
nCos
=
cos
(
a
);
RotatePoint
(
aPnt
,
aRef
,
nSin
,
nCos
);
RotatePoint
(
aPnt
,
aRef
,
nSin
,
nCos
);
...
@@ -1100,8 +1100,8 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
...
@@ -1100,8 +1100,8 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
// eliminate rounding errors for certain values
// eliminate rounding errors for certain values
if
(
nSA
==
9000
)
if
(
nSA
==
9000
)
{
{
if
(
nNe
uWink
==
0
||
nNeuWink
==
18000
)
aPnt
.
Y
()
=
aRef
.
Y
();
if
(
nNe
wAngle
==
0
||
nNewAngle
==
18000
)
aPnt
.
Y
()
=
aRef
.
Y
();
if
(
nNe
uWink
==
9000
||
nNeuWink
==
27000
)
aPnt
.
X
()
=
aRef
.
X
();
if
(
nNe
wAngle
==
9000
||
nNewAngle
==
27000
)
aPnt
.
X
()
=
aRef
.
X
();
}
}
if
(
nSA
==
4500
)
if
(
nSA
==
4500
)
...
@@ -2170,7 +2170,7 @@ void SdrDragRotate::MoveSdrDrag(const Point& rPnt_)
...
@@ -2170,7 +2170,7 @@ void SdrDragRotate::MoveSdrDrag(const Point& rPnt_)
Point
aPnt
(
rPnt_
);
Point
aPnt
(
rPnt_
);
if
(
DragStat
().
CheckMinMoved
(
aPnt
))
if
(
DragStat
().
CheckMinMoved
(
aPnt
))
{
{
long
nNe
uWink
=
NormAngle360
(
GetAngle
(
aPnt
-
DragStat
().
GetRef1
())
-
nWink0
);
long
nNe
wAngle
=
NormAngle360
(
GetAngle
(
aPnt
-
DragStat
().
GetRef1
())
-
nWink0
);
long
nSA
=
0
;
long
nSA
=
0
;
if
(
getSdrDragView
().
IsAngleSnapEnabled
())
if
(
getSdrDragView
().
IsAngleSnapEnabled
())
...
@@ -2181,17 +2181,17 @@ void SdrDragRotate::MoveSdrDrag(const Point& rPnt_)
...
@@ -2181,17 +2181,17 @@ void SdrDragRotate::MoveSdrDrag(const Point& rPnt_)
if
(
nSA
!=
0
)
if
(
nSA
!=
0
)
{
// angle snapping
{
// angle snapping
nNe
uWink
+=
nSA
/
2
;
nNe
wAngle
+=
nSA
/
2
;
nNe
uWink
/=
nSA
;
nNe
wAngle
/=
nSA
;
nNe
uWink
*=
nSA
;
nNe
wAngle
*=
nSA
;
}
}
nNe
uWink
=
NormAngle180
(
nNeuWink
);
nNe
wAngle
=
NormAngle180
(
nNewAngle
);
if
(
nWink
!=
nNe
uWink
)
if
(
nWink
!=
nNe
wAngle
)
{
{
sal_uInt16
nSekt0
=
GetAngleSector
(
nWink
);
sal_uInt16
nSekt0
=
GetAngleSector
(
nWink
);
sal_uInt16
nSekt1
=
GetAngleSector
(
nNe
uWink
);
sal_uInt16
nSekt1
=
GetAngleSector
(
nNe
wAngle
);
if
(
nSekt0
==
0
&&
nSekt1
==
3
)
if
(
nSekt0
==
0
&&
nSekt1
==
3
)
bRight
=
true
;
bRight
=
true
;
...
@@ -2199,7 +2199,7 @@ void SdrDragRotate::MoveSdrDrag(const Point& rPnt_)
...
@@ -2199,7 +2199,7 @@ void SdrDragRotate::MoveSdrDrag(const Point& rPnt_)
if
(
nSekt0
==
3
&&
nSekt1
==
0
)
if
(
nSekt0
==
3
&&
nSekt1
==
0
)
bRight
=
false
;
bRight
=
false
;
nWink
=
nNe
uWink
;
nWink
=
nNe
wAngle
;
double
a
=
nWink
*
nPi180
;
double
a
=
nWink
*
nPi180
;
double
nSin1
=
sin
(
a
);
// calculate now, so as little time as possible
double
nSin1
=
sin
(
a
);
// calculate now, so as little time as possible
double
nCos1
=
cos
(
a
);
// passes between Hide() and Show()
double
nCos1
=
cos
(
a
);
// passes between Hide() and Show()
...
@@ -2361,24 +2361,24 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
...
@@ -2361,24 +2361,24 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
Point
aRef
(
DragStat
().
GetRef1
());
Point
aRef
(
DragStat
().
GetRef1
());
Point
aDif
(
aPnt
-
aRef
);
Point
aDif
(
aPnt
-
aRef
);
long
nNe
uWink
=
0
;
long
nNe
wAngle
=
0
;
if
(
bSlant
)
if
(
bSlant
)
{
{
nNe
uWink
=
NormAngle180
(
-
(
GetAngle
(
aDif
)
-
nWink0
));
nNe
wAngle
=
NormAngle180
(
-
(
GetAngle
(
aDif
)
-
nWink0
));
if
(
bVertical
)
if
(
bVertical
)
nNe
uWink
=
NormAngle180
(
-
nNeuWink
);
nNe
wAngle
=
NormAngle180
(
-
nNewAngle
);
}
}
else
else
{
{
if
(
bVertical
)
if
(
bVertical
)
nNe
uWink
=
NormAngle180
(
GetAngle
(
aDif
));
nNe
wAngle
=
NormAngle180
(
GetAngle
(
aDif
));
else
else
nNe
uWink
=
NormAngle180
(
-
(
GetAngle
(
aDif
)
-
9000
));
nNe
wAngle
=
NormAngle180
(
-
(
GetAngle
(
aDif
)
-
9000
));
if
(
nNe
uWink
<-
9000
||
nNeuWink
>
9000
)
if
(
nNe
wAngle
<-
9000
||
nNewAngle
>
9000
)
nNe
uWink
=
NormAngle180
(
nNeuWink
+
18000
);
nNe
wAngle
=
NormAngle180
(
nNewAngle
+
18000
);
if
(
bResize
)
if
(
bResize
)
{
{
...
@@ -2398,26 +2398,26 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
...
@@ -2398,26 +2398,26 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
}
}
}
}
bool
bNeg
=
nNe
uWink
<
0
;
bool
bNeg
=
nNe
wAngle
<
0
;
if
(
bNeg
)
if
(
bNeg
)
nNe
uWink
=-
nNeuWink
;
nNe
wAngle
=-
nNewAngle
;
if
(
nSA
!=
0
)
if
(
nSA
!=
0
)
{
// angle snapping
{
// angle snapping
nNe
uWink
+=
nSA
/
2
;
nNe
wAngle
+=
nSA
/
2
;
nNe
uWink
/=
nSA
;
nNe
wAngle
/=
nSA
;
nNe
uWink
*=
nSA
;
nNe
wAngle
*=
nSA
;
}
}
nNe
uWink
=
NormAngle360
(
nNeuWink
);
nNe
wAngle
=
NormAngle360
(
nNewAngle
);
bUpSideDown
=
nNe
uWink
>
9000
&&
nNeuWink
<
27000
;
bUpSideDown
=
nNe
wAngle
>
9000
&&
nNewAngle
<
27000
;
if
(
bSlant
)
if
(
bSlant
)
{
// calculate resize for slant
{
// calculate resize for slant
// when angle snapping is activated, disable 89 degree limit
// when angle snapping is activated, disable 89 degree limit
long
nTmpWink
=
nNe
uWink
;
long
nTmpWink
=
nNe
wAngle
;
if
(
bUpSideDown
)
nNe
uWink
-=
18000
;
if
(
bUpSideDown
)
nNe
wAngle
-=
18000
;
if
(
bNeg
)
nTmpWink
=-
nTmpWink
;
if
(
bNeg
)
nTmpWink
=-
nTmpWink
;
bResize
=
true
;
bResize
=
true
;
double
nCos
=
cos
(
nTmpWink
*
nPi180
);
double
nCos
=
cos
(
nTmpWink
*
nPi180
);
...
@@ -2425,15 +2425,15 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
...
@@ -2425,15 +2425,15 @@ void SdrDragShear::MoveSdrDrag(const Point& rPnt)
Kuerzen
(
aFact
,
10
);
// three decimals should be enough
Kuerzen
(
aFact
,
10
);
// three decimals should be enough
}
}
if
(
nNe
uWink
>
8900
)
if
(
nNe
wAngle
>
8900
)
nNe
uWink
=
8900
;
nNe
wAngle
=
8900
;
if
(
bNeg
)
if
(
bNeg
)
nNe
uWink
=-
nNeuWink
;
nNe
wAngle
=-
nNewAngle
;
if
(
nWink
!=
nNe
uWink
||
aFact
!=
aNeuFact
)
if
(
nWink
!=
nNe
wAngle
||
aFact
!=
aNeuFact
)
{
{
nWink
=
nNe
uWink
;
nWink
=
nNe
wAngle
;
aFact
=
aNeuFact
;
aFact
=
aNeuFact
;
double
a
=
nWink
*
nPi180
;
double
a
=
nWink
*
nPi180
;
double
nTan1
=
tan
(
a
);
// calculate now, so as little time as possible passes between Hide() and Show()
double
nTan1
=
tan
(
a
);
// calculate now, so as little time as possible passes between Hide() and Show()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment