Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Graphics
libksane
Commits
6eecf4e5
Commit
6eecf4e5
authored
Apr 12, 2021
by
Alexander Stippich
Browse files
change options API
parent
12cc1a34
Changes
23
Hide whitespace changes
Inline
Side-by-side
src/ksanewidget.cpp
View file @
6eecf4e5
...
...
@@ -692,7 +692,7 @@ void KSaneWidget::getOptVals(QMap <QString, QString> &opts)
for
(
int
i
=
0
;
i
<
d
->
m_optList
.
size
();
i
++
)
{
option
=
d
->
m_optList
.
at
(
i
);
tmp
=
option
->
getV
alueAsString
();
tmp
=
option
->
v
alueAsString
();
if
(
!
tmp
.
isEmpty
())
{
opts
[
option
->
name
()]
=
tmp
;
}
...
...
@@ -704,7 +704,7 @@ bool KSaneWidget::getOptVal(const QString &optname, QString &value)
KSaneOption
*
option
;
if
((
option
=
d
->
getOption
(
optname
))
!=
nullptr
)
{
value
=
option
->
getV
alueAsString
();
value
=
option
->
v
alueAsString
();
return
!
value
.
isEmpty
();
}
return
false
;
...
...
@@ -763,9 +763,9 @@ int KSaneWidget::setOptVals(const QMap <QString, QString> &opts)
(
d
->
m_optGamB
))
{
// check if the current gamma values are identical. if they are identical,
// uncheck the "Separate color intensity tables" checkbox
QVariant
redGamma
=
d
->
m_optGamR
->
getV
alue
();
QVariant
greenGamma
=
d
->
m_optGamG
->
getV
alue
();
QVariant
blueGamma
=
d
->
m_optGamB
->
getV
alue
();
QVariant
redGamma
=
d
->
m_optGamR
->
v
alue
();
QVariant
greenGamma
=
d
->
m_optGamG
->
v
alue
();
QVariant
blueGamma
=
d
->
m_optGamB
->
v
alue
();
if
((
redGamma
==
greenGamma
)
&&
(
greenGamma
==
blueGamma
))
{
d
->
m_splitGamChB
->
setChecked
(
false
);
...
...
@@ -798,9 +798,9 @@ bool KSaneWidget::setOptVal(const QString &option, const QString &value)
(
opt
==
d
->
m_optGamB
)))
{
// check if the current gamma values are identical. if they are identical,
// uncheck the "Separate color intensity tables" checkbox
QVariant
redGamma
=
d
->
m_optGamR
->
getV
alue
();
QVariant
greenGamma
=
d
->
m_optGamG
->
getV
alue
();
QVariant
blueGamma
=
d
->
m_optGamB
->
getV
alue
();
QVariant
redGamma
=
d
->
m_optGamR
->
v
alue
();
QVariant
greenGamma
=
d
->
m_optGamG
->
v
alue
();
QVariant
blueGamma
=
d
->
m_optGamB
->
v
alue
();
if
((
redGamma
==
greenGamma
)
&&
(
greenGamma
==
blueGamma
))
{
d
->
m_splitGamChB
->
setChecked
(
false
);
// set the values to the common gamma widget
...
...
@@ -842,7 +842,7 @@ void KSaneWidget::enableAutoSelect(bool enable)
float
KSaneWidget
::
currentDPI
()
{
if
(
d
->
m_optRes
)
{
QVariant
value
=
d
->
m_optRes
->
getV
alue
();
QVariant
value
=
d
->
m_optRes
->
v
alue
();
if
(
!
value
.
isNull
())
{
return
value
.
toFloat
();
}
...
...
@@ -854,16 +854,16 @@ float KSaneWidget::scanAreaWidth()
{
float
result
=
0.0
;
if
(
d
->
m_optBrX
)
{
if
(
d
->
m_optBrX
->
get
Unit
()
==
KSaneOption
::
UnitPixel
)
{
result
=
d
->
m_optBrX
->
getMax
Value
().
toFloat
();
if
(
d
->
m_optBrX
->
value
Unit
()
==
KSaneOption
::
UnitPixel
)
{
result
=
d
->
m_optBrX
->
maximum
Value
().
toFloat
();
float
dpi
=
currentDPI
();
if
(
dpi
<
1
)
{
qCDebug
(
KSANE_LOG
)
<<
"Broken DPI value"
;
dpi
=
1.0
;
}
result
=
result
/
dpi
/
25.4
;
}
else
if
(
d
->
m_optBrX
->
get
Unit
()
==
KSaneOption
::
UnitMilliMeter
)
{
result
=
d
->
m_optBrX
->
getMax
Value
().
toFloat
();
}
else
if
(
d
->
m_optBrX
->
value
Unit
()
==
KSaneOption
::
UnitMilliMeter
)
{
result
=
d
->
m_optBrX
->
maximum
Value
().
toFloat
();
}
}
return
result
;
...
...
@@ -873,16 +873,16 @@ float KSaneWidget::scanAreaHeight()
{
float
result
=
0.0
;
if
(
d
->
m_optBrY
)
{
if
(
d
->
m_optBrY
->
get
Unit
()
==
KSaneOption
::
UnitPixel
)
{
result
=
d
->
m_optBrY
->
getMax
Value
().
toFloat
();
if
(
d
->
m_optBrY
->
value
Unit
()
==
KSaneOption
::
UnitPixel
)
{
result
=
d
->
m_optBrY
->
maximum
Value
().
toFloat
();
float
dpi
=
currentDPI
();
if
(
dpi
<
1
)
{
qCDebug
(
KSANE_LOG
)
<<
"Broken DPI value"
;
dpi
=
1.0
;
}
result
=
result
/
dpi
/
25.4
;
}
else
if
(
d
->
m_optBrY
->
get
Unit
()
==
KSaneOption
::
UnitMilliMeter
)
{
result
=
d
->
m_optBrY
->
getMax
Value
().
toFloat
();
}
else
if
(
d
->
m_optBrY
->
value
Unit
()
==
KSaneOption
::
UnitMilliMeter
)
{
result
=
d
->
m_optBrY
->
maximum
Value
().
toFloat
();
}
}
return
result
;
...
...
src/ksanewidget_p.cpp
View file @
6eecf4e5
...
...
@@ -226,7 +226,7 @@ float KSaneWidgetPrivate::ratioToScanAreaX(float ratio)
if
(
!
m_optBrX
)
{
return
0.0
;
}
float
max
=
m_optBrX
->
getMax
Value
().
toFloat
();
float
max
=
m_optBrX
->
maximum
Value
().
toFloat
();
return
max
*
ratio
;
}
...
...
@@ -236,7 +236,7 @@ float KSaneWidgetPrivate::ratioToScanAreaY(float ratio)
if
(
!
m_optBrY
)
{
return
0.0
;
}
float
max
=
m_optBrY
->
getMax
Value
().
toFloat
();
float
max
=
m_optBrY
->
maximum
Value
().
toFloat
();
return
max
*
ratio
;
}
...
...
@@ -246,7 +246,7 @@ float KSaneWidgetPrivate::scanAreaToRatioX(float scanArea)
if
(
!
m_optBrX
)
{
return
0.0
;
}
float
max
=
m_optBrX
->
getMax
Value
().
toFloat
();
float
max
=
m_optBrX
->
maximum
Value
().
toFloat
();
if
(
scanArea
>
max
)
{
return
1.0
;
...
...
@@ -264,7 +264,7 @@ float KSaneWidgetPrivate::scanAreaToRatioY(float scanArea)
if
(
!
m_optBrY
)
{
return
0.0
;
}
float
max
=
m_optBrY
->
getMax
Value
().
toFloat
();
float
max
=
m_optBrY
->
maximum
Value
().
toFloat
();
if
(
scanArea
>
max
)
{
return
1.0
;
...
...
@@ -295,12 +295,12 @@ float KSaneWidgetPrivate::ratioToDispUnitX(float ratio)
float
result
=
ratioToScanAreaX
(
ratio
);
if
(
m_optBrX
->
get
Unit
()
==
KSaneOption
::
UnitMilliMeter
)
{
if
(
m_optBrX
->
value
Unit
()
==
KSaneOption
::
UnitMilliMeter
)
{
return
mmToDispUnit
(
result
);
}
else
if
(
m_optBrX
->
get
Unit
()
==
KSaneOption
::
UnitPixel
&&
m_optRes
)
{
else
if
(
m_optBrX
->
value
Unit
()
==
KSaneOption
::
UnitPixel
&&
m_optRes
)
{
// get current DPI
float
dpi
=
m_optRes
->
getV
alue
().
toFloat
();
float
dpi
=
m_optRes
->
v
alue
().
toFloat
();
if
(
dpi
>
1
)
{
result
=
result
/
(
dpi
/
25.4
);
return
mmToDispUnit
(
result
);
...
...
@@ -318,12 +318,12 @@ float KSaneWidgetPrivate::ratioToDispUnitY(float ratio)
float
result
=
ratioToScanAreaY
(
ratio
);
if
(
m_optBrY
->
get
Unit
()
==
KSaneOption
::
UnitMilliMeter
)
{
if
(
m_optBrY
->
value
Unit
()
==
KSaneOption
::
UnitMilliMeter
)
{
return
mmToDispUnit
(
result
);
}
else
if
(
m_optBrY
->
get
Unit
()
==
KSaneOption
::
UnitPixel
&&
m_optRes
)
{
else
if
(
m_optBrY
->
value
Unit
()
==
KSaneOption
::
UnitPixel
&&
m_optRes
)
{
// get current DPI
float
dpi
=
m_optRes
->
getV
alue
().
toFloat
();
float
dpi
=
m_optRes
->
v
alue
().
toFloat
();
if
(
dpi
>
1
)
{
result
=
result
/
(
dpi
/
25.4
);
return
mmToDispUnit
(
result
);
...
...
@@ -842,7 +842,7 @@ void KSaneWidgetPrivate::setBRX(const QVariant &x)
return
;
}
QVariant
tlx
=
m_optTlX
->
getV
alue
();
QVariant
tlx
=
m_optTlX
->
v
alue
();
if
(
!
tlx
.
isNull
())
{
float
tlxRatio
=
scanAreaToRatioX
(
tlx
.
toFloat
());
m_scanareaWidth
->
setValue
(
ratioToDispUnitX
(
ratio
)
-
ratioToDispUnitX
(
tlxRatio
));
...
...
@@ -864,7 +864,7 @@ void KSaneWidgetPrivate::setBRY(const QVariant &y)
if
(
!
m_optTlY
)
{
return
;
}
QVariant
tly
=
m_optTlY
->
getV
alue
();
QVariant
tly
=
m_optTlY
->
v
alue
();
if
(
!
tly
.
isNull
())
{
float
tlyRatio
=
scanAreaToRatioY
(
tly
.
toFloat
());
m_scanareaHeight
->
setValue
(
ratioToDispUnitY
(
ratio
)
-
ratioToDispUnitY
(
tlyRatio
));
...
...
@@ -880,10 +880,10 @@ void KSaneWidgetPrivate::updatePreviewSize()
// check if an update is necessary
if
(
m_optBrX
!=
nullptr
)
{
max_x
=
m_optBrX
->
getMax
Value
().
toFloat
();
max_x
=
m_optBrX
->
maximum
Value
().
toFloat
();
}
if
(
m_optBrY
!=
nullptr
)
{
max_y
=
m_optBrY
->
getMax
Value
().
toFloat
();
max_y
=
m_optBrY
->
maximum
Value
().
toFloat
();
}
if
((
max_x
==
m_previewWidth
)
&&
(
max_y
==
m_previewHeight
))
{
//qCDebug(KSANE_LOG) << "no preview size change";
...
...
@@ -979,8 +979,8 @@ void KSaneWidgetPrivate::startPreviewScan()
if
((
m_optTlX
!=
nullptr
)
&&
(
m_optTlY
!=
nullptr
)
&&
(
m_optBrX
!=
nullptr
)
&&
(
m_optBrY
!=
nullptr
))
{
// get maximums
max_x
=
m_optBrX
->
getMax
Value
().
toFloat
();
max_y
=
m_optBrY
->
getMax
Value
().
toFloat
();
max_x
=
m_optBrX
->
maximum
Value
().
toFloat
();
max_y
=
m_optBrY
->
maximum
Value
().
toFloat
();
// select the whole area
m_optTlX
->
setValue
(
0
);
m_optTlY
->
setValue
(
0
);
...
...
@@ -1001,7 +1001,7 @@ void KSaneWidgetPrivate::startPreviewScan()
}
else
{
// set the resolution to getMinValue and increase if necessary
SANE_Parameters
params
;
dpi
=
m_optRes
->
getMin
Value
().
toFloat
();
dpi
=
m_optRes
->
minimum
Value
().
toFloat
();
do
{
m_optRes
->
setValue
(
dpi
);
if
((
m_optResY
!=
nullptr
)
&&
(
m_optRes
->
name
()
==
QStringLiteral
(
SANE_NAME_SCAN_X_RESOLUTION
)))
{
...
...
@@ -1025,7 +1025,7 @@ void KSaneWidgetPrivate::startPreviewScan()
if
(
params
.
pixels_per_line
==
0
)
{
// This is a security measure for broken backends
dpi
=
m_optRes
->
getMin
Value
().
toFloat
();
dpi
=
m_optRes
->
minimum
Value
().
toFloat
();
m_optRes
->
setValue
(
dpi
);
qCDebug
(
KSANE_LOG
)
<<
"Setting minimum DPI value for a broken back-end"
;
}
...
...
@@ -1053,7 +1053,7 @@ void KSaneWidgetPrivate::startPreviewScan()
m_progressBar
->
setValue
(
0
);
m_isPreview
=
true
;
m_previewThread
->
setPreviewInverted
(
m_optInvert
->
getV
alue
().
toBool
());
m_previewThread
->
setPreviewInverted
(
m_optInvert
->
v
alue
().
toBool
());
m_previewThread
->
start
();
m_updProgressTmr
.
start
();
}
...
...
@@ -1142,7 +1142,7 @@ void KSaneWidgetPrivate::startFinalScan()
setBusy
(
true
);
m_updProgressTmr
.
start
();
m_scanThread
->
setImageInverted
(
m_optInvert
->
getV
alue
().
toBool
());
m_scanThread
->
setImageInverted
(
m_optInvert
->
v
alue
().
toBool
());
m_scanThread
->
start
();
}
...
...
@@ -1152,7 +1152,7 @@ bool KSaneWidgetPrivate::scanSourceADF()
return
false
;
}
QString
source
=
m_optSource
->
getV
alue
().
toString
();
QString
source
=
m_optSource
->
v
alue
().
toString
();
return
source
.
contains
(
QStringLiteral
(
"Automatic Document Feeder"
))
||
source
.
contains
(
QStringLiteral
(
"ADF"
))
||
...
...
@@ -1199,7 +1199,7 @@ void KSaneWidgetPrivate::oneFinalScanDone()
// Check if we have a "wait for button" batch scanning
if
(
m_optWaitForBtn
)
{
qCDebug
(
KSANE_LOG
)
<<
m_optWaitForBtn
->
name
();
QString
wait
=
m_optWaitForBtn
->
getV
alue
().
toString
();
QString
wait
=
m_optWaitForBtn
->
v
alue
().
toString
();
qCDebug
(
KSANE_LOG
)
<<
"wait =="
<<
wait
;
if
(
wait
==
QStringLiteral
(
"true"
))
{
...
...
@@ -1319,8 +1319,8 @@ void KSaneWidgetPrivate::checkInvert()
return
;
}
QString
source
=
m_optSource
->
getV
alue
().
toString
();
QString
filmtype
=
m_optFilmType
->
getV
alue
().
toString
();
QString
source
=
m_optSource
->
v
alue
().
toString
();
QString
filmtype
=
m_optFilmType
->
v
alue
().
toString
();
if
((
source
.
contains
(
i18nc
(
"This is compared to the option string returned by sane"
,
"Transparency"
),
Qt
::
CaseInsensitive
))
&&
...
...
@@ -1398,12 +1398,12 @@ void KSaneWidgetPrivate::updateScanSelection()
{
QVariant
maxX
;
if
(
m_optBrX
)
{
maxX
=
m_optBrX
->
getMax
Value
();
maxX
=
m_optBrX
->
maximum
Value
();
}
QVariant
maxY
;
if
(
m_optBrY
)
{
maxY
=
m_optBrY
->
getMax
Value
();
maxY
=
m_optBrY
->
maximum
Value
();
}
float
x1
=
m_scanareaX
->
value
();
...
...
src/options/ksanebooloption.cpp
View file @
6eecf4e5
...
...
@@ -63,7 +63,7 @@ void KSaneBoolOption::readValue()
}
}
QVariant
KSaneBoolOption
::
getV
alue
()
const
QVariant
KSaneBoolOption
::
v
alue
()
const
{
if
(
state
()
==
StateHidden
)
{
return
QVariant
();
...
...
@@ -71,7 +71,7 @@ QVariant KSaneBoolOption::getValue() const
return
m_checked
;
}
QString
KSaneBoolOption
::
getV
alueAsString
()
const
QString
KSaneBoolOption
::
v
alueAsString
()
const
{
if
(
state
()
==
StateHidden
)
{
return
QString
();
...
...
src/options/ksanebooloption.h
View file @
6eecf4e5
...
...
@@ -23,8 +23,8 @@ public:
void
readValue
()
override
;
QVariant
getV
alue
()
const
override
;
QString
getV
alueAsString
()
const
override
;
QVariant
v
alue
()
const
override
;
QString
v
alueAsString
()
const
override
;
public
Q_SLOTS
:
bool
setValue
(
const
QVariant
&
value
)
override
;
...
...
src/options/ksanedoubleoption.cpp
View file @
6eecf4e5
...
...
@@ -83,7 +83,7 @@ bool KSaneDoubleOption::setValue(const QVariant &value)
return
ok
;
}
QVariant
KSaneDoubleOption
::
getMin
Value
()
const
QVariant
KSaneDoubleOption
::
minimum
Value
()
const
{
QVariant
value
;
if
(
m_optDesc
->
constraint_type
==
SANE_CONSTRAINT_RANGE
)
{
...
...
@@ -94,7 +94,7 @@ QVariant KSaneDoubleOption::getMinValue() const
return
value
;
}
QVariant
KSaneDoubleOption
::
getMax
Value
()
const
QVariant
KSaneDoubleOption
::
maximum
Value
()
const
{
QVariant
value
;
if
(
m_optDesc
->
constraint_type
==
SANE_CONSTRAINT_RANGE
)
{
...
...
@@ -105,7 +105,7 @@ QVariant KSaneDoubleOption::getMaxValue() const
return
value
;
}
QVariant
KSaneDoubleOption
::
getS
tepValue
()
const
QVariant
KSaneDoubleOption
::
s
tepValue
()
const
{
QVariant
value
;
if
(
m_optDesc
->
constraint_type
==
SANE_CONSTRAINT_RANGE
)
{
...
...
@@ -116,7 +116,7 @@ QVariant KSaneDoubleOption::getStepValue() const
return
value
;
}
QVariant
KSaneDoubleOption
::
getV
alue
()
const
QVariant
KSaneDoubleOption
::
v
alue
()
const
{
if
(
state
()
==
StateHidden
)
{
return
QVariant
();
...
...
@@ -124,7 +124,7 @@ QVariant KSaneDoubleOption::getValue() const
return
QVariant
(
m_value
);
}
QString
KSaneDoubleOption
::
getV
alueAsString
()
const
QString
KSaneDoubleOption
::
v
alueAsString
()
const
{
if
(
state
()
==
StateHidden
)
{
return
QString
();
...
...
src/options/ksanedoubleoption.h
View file @
6eecf4e5
...
...
@@ -25,11 +25,11 @@ public:
void
readValue
()
override
;
void
readOption
()
override
;
QVariant
getMin
Value
()
const
override
;
QVariant
getMax
Value
()
const
override
;
QVariant
getS
tepValue
()
const
override
;
QVariant
getV
alue
()
const
override
;
QString
getV
alueAsString
()
const
override
;
QVariant
minimum
Value
()
const
override
;
QVariant
maximum
Value
()
const
override
;
QVariant
s
tepValue
()
const
override
;
QVariant
v
alue
()
const
override
;
QString
v
alueAsString
()
const
override
;
public
Q_SLOTS
:
bool
setValue
(
const
QVariant
&
value
)
override
;
...
...
src/options/ksanegammaoption.cpp
View file @
6eecf4e5
...
...
@@ -95,7 +95,7 @@ void KSaneGammaOption::readValue()
// not easy nor fast.. ergo not done
}
QVariant
KSaneGammaOption
::
getV
alue
()
const
QVariant
KSaneGammaOption
::
v
alue
()
const
{
if
(
state
()
==
StateHidden
)
{
return
QVariant
();
...
...
@@ -103,7 +103,12 @@ QVariant KSaneGammaOption::getValue() const
return
QVariantList
{
m_brightness
,
m_contrast
,
m_gamma
};
}
QVariant
KSaneGammaOption
::
getMaxValue
()
const
int
KSaneGammaOption
::
valueSize
()
const
{
return
3
;
}
QVariant
KSaneGammaOption
::
maximumValue
()
const
{
QVariant
value
;
if
(
m_optDesc
)
{
...
...
@@ -113,7 +118,7 @@ QVariant KSaneGammaOption::getMaxValue() const
return
value
;
}
QString
KSaneGammaOption
::
getV
alueAsString
()
const
QString
KSaneGammaOption
::
v
alueAsString
()
const
{
if
(
state
()
==
StateHidden
)
{
return
QString
();
...
...
src/options/ksanegammaoption.h
View file @
6eecf4e5
...
...
@@ -24,9 +24,10 @@ public:
void
readValue
()
override
;
void
readOption
()
override
;
QVariant
getMaxValue
()
const
override
;
QVariant
getValue
()
const
override
;
QString
getValueAsString
()
const
override
;
QVariant
maximumValue
()
const
override
;
QVariant
value
()
const
override
;
int
valueSize
()
const
override
;
QString
valueAsString
()
const
override
;
public
Q_SLOTS
:
bool
setValue
(
const
QVariant
&
value
)
override
;
...
...
src/options/ksaneintegeroption.cpp
View file @
6eecf4e5
...
...
@@ -45,7 +45,7 @@ void KSaneIntegerOption::readValue()
}
}
QVariant
KSaneIntegerOption
::
getMin
Value
()
const
QVariant
KSaneIntegerOption
::
minimum
Value
()
const
{
QVariant
value
;
if
(
m_optDesc
->
constraint_type
==
SANE_CONSTRAINT_RANGE
)
{
...
...
@@ -56,7 +56,7 @@ QVariant KSaneIntegerOption::getMinValue() const
return
value
;
}
QVariant
KSaneIntegerOption
::
getMax
Value
()
const
QVariant
KSaneIntegerOption
::
maximum
Value
()
const
{
QVariant
value
;
if
(
m_optDesc
->
constraint_type
==
SANE_CONSTRAINT_RANGE
)
{
...
...
@@ -67,7 +67,7 @@ QVariant KSaneIntegerOption::getMaxValue() const
return
value
;
}
QVariant
KSaneIntegerOption
::
getS
tepValue
()
const
QVariant
KSaneIntegerOption
::
s
tepValue
()
const
{
QVariant
value
;
if
(
m_optDesc
->
constraint_type
==
SANE_CONSTRAINT_RANGE
)
{
...
...
@@ -78,7 +78,7 @@ QVariant KSaneIntegerOption::getStepValue() const
return
value
;
}
QVariant
KSaneIntegerOption
::
getV
alue
()
const
QVariant
KSaneIntegerOption
::
v
alue
()
const
{
QVariant
value
;
if
(
state
()
==
StateHidden
)
{
...
...
@@ -88,7 +88,7 @@ QVariant KSaneIntegerOption::getValue() const
return
value
;
}
QString
KSaneIntegerOption
::
getV
alueAsString
()
const
QString
KSaneIntegerOption
::
v
alueAsString
()
const
{
if
(
state
()
==
StateHidden
)
{
return
QString
();
...
...
src/options/ksaneintegeroption.h
View file @
6eecf4e5
...
...
@@ -23,11 +23,11 @@ public:
void
readValue
()
override
;
QVariant
getMin
Value
()
const
override
;
QVariant
getMax
Value
()
const
override
;
QVariant
getS
tepValue
()
const
override
;
QVariant
getV
alue
()
const
override
;
QString
getV
alueAsString
()
const
override
;
QVariant
minimum
Value
()
const
override
;
QVariant
maximum
Value
()
const
override
;
QVariant
s
tepValue
()
const
override
;
QVariant
v
alue
()
const
override
;
QString
v
alueAsString
()
const
override
;
public
Q_SLOTS
:
bool
setValue
(
const
QVariant
&
value
)
override
;
...
...
src/options/ksaneinvertoption.cpp
View file @
6eecf4e5
...
...
@@ -31,12 +31,12 @@ bool KSaneInvertOption::setValue(const QVariant &value)
}
}
QVariant
KSaneInvertOption
::
getV
alue
()
const
QVariant
KSaneInvertOption
::
v
alue
()
const
{
return
m_checked
;
}
QString
KSaneInvertOption
::
getV
alueAsString
()
const
QString
KSaneInvertOption
::
v
alueAsString
()
const
{
if
(
m_checked
)
{
return
QStringLiteral
(
"true"
);
...
...
src/options/ksaneinvertoption.h
View file @
6eecf4e5
...
...
@@ -23,8 +23,8 @@ class KSaneInvertOption : public KSaneOption
public:
KSaneInvertOption
();
QVariant
getV
alue
()
const
override
;
QString
getV
alueAsString
()
const
override
;
QVariant
v
alue
()
const
override
;
QString
v
alueAsString
()
const
override
;
KSaneOptionState
state
()
const
override
;
QString
name
()
const
override
;
...
...
src/options/ksanelistoption.cpp
View file @
6eecf4e5
...
...
@@ -59,7 +59,7 @@ void KSaneListOption::readValue()
}
}
QVariantList
KSaneListOption
::
getEntry
List
()
const
QVariantList
KSaneListOption
::
value
List
()
const
{
int
i
;
QVariantList
list
;
...
...
@@ -101,7 +101,7 @@ bool KSaneListOption::setValue(const QVariant &value)
return
success
;
}
QVariant
KSaneListOption
::
getMin
Value
()
const
QVariant
KSaneListOption
::
minimum
Value
()
const
{
QVariant
value
;
if
(
state
()
==
StateHidden
)
{
...
...
@@ -131,7 +131,7 @@ QVariant KSaneListOption::getMinValue() const
return
value
;
}
QVariant
KSaneListOption
::
getV
alue
()
const
QVariant
KSaneListOption
::
v
alue
()
const
{
if
(
state
()
==
StateHidden
)
{
return
QVariant
();
...
...
@@ -183,7 +183,7 @@ bool KSaneListOption::setValue(float value)
return
false
;
}
QString
KSaneListOption
::
getV
alueAsString
()
const
QString
KSaneListOption
::
v
alueAsString
()
const
{
if
(
state
()
==
StateHidden
)
{
return
QString
();
...
...
src/options/ksanelistoption.h
View file @
6eecf4e5
...
...
@@ -25,10 +25,10 @@ public:
void
readValue
()
override
;
QVariant
getMin
Value
()
const
override
;
QVariant
getV
alue
()
const
override
;
QString
getV
alueAsString
()
const
override
;
QVariantList
getEntry
List
()
const
override
;
QVariant
minimum
Value
()
const
override
;
QVariant
v
alue
()
const
override
;
QString
v
alueAsString
()
const
override
;
QVariantList
value
List
()
const
override
;
public
Q_SLOTS
:
bool
setValue
(
const
QVariant
&
value
)
override
;
...
...
src/options/ksaneoption.cpp
View file @
6eecf4e5
...
...
@@ -168,37 +168,32 @@ void KSaneOption::fromSANE_Word(unsigned char *data, SANE_Word from)
#endif
}
QVariant
KSaneOption
::
getMinV
alue
()
const
QVariant
KSaneOption
::
v
alue
()
const
{
return
QVariant
();
}
QVariant
KSaneOption
::
getMax
Value
()
const
QVariant
KSaneOption
::
minimum
Value
()
const
{
return
QVariant
();
}
QVariant
KSaneOption
::
getStep
Value
()
const
QVariant
KSaneOption
::
maximum
Value
()
const
{
return
QVariant
();
}
QVariantList
KSaneOption
::
getEntryList
()
const
{
return
QVariantList
();
}
QVariant
KSaneOption
::
getValue
()
const
QVariant
KSaneOption
::
stepValue
()
const
{
return
QVariant
();
}
Q
String
KSaneOption
::
getValueAsString
()
const
Q
VariantList
KSaneOption
::
valueList
()
const
{
return
Q
String
();
return
Q
VariantList
();
}
KSaneOption
::
KSaneOptionUnit
KSaneOption
::
get
Unit
()
const
KSaneOption
::
KSaneOptionUnit
KSaneOption
::
value
Unit
()
const
{
if
(
m_optDesc
!=
nullptr
)
{
switch
(
m_optDesc
->
unit
)
{
...
...
@@ -215,6 +210,19 @@ KSaneOption::KSaneOptionUnit KSaneOption::getUnit() const
}
}
int
KSaneOption
::
valueSize
()
const
{
if
(
m_optDesc
!=
nullptr
)
{
return
m_optDesc
->
size
/
sizeof
(
SANE_Word
);
}
return
0
;
}
QString
KSaneOption
::
valueAsString
()
const
{
return
QString
();
}