Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
fccf8d5e
authored
Jan 08, 2018
by
Fernando Martínez Santiago
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Pictogram 1.6, Beta 6. Trabajando en bug Andres Ruiz Garcia.Tablero con categorias
parent
8e884dfe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VOCA.java
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/grammar/Vocabulary.java
View file @
fccf8d5e
...
...
@@ -63,7 +63,7 @@ public class Vocabulary implements Iterable<Picto> {
VocabularyTalk
.
iVocabularyListener
vocabulary_listeners
[]
=
{
new
VocabularyTalk
.
iVocabularyListener
()
{
@Override
public
void
change
(
action
action
,
int
picto_grid
,
int
picto_id
,
int
id_child_grid
,
JSONObject
args
)
{
Log
.
e
(
LOG_TAG
,
"****************************Picto HERE>>>>>>"
+
action
);
switch
(
action
)
{
case
delete:
{
Log
.
i
(
LOG_TAG
,
"Picto delete "
+
picto_grid
+
"."
+
picto_id
);
...
...
@@ -72,7 +72,7 @@ public class Vocabulary implements Iterable<Picto> {
}
case
update:
{
Log
.
i
(
LOG_TAG
,
"
Picto update "
+
args
.
toString
()
);
Log
.
i
(
LOG_TAG
,
"
************************Vocabulary action listened (vocabulary model): "
+
action
);
try
{
modifyAttsPicto
(
picto_grid
,
picto_id
,
args
.
getJSONObject
(
"attributes"
),
id_child_grid
);
}
catch
(
JSONException
e
)
{
...
...
@@ -157,7 +157,10 @@ public class Vocabulary implements Iterable<Picto> {
int
index
=-
1
;
if
(
pictos_cat
!=
null
)
for
(
int
i
=
0
;
i
<
pictos_cat
.
size
()
&&
index
==-
1
;
i
++)
if
(
pictos_cat
.
get
(
i
).
get_ImgId
()==
pic_id
)
index
=
i
;
if
(
pictos_cat
.
get
(
i
).
get_ImgId
()==
pic_id
)
{
index
=
i
;
Log
.
e
(
LOG_TAG
,
"FOUNDDDDDDDDDDDDDDDDDDDDDDDDDDDDD"
+
pic_id
+
"..."
+
grid_id
+
"..."
+
pic_id
);
}
return
index
;
}
...
...
@@ -240,6 +243,8 @@ public class Vocabulary implements Iterable<Picto> {
}
else
Log
.
i
(
this
.
getClass
().
getCanonicalName
(),
"Trying to modify an unregistered picto:"
+
pic_id
+
" grid:"
+
pic_grid
);
Picto
p
=
find_picto
(
pic_grid
,
0
,
0
);
Log
.
e
(
"LOG_TAG"
,
"**********o,o"
+
p
.
toString
()+
" ACTIVE GRID:"
+
PCBcontext
.
getPcbdb
().
getCurrentUser
().
get_active_grid
());
}
/**
...
...
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VOCA.java
View file @
fccf8d5e
...
...
@@ -612,7 +612,7 @@ Log.e(LOG_TAG,"**********************************************************PICTO L
*/
@Override
public
void
change
(
action
action
,
int
picto_cat
,
int
picto_id
,
int
id_child_grid
,
JSONObject
args
)
{
Log
.
i
(
LOG_TAG
,
"
Vocabulary action listened
: "
+
action
);
Log
.
i
(
LOG_TAG
,
"
************************Vocabulary action listened (interface)
: "
+
action
);
if
(
args
!=
null
)
Log
.
d
(
LOG_TAG
,
"args: "
+
args
.
toString
());
refresh
();
}
...
...
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