Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
Jeopardy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hacksaar
Jeopardy
Commits
42e0ebb2
Commit
42e0ebb2
authored
Sep 03, 2016
by
Agrigor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed closeEvent, Code cleanup, ready to program the main gui next :)
parent
9ccebfad
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
80 additions
and
134 deletions
+80
-134
client/GUIs/start.ui
client/GUIs/start.ui
+2
-28
client/gui.py
client/gui.py
+78
-78
client/test.py
client/test.py
+0
-28
No files found.
client/GUIs/start.ui
View file @
42e0ebb2
...
...
@@ -51,14 +51,11 @@
<property
name=
"toolTip"
>
<string>
IPv4-Adresse
</string>
</property>
<property
name=
"inputMask"
>
<string>
000.000.000.000;_
</string>
</property>
<property
name=
"text"
>
<string
>
...
</string
>
<string
/
>
</property>
<property
name=
"maxLength"
>
<number>
15
</number>
<number>
32767
</number>
</property>
<property
name=
"cursorPosition"
>
<number>
0
</number>
...
...
@@ -66,9 +63,6 @@
<property
name=
"alignment"
>
<set>
Qt::AlignCenter
</set>
</property>
<property
name=
"placeholderText"
>
<string>
000.000.000.000
</string>
</property>
</widget>
</item>
</layout>
...
...
@@ -192,13 +186,6 @@
</item>
<item>
<layout
class=
"QVBoxLayout"
name=
"verticalLayout_2"
>
<item>
<widget
class=
"KSeparator"
name=
"kseparator"
>
<property
name=
"frameShadow"
>
<enum>
QFrame::Sunken
</enum>
</property>
</widget>
</item>
<item>
<widget
class=
"QLabel"
name=
"O_Msg"
>
<property
name=
"frameShape"
>
...
...
@@ -218,20 +205,7 @@
</layout>
</item>
</layout>
<zorder>
splitter
</zorder>
<zorder>
layoutWidget
</zorder>
<zorder>
layoutWidget
</zorder>
<zorder>
I_Start
</zorder>
<zorder>
O_Msg
</zorder>
<zorder>
kseparator
</zorder>
</widget>
<customwidgets>
<customwidget>
<class>
KSeparator
</class>
<extends>
QFrame
</extends>
<header>
kseparator.h
</header>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>
I_IPAdress
</tabstop>
<tabstop>
I_Connect
</tabstop>
...
...
client/gui.py
View file @
42e0ebb2
...
...
@@ -4,9 +4,7 @@
# ~~~~~~~~~~~~~~~~~~~~~~~~ IMPORT LIBRARIES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
import
sys
#import psutil
import
threading
import
socket
import
time
...
...
@@ -29,26 +27,25 @@ PLAYERS_MAX = 4
class
Comunication
:
def
__init__
(
self
,
ip
,
port
):
self
.
__ip
=
ip
self
.
__port
=
port
self
.
socketCreated
=
False
self
.
ip
=
ip
self
.
port
=
port
def
check_ip
(
self
):
try
:
socket
.
inet_aton
(
self
.
__
ip
)
socket
.
inet_aton
(
self
.
ip
)
return
True
except
OSError
:
return
False
def
create_client_socket
(
self
):
self
.
__
socket
=
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_DGRAM
)
self
.
__socket
.
bind
((
""
,
self
.
__
port
))
self
.
socket
=
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_DGRAM
)
self
.
socket
.
bind
((
""
,
self
.
port
))
def
receive
(
self
,
bytes
):
return
self
.
__
socket
.
recvfrom
(
bytes
)
return
self
.
socket
.
recvfrom
(
bytes
)
def
cleanup
(
self
):
self
.
__
socket
.
close
()
self
.
socket
.
close
()
class
Player
:
...
...
@@ -64,105 +61,105 @@ class Player:
class
GUI
:
def
__init__
(
self
):
self
.
players
=
[
Player
()
for
i
in
range
(
PLAYERS_MAX
)]
self
.
__app
=
QApplication
(
sys
.
argv
)
self
.
__start
=
StartGUI
(
self
.
players
)
self
.
__app
.
exec_
()
#self.kill_proc_tree(os.getpid())
#def kill_proc_tree(pid, including_parent=True):
#parent = psutil.Process(pid)
#if including_parent:
#parent.kill()
self
.
app
=
QApplication
(
sys
.
argv
)
self
.
start
=
StartGUI
()
sys
.
exit
(
self
.
app
.
exec_
())
class
StartGUI
:
def
__init__
(
self
,
players
):
self
.
__UI_Start
=
loadUi
(
"GUIs/start.ui"
)
class
StartGUI
(
QDialog
):
def
__init__
(
self
):
QDialog
.
__init__
(
self
)
self
.
UI_Start
=
loadUi
(
"GUIs/start.ui"
,
self
)
self
.
players
=
players
self
.
__player_name_entered
=
[
False
]
*
PLAYERS_MAX
self
.
__playerNameInputs
=
[
self
.
__UI_Start
.
I_NamePlayer1
,
self
.
__UI_Start
.
I_NamePlayer2
,
self
.
__UI_Start
.
I_NamePlayer3
,
self
.
__UI_Start
.
I_NamePlayer4
]
self
.
__UI_Start
.
connect
(
self
.
__UI_Start
.
I_Connect
,
SIGNAL
(
"clicked()"
),
self
.
connect
)
self
.
__UI_Start
.
connect
(
self
.
__UI_Start
.
I_Start
,
SIGNAL
(
"clicked()"
),
self
.
start
)
self
.
__UI_Start
.
connect
(
self
.
__UI_Start
.
I_NumberOfPlayers
,
SIGNAL
(
"valueChanged(int)"
),
self
.
show_names_input_field
)
self
.
__UI_Start
.
connect
(
self
.
__UI_Start
.
I_NamePlayer1
,
SIGNAL
(
"textChanged(QString)"
),
self
.
name_player_changed
)
self
.
__UI_Start
.
connect
(
self
.
__UI_Start
.
I_NamePlayer2
,
SIGNAL
(
"textChanged(QString)"
),
self
.
name_player_changed
)
self
.
__UI_Start
.
connect
(
self
.
__UI_Start
.
I_NamePlayer3
,
SIGNAL
(
"textChanged(QString)"
),
self
.
name_player_changed
)
self
.
__UI_Start
.
connect
(
self
.
__UI_Start
.
I_NamePlayer4
,
SIGNAL
(
"textChanged(QString)"
),
self
.
name_player_changed
)
self
.
__UI_Start
.
show
()
def
connect
(
self
):
self
.
socket
=
Comunication
(
str
(
self
.
__UI_Start
.
I_IPAdress
.
text
()),
PORT
)
if
self
.
socket
.
check_ip
()
and
not
self
.
socket
.
socketCreated
:
self
.
players
=
[
Player
()
for
i
in
range
(
PLAYERS_MAX
)]
self
.
player_name_entered
=
[
False
]
*
PLAYERS_MAX
self
.
playerNameInputs
=
[
self
.
UI_Start
.
I_NamePlayer1
,
self
.
UI_Start
.
I_NamePlayer2
,
self
.
UI_Start
.
I_NamePlayer3
,
self
.
UI_Start
.
I_NamePlayer4
]
self
.
UI_Start
.
connect
(
self
.
UI_Start
.
I_Connect
,
SIGNAL
(
"clicked()"
),
self
.
connect_server
)
self
.
UI_Start
.
connect
(
self
.
UI_Start
.
I_Start
,
SIGNAL
(
"clicked()"
),
self
.
start
)
self
.
UI_Start
.
connect
(
self
.
UI_Start
.
I_NumberOfPlayers
,
SIGNAL
(
"valueChanged(int)"
),
self
.
show_names_input_field
)
self
.
UI_Start
.
connect
(
self
.
UI_Start
.
I_NamePlayer1
,
SIGNAL
(
"textChanged(QString)"
),
self
.
name_player_changed
)
self
.
UI_Start
.
connect
(
self
.
UI_Start
.
I_NamePlayer2
,
SIGNAL
(
"textChanged(QString)"
),
self
.
name_player_changed
)
self
.
UI_Start
.
connect
(
self
.
UI_Start
.
I_NamePlayer3
,
SIGNAL
(
"textChanged(QString)"
),
self
.
name_player_changed
)
self
.
UI_Start
.
connect
(
self
.
UI_Start
.
I_NamePlayer4
,
SIGNAL
(
"textChanged(QString)"
),
self
.
name_player_changed
)
self
.
killSocket
=
True
self
.
UI_Start
.
show
()
def
connect_server
(
self
):
self
.
socket
=
Comunication
(
str
(
self
.
UI_Start
.
I_IPAdress
.
text
()),
PORT
)
if
self
.
socket
.
check_ip
():
self
.
socket
.
create_client_socket
()
self
.
socket
.
socketCreated
=
True
self
.
__UI_Start
.
I_Connect
.
setDisabled
(
True
)
self
.
__UI_Start
.
I_IPAdress
.
setDisabled
(
True
)
self
.
UI_Start
.
I_Connect
.
setDisabled
(
True
)
self
.
UI_Start
.
I_IPAdress
.
setDisabled
(
True
)
self
.
show_msg
(
"Connected"
)
self
.
__
UI_Start
.
I_NumberOfPlayers
.
setDisabled
(
False
)
self
.
__
UI_Start
.
I_NamePlayer1
.
setDisabled
(
False
)
self
.
UI_Start
.
I_NumberOfPlayers
.
setDisabled
(
False
)
self
.
UI_Start
.
I_NamePlayer1
.
setDisabled
(
False
)
else
:
self
.
show_msg
(
"No valid IP-address"
)
self
.
socket
.
socketCreated
=
False
def
show_names_input_field
(
self
,
number
):
number
-=
1
for
i
in
range
(
len
(
self
.
__
playerNameInputs
)):
if
i
<=
number
and
self
.
socket
.
socketCreated
:
self
.
__
playerNameInputs
[
i
].
setDisabled
(
False
)
for
i
in
range
(
len
(
self
.
playerNameInputs
)):
if
i
<=
number
:
self
.
playerNameInputs
[
i
].
setDisabled
(
False
)
else
:
self
.
__
playerNameInputs
[
i
].
setDisabled
(
True
)
self
.
playerNameInputs
[
i
].
setDisabled
(
True
)
if
number
>=
1
:
self
.
show_msg
(
str
(
number
+
1
)
+
" Players"
)
else
:
self
.
show_msg
(
"1 Player"
)
def
name_player_changed
(
self
,
name
):
for
i
in
range
(
len
(
self
.
__
playerNameInputs
)):
if
i
+
1
>
int
(
self
.
__UI_Start
.
O_NumberOfPlayers
.
text
())
or
len
(
self
.
__
playerNameInputs
[
i
].
text
())
>
1
:
self
.
__
player_name_entered
[
i
]
=
True
for
i
in
range
(
len
(
self
.
playerNameInputs
)):
if
i
+
1
>
int
(
self
.
UI_Start
.
O_NumberOfPlayers
.
text
())
or
len
(
self
.
playerNameInputs
[
i
].
text
())
>
1
:
self
.
player_name_entered
[
i
]
=
True
else
:
self
.
__
player_name_entered
[
i
]
=
False
if
all
(
self
.
__
player_name_entered
):
self
.
__
UI_Start
.
I_Start
.
setDisabled
(
False
)
self
.
player_name_entered
[
i
]
=
False
if
all
(
self
.
player_name_entered
):
self
.
UI_Start
.
I_Start
.
setDisabled
(
False
)
else
:
self
.
__
UI_Start
.
I_Start
.
setDisabled
(
True
)
self
.
UI_Start
.
I_Start
.
setDisabled
(
True
)
def
start
(
self
):
namesOfPlayers
=
[
str
(
self
.
__
UI_Start
.
I_NamePlayer1
.
text
()),
str
(
self
.
__
UI_Start
.
I_NamePlayer2
.
text
()),
str
(
self
.
__
UI_Start
.
I_NamePlayer3
.
text
()),
str
(
self
.
__
UI_Start
.
I_NamePlayer4
.
text
())]
for
i
in
range
(
0
,
int
(
self
.
__
UI_Start
.
O_NumberOfPlayers
.
text
())):
namesOfPlayers
=
[
str
(
self
.
UI_Start
.
I_NamePlayer1
.
text
()),
str
(
self
.
UI_Start
.
I_NamePlayer2
.
text
()),
str
(
self
.
UI_Start
.
I_NamePlayer3
.
text
()),
str
(
self
.
UI_Start
.
I_NamePlayer4
.
text
())]
for
i
in
range
(
0
,
int
(
self
.
UI_Start
.
O_NumberOfPlayers
.
text
())):
self
.
players
[
i
].
name
=
namesOfPlayers
[
i
]
self
.
main
=
MainGUI
(
self
.
socket
,
self
.
players
)
self
.
__UI_Start
.
close
()
self
.
killSocket
=
False
self
.
UI_Start
.
close
()
def
show_msg
(
self
,
msg
):
self
.
__
UI_Start
.
O_Msg
.
setText
(
msg
)
self
.
UI_Start
.
O_Msg
.
setText
(
msg
)
# TODO Include this method if window is closed by user
def
cleanup
(
self
):
if
self
.
socket
.
socketCreated
:
self
.
socket
.
cleanup
()
def
closeEvent
(
self
,
event
):
if
self
.
killSocket
:
try
:
self
.
socket
.
cleanup
()
except
:
pass
class
MainGUI
:
class
MainGUI
(
QMainWindow
)
:
def
__init__
(
self
,
socket
,
players
):
self
.
UI_Main
=
loadUi
(
"GUIs/main.ui"
)
QMainWindow
.
__init__
(
self
)
self
.
UI_Main
=
loadUi
(
"GUIs/main.ui"
,
self
)
self
.
socket
=
socket
self
.
players
=
players
self
.
UI_Main
.
connect
(
self
.
UI_Main
.
Button
,
SIGNAL
(
"clicked()"
),
self
.
button
)
self
.
UI_Main
.
connect
(
self
.
UI_Main
.
Button_2
,
SIGNAL
(
"clicked()"
),
self
.
button_2
)
self
.
show_msg
(
"No communication"
)
self
.
UI_Main
.
show
()
def
button_2
(
self
):
...
...
@@ -178,14 +175,16 @@ class MainGUI:
daten
,
addr
=
self
.
socket
.
receive
(
1024
)
self
.
show_msg
(
addr
[
0
]
+
" -> "
+
daten
.
decode
())
time
.
sleep
(
0.1
)
self
.
show_msg
(
"No communication"
)
def
show_msg
(
self
,
msg
):
self
.
UI_Main
.
O_Msg
.
setText
(
msg
)
# TODO Include this method if window is closed by user
def
cleanup
(
self
):
if
self
.
socket
.
socketCreated
:
def
closeEvent
(
self
,
event
):
try
:
self
.
socket
.
cleanup
()
except
:
pass
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ PROGRAM ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
@@ -193,7 +192,8 @@ class MainGUI:
# Start Client
client
=
GUI
()
if
__name__
==
"__main__"
:
GUI
()
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...
...
client/test.py
deleted
100644 → 0
View file @
9ccebfad
class
Player
:
def
__init__
(
self
):
self
.
punkte
=
0
self
.
name
=
"nix"
class
GUI
:
def
__init__
(
self
):
self
.
players
=
[
Player
()
for
i
in
range
(
4
)]
self
.
players
[
1
].
punkte
=
1337
self
.
players
[
1
].
name
=
"bla"
self
.
main
=
MAIN
(
self
.
players
)
class
MAIN
:
def
__init__
(
self
,
foo
):
self
.
foo
=
foo
self
.
show
()
def
show
(
self
):
print
(
self
.
foo
[
0
].
name
)
print
(
self
.
foo
[
1
].
name
)
bar
=
GUI
()
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