Skip to content

Commit

Permalink
Fixed issue #808 by resetting POV once the character gets deleted
Browse files Browse the repository at this point in the history
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
  • Loading branch information
TheJackiMonster committed Nov 30, 2021
1 parent a63da8d commit 77eee85
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
13 changes: 11 additions & 2 deletions manuskript/mainWindow.py
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,15 @@ def updateCharacterPOVState(self, ID):
#don't know what's up with this
pass

def deleteCharacter(self):
ID = self.lstCharacters.removeCharacter()
if ID is None:
return
for itemID in self.mdlOutline.findItemsByPOV(ID):
item = self.mdlOutline.getItemByID(itemID)
if item:
item.resetPOV()

###############################################################################
# PLOTS
###############################################################################
Expand Down Expand Up @@ -965,7 +974,7 @@ def makeConnections(self):
self.tblPersoInfos.setModel(self.mdlCharacter)
try:
self.btnAddPerso.clicked.connect(self.lstCharacters.addCharacter, F.AUC)
self.btnRmPerso.clicked.connect(self.lstCharacters.removeCharacter, F.AUC)
self.btnRmPerso.clicked.connect(self.deleteCharacter, F.AUC)

self.btnPersoColor.clicked.connect(self.lstCharacters.choseCharacterColor, F.AUC)
self.chkPersoPOV.stateChanged.connect(self.lstCharacters.changeCharacterPOVState, F.AUC)
Expand Down Expand Up @@ -1122,7 +1131,7 @@ def breakConnections(self):

# Characters
self.disconnectAll(self.btnAddPerso.clicked, self.lstCharacters.addCharacter)
self.disconnectAll(self.btnRmPerso.clicked, self.lstCharacters.removeCharacter)
self.disconnectAll(self.btnRmPerso.clicked, self.deleteCharacter)

self.disconnectAll(self.btnPersoColor.clicked, self.lstCharacters.choseCharacterColor)
self.disconnectAll(self.chkPersoPOV.stateChanged, self.lstCharacters.changeCharacterPOVState)
Expand Down
3 changes: 3 additions & 0 deletions manuskript/models/outlineItem.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ def compile(self):
def POV(self):
return self.data(self.enum.POV)

def resetPOV(self):
self.setData(self.enum.POV, None)

def status(self):
return self.data(self.enum.status)

Expand Down
6 changes: 4 additions & 2 deletions manuskript/ui/views/characterTreeView.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,10 @@ def removeCharacter(self):
Removes selected character.
"""
ID = self.currentCharacterID()
if ID:
self._model.removeCharacter(ID)
if ID is None:
return None
self._model.removeCharacter(ID)
return ID

def choseCharacterColor(self):
ID = self.currentCharacterID()
Expand Down

0 comments on commit 77eee85

Please sign in to comment.