Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kumir2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
kumir
kumir2
Commits
e86c0e01
Commit
e86c0e01
authored
Sep 06, 2016
by
Denis Khachko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Draw net fix .
parent
522fa138
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
18 deletions
+37
-18
src/actors/draw/drawmodule.cpp
src/actors/draw/drawmodule.cpp
+27
-14
src/shared/widgets/draw_turtle_field.cpp
src/shared/widgets/draw_turtle_field.cpp
+2
-2
src/shared/widgets/draw_turtle_field.h
src/shared/widgets/draw_turtle_field.h
+8
-2
No files found.
src/actors/draw/drawmodule.cpp
View file @
e86c0e01
...
...
@@ -689,14 +689,17 @@ void DrawView::resizeEvent ( QResizeEvent * event )
}
if
(
pixel_per_cell
<
15
)
{
stepX
=
DRAW
->
NetStepX
()
*
2
;
stepY
=
DRAW
->
NetStepX
()
*
2
;
//if(stepX>5)stepX=(int)(stepX-0.5);
//if(stepY>5)stepY=(int)(stepY-0.5);
while
(
pixel_per_cell
<
15
){
pixel_per_cell
=
stepX
/
(
1
/
c_scale
);
stepX
=
stepX
*
1.5
;
stepY
=
stepY
*
1.5
;
}
DRAW
->
setNetStepX
(
stepX
);
DRAW
->
setNetStepY
(
stepY
);
DRAW
->
drawNet
();
//DRAW->scalePen(1.2);
}
DRAW
->
setNetStepX
(
stepX
);
...
...
@@ -708,7 +711,7 @@ void DrawView::resizeEvent ( QResizeEvent * event )
else
{
double
pixel_per_cell
=
DRAW
->
NetStepX
()
/
(
1
/
c_scale
);
if
(
!
net
)
pixel_per_cell
=
lastStep
/
(
1
/
c_scale
);
//
if(!net)pixel_per_cell=lastStep/(1/c_scale);
if
(
pixel_per_cell
<
15
)
//Net step too short
{
net
=
false
;
...
...
@@ -720,8 +723,8 @@ void DrawView::resizeEvent ( QResizeEvent * event )
{
net
=
true
;
smallNetLabel
->
hide
();
DRAW
->
setNetStepX
(
lastStep
);
DRAW
->
setNetStepY
(
lastStep
);
//
DRAW->setNetStepX(lastStep);
//
DRAW->setNetStepY(lastStep);
}
if
(
pixel_per_cell
>
this
->
width
()
*
2
)
{
...
...
@@ -1128,15 +1131,19 @@ void DrawModule::drawNet()
CurView
->
setZoom
(
50
);
CurView
->
setNet
();
mPen
->
setScale
(
0.05
);
CurView
->
centerOn
(
3
,
-
3
);
if
(
isAutoNet
())
{
setNetStepX
(
1
);
setNetStepY
(
1
);
CurView
->
centerOn
(
3
,
-
3
);
navigator
->
updateSelf
(
1
,
1
);
}
CurView
->
setNet
();
drawNet
();
navigator
->
updateSelf
(
1
,
1
);
};
void
DrawModule
::
zoomFullDraw
()
...
...
@@ -1241,9 +1248,15 @@ void DrawModule::drawNet()
void
DrawModule
::
netStepChange
(
double
value
)
{
double
oldValue
=
NetStepY
();
setNetStepY
(
value
);
setNetStepX
(
value
);
if
(
oldValue
!=
value
&&
value
>
navigator
->
netStepYS
->
minimum
()
)
drawNet
();
if
(
oldValue
!=
value
&&
value
!=
0
)
{
getCurView
()
->
setNet
();
drawNet
();
}
}
void
DrawModule
::
redraw
()
{
...
...
src/shared/widgets/draw_turtle_field.cpp
View file @
e86c0e01
...
...
@@ -77,12 +77,12 @@ DrawNavigator::DrawNavigator( QWidget * parent ){
void
DrawNavigator
::
XvalueChange
(
double
value
)
{
emit
netStepChange
(
value
);
netStepYS
->
setSingleStep
(
value
/
10
);
netStepXS
->
setSingleStep
(
Zoom
/
500
);
qDebug
()
<<
"Zoom"
<<
Zoom
<<
" Step"
<<
netStepXS
->
singleStep
();
netStepYS
->
setValue
(
value
);
emit
netStepChange
(
value
);
}
void
DrawNavigator
::
YvalueChange
(
double
value
)
...
...
src/shared/widgets/draw_turtle_field.h
View file @
e86c0e01
...
...
@@ -40,8 +40,8 @@ public:
}
void
updateSelf
(
double
netStepX
,
double
netStepY
)
{
if
(
50
/
Zoom
>=
1
)
zoomText
->
setPlainText
(
"1:"
+
QString
::
number
(
50
/
Zoom
));
else
zoomText
->
setPlainText
(
QString
::
number
(
Zoom
/
50
)
+
":1"
);
if
(
50
/
Zoom
>=
1
)
zoomText
->
setPlainText
(
"1:"
+
QString
::
number
(
50
/
Zoom
,
'f'
,
2
));
else
zoomText
->
setPlainText
(
QString
::
number
(
Zoom
/
50
,
'f'
,
2
)
+
":1"
);
qDebug
()
<<
"Zoom"
<<
Zoom
;
//double pixel_per_cell=DRAW->NetStepX()/(1/c_scale);
if
(
isAutonet
->
isChecked
()){
...
...
@@ -55,6 +55,12 @@ public:
netStepXS
->
setSingleStep
(
Zoom
/
500
);
}
else
{
netStepXS
->
setMaximum
(
99999
);
netStepXS
->
setMinimum
(
0.00001
);
// netStepXS->setValue(netStepX);
// netStepYS->setValue(netStepY);
}
update
();
}
...
...
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