Merge branch 'IT18073638' into 'master'

denoising bug fixed and output image bug fixed

See merge request !34

app/src/main/java/com/app/smartphotoeditor/activities/DenoisingActivity.java

@@ -38,7 +38,7 @@ public class DenoisingActivity extends AppCompatActivity {
     private Button revertButton, nextButton2;
     private LoadingDialogAdapter loadingDialog;
     private ImageDenoising imageDenoising;
-    private boolean switchImage = false, alreadyDenoised = true;
+    private boolean switchImage = true, alreadyDenoised = true;
     private Handler handler = null;
 
     @Override
@@ -72,6 +72,7 @@ public class DenoisingActivity extends AppCompatActivity {
                 imageDenoising.setInputBitmap(inputImage);
                 imageDenoising.startDenoising();
                 denoisedImage = imageDenoising.getDenoisedBitmap();
+                outputImage = denoisedImage;
                 handler.sendEmptyMessage(0);
             }
         }.start();
@@ -92,6 +93,7 @@ public class DenoisingActivity extends AppCompatActivity {
         if(switchImage) {
             switchImage = false;
             imageDisplay.setImageBitmap(inputImage);
+            outputImage = inputImage;
             revertButton.setText("TURN ON");
         } else {
             switchImage = true;
@@ -100,6 +102,7 @@ public class DenoisingActivity extends AppCompatActivity {
                 alreadyDenoised = true;
             }
             imageDisplay.setImageBitmap(denoisedImage);
+            outputImage = denoisedImage;
             revertButton.setText("TURN OFF");
         }
     }

app/src/main/java/com/app/smartphotoeditor/activities/LowLightEnhanceActivity.java

@@ -73,7 +73,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
     private LoadingDialogAdapter loadingDialog;
     private Bitmap inputImage, editedImage, outputImage;
     private Button revertButton;
-    private boolean switchImage = false, alreadyEnhanced = true;
+    private boolean switchImage = true, alreadyEnhanced = true;
     private Handler handler = null;
     Thread lowlightThread;
     private EqualizeHistogram equalizeHistogram;
@@ -217,6 +217,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
                 equalizeHistogram.setInputBitmap(inputImage);
                 equalizeHistogram.startEnhancing();
                 editedImage = equalizeHistogram.getEnhancedBitmap();
+                outputImage = editedImage;
                 handler.sendEmptyMessage(0);
             }
         }.start();
@@ -236,6 +237,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
         if(switchImage) {
             switchImage = false;
             imageDisplay.setImageBitmap(inputImage);
+            outputImage = inputImage;
             revertButton.setText("TURN ON");
         } else {
             switchImage = true;
@@ -244,6 +246,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
                 alreadyEnhanced = true;
             }
             imageDisplay.setImageBitmap(editedImage);
+            outputImage = editedImage;
             revertButton.setText("TURN OFF");
         }
     }

app/src/main/java/com/app/smartphotoeditor/activities/RestorationActivity.java

@@ -45,7 +45,7 @@ public class RestorationActivity extends AppCompatActivity
     private ImageView imageDisplay;
     private ImageRestoration imageRestoration;
     private Button revertButton;
-    private boolean switchImage = false, alreadyRestored = true;
+    private boolean switchImage = true, alreadyRestored = true;
     private LoadingDialogAdapter loadingDialog;
     private Handler handler = null;
 
@@ -126,6 +126,7 @@ public class RestorationActivity extends AppCompatActivity
         if(switchImage) {
             switchImage = false;
             imageDisplay.setImageBitmap(inputImage);
+            outputImage = inputImage;
             revertButton.setText("TURN ON");
         } else {
             switchImage = true;
@@ -134,6 +135,7 @@ public class RestorationActivity extends AppCompatActivity
                 alreadyRestored = true;
             }
             imageDisplay.setImageBitmap(editedImage);
+            outputImage = editedImage;
             revertButton.setText("TURN OFF");
         }
     }
@@ -145,6 +147,7 @@ public class RestorationActivity extends AppCompatActivity
                 imageRestoration.setInputBitmap(inputImage);
                 imageRestoration.startRestoring();
                 editedImage = imageRestoration.getRestoreBitmap();
+                outputImage = editedImage;
                 handler.sendEmptyMessage(0);
             }
         }.start();
@@ -208,9 +211,9 @@ public class RestorationActivity extends AppCompatActivity
 
     public void Save(View view)
     {
-        if(editedImage != null)
+        if(outputImage != null)
         {
-            ImageList.getInstance().addBitmap(editedImage,true);
+            ImageList.getInstance().addBitmap(outputImage,true);
         }
         Back(null);
     }

app/src/main/java/com/app/smartphotoeditor/services/ImageDenoising.java

@@ -50,7 +50,7 @@ public class ImageDenoising {
 
         imageString = getStringImage(inputImage);
 
-        PyObject pyo = py.getModule("test");
+        PyObject pyo = py.getModule("imageDenoising");
         PyObject obj = pyo.callAttr("main", imageString);
 
         String str = obj.toString();