Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
2
2021-129
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
2021-129
2021-129
Commits
ecc26d86
Commit
ecc26d86
authored
Oct 18, 2021
by
Samesh Buddhika Alahakoon
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'IT18073638' into 'master'
denoising bug fixed and output image bug fixed See merge request
!34
parents
8d895d3e
e3ec14d2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
6 deletions
+15
-6
app/src/main/java/com/app/smartphotoeditor/activities/DenoisingActivity.java
...om/app/smartphotoeditor/activities/DenoisingActivity.java
+4
-1
app/src/main/java/com/app/smartphotoeditor/activities/LowLightEnhanceActivity.java
.../smartphotoeditor/activities/LowLightEnhanceActivity.java
+4
-1
app/src/main/java/com/app/smartphotoeditor/activities/RestorationActivity.java
.../app/smartphotoeditor/activities/RestorationActivity.java
+6
-3
app/src/main/java/com/app/smartphotoeditor/services/ImageDenoising.java
...ava/com/app/smartphotoeditor/services/ImageDenoising.java
+1
-1
No files found.
app/src/main/java/com/app/smartphotoeditor/activities/DenoisingActivity.java
View file @
ecc26d86
...
@@ -38,7 +38,7 @@ public class DenoisingActivity extends AppCompatActivity {
...
@@ -38,7 +38,7 @@ public class DenoisingActivity extends AppCompatActivity {
private
Button
revertButton
,
nextButton2
;
private
Button
revertButton
,
nextButton2
;
private
LoadingDialogAdapter
loadingDialog
;
private
LoadingDialogAdapter
loadingDialog
;
private
ImageDenoising
imageDenoising
;
private
ImageDenoising
imageDenoising
;
private
boolean
switchImage
=
fals
e
,
alreadyDenoised
=
true
;
private
boolean
switchImage
=
tru
e
,
alreadyDenoised
=
true
;
private
Handler
handler
=
null
;
private
Handler
handler
=
null
;
@Override
@Override
...
@@ -72,6 +72,7 @@ public class DenoisingActivity extends AppCompatActivity {
...
@@ -72,6 +72,7 @@ public class DenoisingActivity extends AppCompatActivity {
imageDenoising
.
setInputBitmap
(
inputImage
);
imageDenoising
.
setInputBitmap
(
inputImage
);
imageDenoising
.
startDenoising
();
imageDenoising
.
startDenoising
();
denoisedImage
=
imageDenoising
.
getDenoisedBitmap
();
denoisedImage
=
imageDenoising
.
getDenoisedBitmap
();
outputImage
=
denoisedImage
;
handler
.
sendEmptyMessage
(
0
);
handler
.
sendEmptyMessage
(
0
);
}
}
}.
start
();
}.
start
();
...
@@ -92,6 +93,7 @@ public class DenoisingActivity extends AppCompatActivity {
...
@@ -92,6 +93,7 @@ public class DenoisingActivity extends AppCompatActivity {
if
(
switchImage
)
{
if
(
switchImage
)
{
switchImage
=
false
;
switchImage
=
false
;
imageDisplay
.
setImageBitmap
(
inputImage
);
imageDisplay
.
setImageBitmap
(
inputImage
);
outputImage
=
inputImage
;
revertButton
.
setText
(
"TURN ON"
);
revertButton
.
setText
(
"TURN ON"
);
}
else
{
}
else
{
switchImage
=
true
;
switchImage
=
true
;
...
@@ -100,6 +102,7 @@ public class DenoisingActivity extends AppCompatActivity {
...
@@ -100,6 +102,7 @@ public class DenoisingActivity extends AppCompatActivity {
alreadyDenoised
=
true
;
alreadyDenoised
=
true
;
}
}
imageDisplay
.
setImageBitmap
(
denoisedImage
);
imageDisplay
.
setImageBitmap
(
denoisedImage
);
outputImage
=
denoisedImage
;
revertButton
.
setText
(
"TURN OFF"
);
revertButton
.
setText
(
"TURN OFF"
);
}
}
}
}
...
...
app/src/main/java/com/app/smartphotoeditor/activities/LowLightEnhanceActivity.java
View file @
ecc26d86
...
@@ -73,7 +73,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
...
@@ -73,7 +73,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
private
LoadingDialogAdapter
loadingDialog
;
private
LoadingDialogAdapter
loadingDialog
;
private
Bitmap
inputImage
,
editedImage
,
outputImage
;
private
Bitmap
inputImage
,
editedImage
,
outputImage
;
private
Button
revertButton
;
private
Button
revertButton
;
private
boolean
switchImage
=
fals
e
,
alreadyEnhanced
=
true
;
private
boolean
switchImage
=
tru
e
,
alreadyEnhanced
=
true
;
private
Handler
handler
=
null
;
private
Handler
handler
=
null
;
Thread
lowlightThread
;
Thread
lowlightThread
;
private
EqualizeHistogram
equalizeHistogram
;
private
EqualizeHistogram
equalizeHistogram
;
...
@@ -217,6 +217,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
...
@@ -217,6 +217,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
equalizeHistogram
.
setInputBitmap
(
inputImage
);
equalizeHistogram
.
setInputBitmap
(
inputImage
);
equalizeHistogram
.
startEnhancing
();
equalizeHistogram
.
startEnhancing
();
editedImage
=
equalizeHistogram
.
getEnhancedBitmap
();
editedImage
=
equalizeHistogram
.
getEnhancedBitmap
();
outputImage
=
editedImage
;
handler
.
sendEmptyMessage
(
0
);
handler
.
sendEmptyMessage
(
0
);
}
}
}.
start
();
}.
start
();
...
@@ -236,6 +237,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
...
@@ -236,6 +237,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
if
(
switchImage
)
{
if
(
switchImage
)
{
switchImage
=
false
;
switchImage
=
false
;
imageDisplay
.
setImageBitmap
(
inputImage
);
imageDisplay
.
setImageBitmap
(
inputImage
);
outputImage
=
inputImage
;
revertButton
.
setText
(
"TURN ON"
);
revertButton
.
setText
(
"TURN ON"
);
}
else
{
}
else
{
switchImage
=
true
;
switchImage
=
true
;
...
@@ -244,6 +246,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
...
@@ -244,6 +246,7 @@ public class LowLightEnhanceActivity extends AppCompatActivity
alreadyEnhanced
=
true
;
alreadyEnhanced
=
true
;
}
}
imageDisplay
.
setImageBitmap
(
editedImage
);
imageDisplay
.
setImageBitmap
(
editedImage
);
outputImage
=
editedImage
;
revertButton
.
setText
(
"TURN OFF"
);
revertButton
.
setText
(
"TURN OFF"
);
}
}
}
}
...
...
app/src/main/java/com/app/smartphotoeditor/activities/RestorationActivity.java
View file @
ecc26d86
...
@@ -45,7 +45,7 @@ public class RestorationActivity extends AppCompatActivity
...
@@ -45,7 +45,7 @@ public class RestorationActivity extends AppCompatActivity
private
ImageView
imageDisplay
;
private
ImageView
imageDisplay
;
private
ImageRestoration
imageRestoration
;
private
ImageRestoration
imageRestoration
;
private
Button
revertButton
;
private
Button
revertButton
;
private
boolean
switchImage
=
fals
e
,
alreadyRestored
=
true
;
private
boolean
switchImage
=
tru
e
,
alreadyRestored
=
true
;
private
LoadingDialogAdapter
loadingDialog
;
private
LoadingDialogAdapter
loadingDialog
;
private
Handler
handler
=
null
;
private
Handler
handler
=
null
;
...
@@ -126,6 +126,7 @@ public class RestorationActivity extends AppCompatActivity
...
@@ -126,6 +126,7 @@ public class RestorationActivity extends AppCompatActivity
if
(
switchImage
)
{
if
(
switchImage
)
{
switchImage
=
false
;
switchImage
=
false
;
imageDisplay
.
setImageBitmap
(
inputImage
);
imageDisplay
.
setImageBitmap
(
inputImage
);
outputImage
=
inputImage
;
revertButton
.
setText
(
"TURN ON"
);
revertButton
.
setText
(
"TURN ON"
);
}
else
{
}
else
{
switchImage
=
true
;
switchImage
=
true
;
...
@@ -134,6 +135,7 @@ public class RestorationActivity extends AppCompatActivity
...
@@ -134,6 +135,7 @@ public class RestorationActivity extends AppCompatActivity
alreadyRestored
=
true
;
alreadyRestored
=
true
;
}
}
imageDisplay
.
setImageBitmap
(
editedImage
);
imageDisplay
.
setImageBitmap
(
editedImage
);
outputImage
=
editedImage
;
revertButton
.
setText
(
"TURN OFF"
);
revertButton
.
setText
(
"TURN OFF"
);
}
}
}
}
...
@@ -145,6 +147,7 @@ public class RestorationActivity extends AppCompatActivity
...
@@ -145,6 +147,7 @@ public class RestorationActivity extends AppCompatActivity
imageRestoration
.
setInputBitmap
(
inputImage
);
imageRestoration
.
setInputBitmap
(
inputImage
);
imageRestoration
.
startRestoring
();
imageRestoration
.
startRestoring
();
editedImage
=
imageRestoration
.
getRestoreBitmap
();
editedImage
=
imageRestoration
.
getRestoreBitmap
();
outputImage
=
editedImage
;
handler
.
sendEmptyMessage
(
0
);
handler
.
sendEmptyMessage
(
0
);
}
}
}.
start
();
}.
start
();
...
@@ -208,9 +211,9 @@ public class RestorationActivity extends AppCompatActivity
...
@@ -208,9 +211,9 @@ public class RestorationActivity extends AppCompatActivity
public
void
Save
(
View
view
)
public
void
Save
(
View
view
)
{
{
if
(
edited
Image
!=
null
)
if
(
output
Image
!=
null
)
{
{
ImageList
.
getInstance
().
addBitmap
(
edited
Image
,
true
);
ImageList
.
getInstance
().
addBitmap
(
output
Image
,
true
);
}
}
Back
(
null
);
Back
(
null
);
}
}
...
...
app/src/main/java/com/app/smartphotoeditor/services/ImageDenoising.java
View file @
ecc26d86
...
@@ -50,7 +50,7 @@ public class ImageDenoising {
...
@@ -50,7 +50,7 @@ public class ImageDenoising {
imageString
=
getStringImage
(
inputImage
);
imageString
=
getStringImage
(
inputImage
);
PyObject
pyo
=
py
.
getModule
(
"
test
"
);
PyObject
pyo
=
py
.
getModule
(
"
imageDenoising
"
);
PyObject
obj
=
pyo
.
callAttr
(
"main"
,
imageString
);
PyObject
obj
=
pyo
.
callAttr
(
"main"
,
imageString
);
String
str
=
obj
.
toString
();
String
str
=
obj
.
toString
();
...
...
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