Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Simulator
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
letsgoING
ArduBlock Source
Simulator
Commits
868abafd
Commit
868abafd
authored
Mar 15, 2021
by
Leon Dieter
Browse files
Options
Downloads
Patches
Plain Diff
minor changes
parent
347e2994
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/tec/letsgoing/ardublock/simulator/view/GUI.java
+11
-8
11 additions, 8 deletions
src/tec/letsgoing/ardublock/simulator/view/GUI.java
with
11 additions
and
8 deletions
src/tec/letsgoing/ardublock/simulator/view/GUI.java
+
11
−
8
View file @
868abafd
...
@@ -122,7 +122,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
...
@@ -122,7 +122,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
modulPanel
.
add
(
modules
[
2
].
getPane
(),
BorderLayout
.
EAST
);
modulPanel
.
add
(
modules
[
2
].
getPane
(),
BorderLayout
.
EAST
);
modulPanel
.
add
(
modules
[
3
].
getPane
(),
BorderLayout
.
PAGE_END
);
modulPanel
.
add
(
modules
[
3
].
getPane
(),
BorderLayout
.
PAGE_END
);
topPanel
.
add
(
modulPanel
);
topPanel
.
add
(
modulPanel
);
mainPane
.
add
(
topPanel
,
BorderLayout
.
CENTER
);
mainPane
.
add
(
topPanel
,
BorderLayout
.
NORTH
);
//Panel der Buttons auf der rechten Seite wird ausgeblendet
//Panel der Buttons auf der rechten Seite wird ausgeblendet
//mainPane.add(createControlPanel(simu), BorderLayout.EAST);
//mainPane.add(createControlPanel(simu), BorderLayout.EAST);
mainPane
.
add
(
createSerialLog
(),
BorderLayout
.
PAGE_END
);
mainPane
.
add
(
createSerialLog
(),
BorderLayout
.
PAGE_END
);
...
@@ -144,15 +144,18 @@ public class GUI extends JFrame implements Runnable, ActionListener {
...
@@ -144,15 +144,18 @@ public class GUI extends JFrame implements Runnable, ActionListener {
WindowWidth
=
getWidth
();
WindowWidth
=
getWidth
();
topPanelWidth
=
topPanel
.
getWidth
();
topPanelWidth
=
topPanel
.
getWidth
();
topPanelHeight
=
topPanel
.
getHeight
();
topPanelHeight
=
topPanel
.
getHeight
();
System
.
out
.
println
(
"WindowWidth"
+
WindowWidth
);
System
.
out
.
println
(
"WindowHeight"
+
WindowHeight
);
System
.
out
.
println
(
"toppanelWidth"
+
topPanelWidth
);
System
.
out
.
println
(
"toppanelHeight"
+
topPanelHeight
);
//GUI wird nur gleichmig skaliert mit den Gren des kleineren Seitenverhtlnisses
//GUI wird nur gleichmig skaliert mit den Gren des kleineren Seitenverhtlnisses
if
(
topPanel
Width
<=
topPanel
Height
)
{
if
(
Window
Width
<=
Window
Height
)
{
xscale
=
topPanel
Width
;
xscale
=
Window
Width
;
yscale
=
topPanel
Width
;
yscale
=
Window
Width
;
}
}
else
{
else
{
xscale
=
topPanel
Height
;
xscale
=
Window
Height
;
yscale
=
topPanel
Height
;
yscale
=
Window
Height
;
}
}
//GUI wird upgedatet
//GUI wird upgedatet
...
@@ -309,7 +312,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
...
@@ -309,7 +312,7 @@ public class GUI extends JFrame implements Runnable, ActionListener {
if
(
size
>=
1000
)
{
if
(
size
>=
1000
)
{
serialLog
.
setRows
(
4
);
// Anzahl der Angezeigten Reihen
serialLog
.
setRows
(
3
);
// Anzahl der Angezeigten Reihen
}
}
else
if
(
size
<
1000
&&
size
>=
800
)
{
else
if
(
size
<
1000
&&
size
>=
800
)
{
serialLog
.
setRows
(
6
);
// Anzahl der Angezeigten Reihen
serialLog
.
setRows
(
6
);
// Anzahl der Angezeigten Reihen
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment