Skip to content

yotta / pictogram

Go to a project
Commit 7dbdb95d by Germán Callejas Alcántara
Options

Vista para editar picto arreglada(Ya funciona bien para editar la imagen o subir una nueva)

parent a3d95466
Inline Side-by-side
Showing with 40 additions and 67 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoMenu.java
...@@ -3,6 +3,7 @@ package com.yottacode.pictogram.tabletlibrary.gui.communicator; ...@@ -3,6 +3,7 @@ package com.yottacode.pictogram.tabletlibrary.gui.communicator;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Point; import android.graphics.Point;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.RelativeLayout; import android.widget.RelativeLayout;
...@@ -136,10 +137,15 @@ public class PictoMenu { ...@@ -136,10 +137,15 @@ public class PictoMenu {
rescaled.compress(Bitmap.CompressFormat.PNG, 100, stream); rescaled.compress(Bitmap.CompressFormat.PNG, 100, stream);
byte[] byteArray = stream.toByteArray(); byte[] byteArray = stream.toByteArray();
intent.putExtra(EditPictoActivity.IMAGE_PICTO, byteArray); intent.putExtra(EditPictoActivity.IMAGE_PICTO, byteArray);
} }
intent.putExtra("tipo",true); intent.putExtra("tipo",true);
activity.startActivity(intent);
Log.i("TAG_PRUEBAS","---setPicto---");
Log.i("TAG_PRUEBAS","row: "+row);
Log.i("TAG_PRUEBAS","col: "+col);
Log.i("TAG_PRUEBAS","expression: "+expression);
activity.startActivityForResult(intent,EditPictoActivity.EDIT_PICTO_REQUEST);
} }
/**Function for build a radial menu /**Function for build a radial menu
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
...@@ -1151,28 +1151,19 @@ protected void showOnlyTape(boolean onlyTape) { ...@@ -1151,28 +1151,19 @@ protected void showOnlyTape(boolean onlyTape) {
break; break;
case EditPictoActivity.EDIT_PICTO_REQUEST: case EditPictoActivity.EDIT_PICTO_REQUEST:
if (resultCode == RESULT_OK) { if (resultCode == RESULT_OK) {
Log.i("TAG_PRUEBAS","Llega a fin de nuevo"); Log.i("TAG_PRUEBAS","---REQUEST_OK_EDIT----");
int row = getIntent().getIntExtra(Picto.JSON_ATTTRS.ROW, -1); int row = data.getExtras().getInt(Picto.JSON_ATTTRS.ROW, -1);
int col = getIntent().getIntExtra(Picto.JSON_ATTTRS.COLUMN, -1); int col = data.getExtras().getInt(Picto.JSON_ATTTRS.COLUMN);
int freeRow = getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_ROW, -1); int freeRow = data.getExtras().getInt(Picto.JSON_ATTTRS.FREE_ROW, -1);
int freeColumn = getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_COLUMN, -1); int freeColumn = data.getExtras().getInt(Picto.JSON_ATTTRS.FREE_COLUMN, -1);
String path = data.getExtras().getString(EditPictoActivity.PATH); String path = data.getExtras().getString(EditPictoActivity.PATH);
String legend = data.getExtras().getString(Picto.JSON_ATTTRS.EXPRESSION); String legend = data.getExtras().getString(Picto.JSON_ATTTRS.EXPRESSION);
chooseTextAndSavePicto(path, row, col, freeRow, freeColumn, cat, legend); chooseTextAndSavePicto(path, row, col, freeRow, freeColumn, cat, legend);
refresh();
} }
break; break;
case EditPictoActivity.FINISH_EDIT:
Log.i("TAG_PRUEBAS","Llega a fin de editar");
int row = data.getIntExtra(Picto.JSON_ATTTRS.ROW, -1);
int col = data.getIntExtra(Picto.JSON_ATTTRS.COLUMN, -1);
int freeRow = data.getIntExtra(Picto.JSON_ATTTRS.FREE_ROW, -1);
int freeColumn = data.getIntExtra(Picto.JSON_ATTTRS.FREE_COLUMN, -1);
String path = data.getExtras().getString(EditPictoActivity.PATH);
String legend = data.getExtras().getString(Picto.JSON_ATTTRS.EXPRESSION);
chooseTextAndSavePicto(path, row, col, freeRow, freeColumn, cat, legend);
break;
} }
} }
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/cropper/EditPictoActivity.java
...@@ -239,42 +239,30 @@ public class EditPictoActivity extends Activity { ...@@ -239,42 +239,30 @@ public class EditPictoActivity extends Activity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (legend.getText().toString().trim().length() > 0) { if (legend.getText().toString().trim().length() > 0) {
final Bitmap croppedImage = cropImageView.getCroppedImage(); final Bitmap croppedImage = cropImageView.getCroppedImage();
//Escalar imagen //Escalar imagen
Bitmap finalImage = croppedImage.createScaledBitmap(croppedImage, 100, 100, true); Bitmap finalImage = croppedImage.createScaledBitmap(croppedImage, 100, 100, true);
//Guardar imagen en galeria y obtener la ruta //Guardar imagen en galeria y obtener la ruta
ByteArrayOutputStream bytes = new ByteArrayOutputStream(); ByteArrayOutputStream bytes = new ByteArrayOutputStream();
finalImage.compress(Bitmap.CompressFormat.JPEG, 100, bytes); finalImage.compress(Bitmap.CompressFormat.JPEG, 100, bytes);
String title = getResources().getString(R.string.app_name) + ' ' + legend.getText().toString(); String title = getResources().getString(R.string.app_name) + ' ' + legend.getText().toString();
String path = MediaStore.Images.Media.insertImage(PCBcontext.getContext().getContentResolver(), finalImage, title, null); String path = MediaStore.Images.Media.insertImage(PCBcontext.getContext().getContentResolver(), finalImage, title, null);
path = getRealPathFromURI(Uri.parse(path)); path = getRealPathFromURI(Uri.parse(path));
Log.i(LOG_PATH, " New image " + title + " saved at " + path); Log.i(LOG_PATH, " New image " + title + " saved at " + path);
//Intent intent = new Intent(EditPictoActivity.this,PictogramActivity.class);//getIntent(); //Mandar a pictogram activity el path y el texto de la imagen Intent intent = getIntent(); //Mandar a pictogram activity el path y el texto de la imagen
//intent.putExtra(PATH, path); intent.putExtra(PATH, path);
//intent.putExtra(Picto.JSON_ATTTRS.EXPRESSION, legend.getText().toString()); intent.putExtra(Picto.JSON_ATTTRS.EXPRESSION, legend.getText().toString());
setResult(RESULT_OK, intent);
cropImageView.setImageBitmap(finalImage); cropImageView.setImageBitmap(finalImage);
if(editar){
Log.i("TAG_PRUEBAS","Lanza ok de editar"); Log.i("TAG_PRUEBAS","Lanza ok de editar");
//Intent intent = new Intent(EditPictoActivity.this,PictogramActivity.class);//Mandar a pictogram activity el path y el texto de la imagen
Intent intent = getIntent(); finish(); //Termina la actividad de editar
intent.putExtra(PATH, path); } else
intent.putExtra(Picto.JSON_ATTTRS.EXPRESSION, legend.getText().toString()); Toast.makeText(getBaseContext(), R.string.crop_TextRequired, Toast.LENGTH_LONG).show();
intent.setAction(String.valueOf(FINISH_EDIT));
//startActivityForResult(intent, EditPictoActivity.EDIT_PICTO_REQUEST);
}else{
Log.i("TAG_PRUEBAS","Lanza ok de nuevo");
Intent intent = getIntent(); //Mandar a pictogram activity el path y el texto de la imagen
intent.putExtra(PATH, path);
intent.putExtra(Picto.JSON_ATTTRS.EXPRESSION, legend.getText().toString());
setResult(RESULT_OK, intent);
}
finish(); //Termina la actividad de editar
} else
Toast.makeText(getBaseContext(), R.string.crop_TextRequired, Toast.LENGTH_LONG).show();
} }
}); });
...@@ -553,18 +541,6 @@ public class EditPictoActivity extends Activity { ...@@ -553,18 +541,6 @@ public class EditPictoActivity extends Activity {
cropImageView.setImageBitmap(rescaled); cropImageView.setImageBitmap(rescaled);
} }
break; break;
/*case EditPictoActivity.EDIT_PICTO_REQUEST:
if (resultCode == RESULT_OK) {
int row = getIntent().getIntExtra(Picto.JSON_ATTTRS.ROW, -1);
int col = getIntent().getIntExtra(Picto.JSON_ATTTRS.COLUMN, -1);
int freeRow = getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_ROW, -1);
int freeColumn = getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_COLUMN, -1);
String path = data.getExtras().getString(EditPictoActivity.PATH);
String legend = data.getExtras().getString(Picto.JSON_ATTTRS.EXPRESSION);
chooseTextAndSavePicto(path, row, col, freeRow, freeColumn, cat, legend);
}
break;*/
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment