lexonomy/lexonomy_custom_editor
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

example translations and sense translation now unified, should behave very simmilary

Browse Source 
- import
- export
- view
- edite translation events
This commit is contained in:
Ozbolt Menegatti
2020-01-23 22:51:15 +01:00
parent b84d43bf9d
commit 513cffbbd9
9 changed files with 100 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/message/show_messages.py
View File

@@ -94,25 +94,31 @@ class ShowEditTranslation(ClickMessage):
# fount the one!
translation.make_copy()
model.modal_set(lambda: modals.edit_translation(
translation, cidx, num_clusters, EditTranslation(translation, cidx)))
translation, (cidx, num_clusters), EditTranslation(translation, cidx)))
return
console.log("Should not be here!")
# if here, that his must be example translation
translation.make_copy()
model.modal_set(lambda: modals.edit_translation(
translation, None, EditTranslation(translation, -1)))
class ShowAddTranslation(ClickMessage):
def update_model(self, model):
chosen_sense = self.get_arg(0, Sense)
chosen_sense_or_example = self.get_arg(0)
for sense in model.entry.senses:
if sense == chosen_sense:
translation = Translation.new_empty()
translation.make_copy()
model.modal_set(lambda: modals.edit_translation(
translation, -1, len(sense.translations), AddTranslation(translation, -1, sense)))
return
console.log("Should not be here!")
if isinstance(chosen_sense_or_example, Sense):
cluster = (-1, len(chosen_sense_or_example.translations))
else:
cluster = None
translation = Translation.new_empty()
translation.make_copy()
model.modal_set(lambda: modals.edit_translation(
translation,
cluster,
AddTranslation(translation, -1, chosen_sense_or_example)))
class ShowEntryLabelsEdit(ClickMessage):

32
src/message/translation_edit.py
View File

@@ -7,11 +7,23 @@ from model.sense import Sense
def get_translation_location(entry, translation):
for si, sense in enumerate(entry.senses):
for ci, cluster in enumerate(sense.translations):
def find_in_clusters(si, clusters):
for ci, cluster in enumerate(clusters):
for ti, search_translation in enumerate(cluster):
if search_translation == translation:
return (si, ci, ti), (sense, cluster)
return None
for si, sense in enumerate(entry.senses):
res = find_in_clusters(si, sense.translations)
if res is not None:
return res
for example in sense.examples:
res = find_in_clusters(si, example.translations)
if res is not None:
return res
window.console.log("should not be here...")
class EditTranslation(DataChgClickMessage):
@@ -42,23 +54,23 @@ class EditTranslation(DataChgClickMessage):
# we are done, lets return
return
def do_cluster_change(self, sense, cluster, cidx, tidx, new_cluster_idx):
def do_cluster_change(self, sense_or_example, cluster, cidx, tidx, new_cluster_idx):
# remove the translation from the old cluster
cluster.splice(tidx, 1)
# we maybe are creating a new cluster, handle that
if len(sense.translations) == new_cluster_idx:
sense.translations.append([self.translation])
elif len(sense.translations) > new_cluster_idx:
if len(sense_or_example.translations) == new_cluster_idx:
sense_or_example.translations.append([self.translation])
elif len(sense_or_example.translations) > new_cluster_idx:
# lets append the translation to new cluster
sense.translations[new_cluster_idx].append(self.translation)
sense_or_example.translations[new_cluster_idx].append(self.translation)
else:
raise ValueError("Bad new cluster idx :(")
# we still hols cluster reference, check if empty and remove if necessary
# we still hold cluster reference, check if empty and remove if necessary
# we cant do this earlier since indexes change and yeah, fun stuff
if len(cluster) == 0:
sense.translations.splice(cidx, 1)
sense_or_example.translations.splice(cidx, 1)
class MoveRight(DataChgClickMessage):
@@ -97,5 +109,5 @@ class AddTranslation(EditTranslation):
# sense was actually given in constructor in third place
# we make a dummy cluster, cluster_idx and translation_idx
# we give a correct new_cluster_idx
self.do_cluster_change(self.get_arg(2, Sense), [None, None], None, None, new_cluster_idx)
self.do_cluster_change(self.get_arg(2), [None, None], None, None, new_cluster_idx)