Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Education
KmPlot
Commits
66aef9fd
Commit
66aef9fd
authored
Feb 06, 2006
by
Pino Toscano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kdDebug -> kDebug
svn path=/trunk/KDE/kdeedu/kmplot/; revision=506360
parent
9d34a03c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
37 additions
and
37 deletions
+37
-37
kmplot/MainDlg.cpp
kmplot/MainDlg.cpp
+8
-8
kmplot/View.cpp
kmplot/View.cpp
+14
-14
kmplot/keditpolar.cpp
kmplot/keditpolar.cpp
+1
-1
kmplot/kminmax.cpp
kmplot/kminmax.cpp
+2
-2
kmplot/kmplotio.cpp
kmplot/kmplotio.cpp
+1
-1
kmplot/parser.cpp
kmplot/parser.cpp
+9
-9
kmplot/xparser.cpp
kmplot/xparser.cpp
+2
-2
No files found.
kmplot/MainDlg.cpp
View file @
66aef9fd
...
...
@@ -69,7 +69,7 @@ MainDlg::MainDlg(QWidget *parentWidget, const char *, QObject *parent, const cha
// we need an instance
setInstance
(
KmPlotPartFactory
::
instance
()
);
k
d
Debug
()
<<
"parentWidget->name():"
<<
parentWidget
->
name
()
<<
endl
;
kDebug
()
<<
"parentWidget->name():"
<<
parentWidget
->
name
()
<<
endl
;
if
(
QString
(
parentWidget
->
name
()).
startsWith
(
"KmPlot"
)
)
{
setXMLFile
(
"kmplot_part.rc"
);
...
...
@@ -253,7 +253,7 @@ void MainDlg::slotSave()
return
;
}
kmplotio
->
save
(
m_url
.
url
()
);
k
d
Debug
()
<<
"saved"
<<
endl
;
kDebug
()
<<
"saved"
<<
endl
;
m_modified
=
false
;
}
...
...
@@ -626,9 +626,9 @@ void MainDlg::loadConstants()
tmp
.
setNum
(
i
);
tmp_constant
=
conf
.
readEntry
(
"nameConstant"
+
tmp
,
QString
(
" "
));
tmp_value
=
conf
.
readEntry
(
"valueConstant"
+
tmp
,
QString
(
" "
));
// k
d
Debug() << "konstant: " << tmp_constant.latin1() << endl;
// k
d
Debug() << "value: " << value << endl;
// k
d
Debug() << "**************" << endl;
// kDebug() << "konstant: " << tmp_constant.latin1() << endl;
// kDebug() << "value: " << value << endl;
// kDebug() << "**************" << endl;
if
(
tmp_constant
==
" "
||
tmp_constant
==
" "
)
return
;
...
...
@@ -667,9 +667,9 @@ void MainDlg::loadConstants()
}
}
}
/*k
d
Debug() << "**************" << endl;
k
d
Debug() << "C:" << constant << endl;
k
d
Debug() << "V:" << value << endl;*/
/*kDebug() << "**************" << endl;
kDebug() << "C:" << constant << endl;
kDebug() << "V:" << value << endl;*/
view
->
parser
()
->
constant
.
append
(
Constant
(
constant
,
value
)
);
}
...
...
kmplot/View.cpp
View file @
66aef9fd
...
...
@@ -266,7 +266,7 @@ void View::plotfkt(Ufkt *ufkt, QPainter *pDC)
ke
=
ufkt
->
parameters
.
count
();
do
{
k
d
Debug
()
<<
"drawing "
<<
ufkt
->
id
<<
endl
;
kDebug
()
<<
"drawing "
<<
ufkt
->
id
<<
endl
;
if
(
p_mode
==
3
&&
stop_calculating
)
break
;
if
(
ufkt
->
use_slider
==
-
1
)
...
...
@@ -863,7 +863,7 @@ void View::mousePressEvent(QMouseEvent *e)
if
(
function_type
==
'y'
||
function_type
==
'r'
||
it
->
fname
.
isEmpty
())
continue
;
if
(
!
(((
!
it
->
usecustomxmin
)
||
(
it
->
usecustomxmin
&&
csxpos
>
it
->
dmin
))
&&
((
!
it
->
usecustomxmax
)
||
(
it
->
usecustomxmax
&&
csxpos
<
it
->
dmax
))
))
continue
;
k
d
Debug
()
<<
"it:"
<<
it
->
fstr
<<
endl
;
kDebug
()
<<
"it:"
<<
it
->
fstr
<<
endl
;
int
k
=
0
;
int
const
ke
=
it
->
parameters
.
count
();
do
...
...
@@ -1286,8 +1286,8 @@ void View::findMinMaxValue(Ufkt *ufkt, char p_mode, bool minimum, double &dmin,
}
if
(
!
isnan
(
x
)
&&
!
isnan
(
y
)
)
{
k
d
Debug
()
<<
"x "
<<
x
<<
endl
;
k
d
Debug
()
<<
"y "
<<
y
<<
endl
;
kDebug
()
<<
"x "
<<
x
<<
endl
;
kDebug
()
<<
"y "
<<
y
<<
endl
;
if
(
x
>=
dmin
&&
x
<=
dmax
)
{
if
(
start
)
...
...
@@ -1487,7 +1487,7 @@ void View::keyPressEvent( QKeyEvent * e)
cstype
=
old_cstype
;
break
;
}
k
d
Debug
()
<<
"csmode: "
<<
csmode
<<
endl
;
kDebug
()
<<
"csmode: "
<<
csmode
<<
endl
;
switch
(
it
->
fstr
[
0
].
latin1
())
{
case
'x'
:
...
...
@@ -1506,7 +1506,7 @@ void View::keyPressEvent( QKeyEvent * e)
cstype
=
old_cstype
+
1
;
start
=
false
;
}
k
d
Debug
()
<<
" cstype: "
<<
(
int
)
cstype
<<
endl
;
kDebug
()
<<
" cstype: "
<<
(
int
)
cstype
<<
endl
;
switch
(
cstype
)
{
case
(
0
):
...
...
@@ -1537,10 +1537,10 @@ void View::keyPressEvent( QKeyEvent * e)
}
}
k
d
Debug
()
<<
"************************"
<<
endl
;
k
d
Debug
()
<<
"csmode: "
<<
(
int
)
csmode
<<
endl
;
k
d
Debug
()
<<
"cstype: "
<<
(
int
)
cstype
<<
endl
;
k
d
Debug
()
<<
"csparam: "
<<
csparam
<<
endl
;
kDebug
()
<<
"************************"
<<
endl
;
kDebug
()
<<
"csmode: "
<<
(
int
)
csmode
<<
endl
;
kDebug
()
<<
"cstype: "
<<
(
int
)
cstype
<<
endl
;
kDebug
()
<<
"csparam: "
<<
csparam
<<
endl
;
//change function in the statusbar
switch
(
cstype
)
...
...
@@ -1729,10 +1729,10 @@ void View::areaUnderGraph( Ufkt *ufkt, char const p_mode, double &dmin, double
rectheight
=
-
1
*
(
p
.
y
()
-
origoy
);
calculated_area
=
calculated_area
+
(
dx
*
y
);
/*k
d
Debug() << "Area: " << area << endl;
k
d
Debug() << "x:" << p.height() << endl;
k
d
Debug() << "y:" << p.y() << endl;
k
d
Debug() << "*************" << endl;*/
/*kDebug() << "Area: " << area << endl;
kDebug() << "x:" << p.height() << endl;
kDebug() << "y:" << p.y() << endl;
kDebug() << "*************" << endl;*/
DC
->
fillRect
(
p
.
x
(),
p
.
y
(),
rectwidth
,
rectheight
,
color
);
}
...
...
kmplot/keditpolar.cpp
View file @
66aef9fd
...
...
@@ -178,7 +178,7 @@ void KEditPolar::accept()
else
{
int
const
id
=
m_parser
->
addfkt
(
f_str
);
k
d
Debug
()
<<
"id: "
<<
id
<<
endl
;
kDebug
()
<<
"id: "
<<
id
<<
endl
;
if
(
id
==
-
1
)
{
m_parser
->
parserError
();
...
...
kmplot/kminmax.cpp
View file @
66aef9fd
...
...
@@ -189,7 +189,7 @@ void KMinMax::selectItem()
cmdParameter
->
hide
();
if
(
m_view
->
csmode
<
0
)
return
;
//k
d
Debug() << "cstype: " << (int)m_view->cstype << endl;
//kDebug() << "cstype: " << (int)m_view->cstype << endl;
Ufkt
*
ufkt
=
&
m_view
->
parser
()
->
ufkt
[
m_view
->
parser
()
->
ixValue
(
m_view
->
csmode
)];
QString
function
=
ufkt
->
fstr
;
if
(
m_view
->
cstype
==
2
)
...
...
@@ -204,7 +204,7 @@ void KMinMax::selectItem()
function
.
truncate
(
i
);
function
+=
"
\'
"
;
}
//k
d
Debug() << "function: " << function << endl;
//kDebug() << "function: " << function << endl;
Q3ListBoxItem
*
item
=
list
->
findItem
(
function
,
Q3ListView
::
ExactMatch
);
list
->
setSelected
(
item
,
true
);
...
...
kmplot/kmplotio.cpp
View file @
66aef9fd
...
...
@@ -498,7 +498,7 @@ void KmPlotIO::parseThreeDotThreeParameters( XParser *m_parser, const QDomElemen
void
KmPlotIO
::
oldParseFunction
(
XParser
*
m_parser
,
const
QDomElement
&
n
)
{
k
d
Debug
()
<<
"parsing old function"
<<
endl
;
kDebug
()
<<
"parsing old function"
<<
endl
;
Ufkt
ufkt
;
m_parser
->
prepareAddingFunction
(
&
ufkt
);
...
...
kmplot/parser.cpp
View file @
66aef9fd
...
...
@@ -111,10 +111,10 @@ void Parser::ps_init()
Parser
::~
Parser
()
{
k
d
Debug
()
<<
"Exiting......"
<<
endl
;
kDebug
()
<<
"Exiting......"
<<
endl
;
for
(
Q3ValueVector
<
Ufkt
>::
iterator
it
=
ufkt
.
begin
();
it
!=
ufkt
.
end
();
++
it
)
{
k
d
Debug
()
<<
"Deleting something... :-)"
<<
endl
;
kDebug
()
<<
"Deleting something... :-)"
<<
endl
;
delete
[](
*
it
).
mem
;
}
}
...
...
@@ -355,7 +355,7 @@ int Parser::addfkt(QString str)
if
(
ufkt
.
begin
()
->
fname
.
isEmpty
()
)
{
ufkt
.
begin
()
->
id
=
0
;
//k
d
Debug() << "ufkt.begin()->id:" << ufkt.begin()->id << endl;
//kDebug() << "ufkt.begin()->id:" << ufkt.begin()->id << endl;
}
else
{
...
...
@@ -376,7 +376,7 @@ int Parser::addfkt(QString str)
if
(
p2
<
p3
)
temp
->
fpar
=
str
.
mid
(
p2
+
1
,
p3
-
p2
-
1
);
else
temp
->
fpar
=
""
;
//.resize(1);
k
d
Debug
()
<<
"temp.id:"
<<
temp
->
id
<<
endl
;
kDebug
()
<<
"temp.id:"
<<
temp
->
id
<<
endl
;
if
(
temp
->
fname
!=
temp
->
fname
.
lower
()
)
//isn't allowed to contain capital letters
{
...
...
@@ -407,7 +407,7 @@ void Parser::reparse(int ix)
void
Parser
::
reparse
(
Ufkt
*
item
)
{
k
d
Debug
()
<<
"Reparsing: "
<<
item
->
fstr
<<
endl
;
kDebug
()
<<
"Reparsing: "
<<
item
->
fstr
<<
endl
;
QString
str
=
item
->
fstr
.
latin1
();
err
=
0
;
errpos
=
1
;
...
...
@@ -502,12 +502,12 @@ void Parser::fix_expression(QString &str, int const pos)
str_end
=
str_end
.
replace
(
m_decimalsymbol
,
"."
);
//replace the locale decimal symbol with a '.'
str
.
truncate
(
pos
);
str
.
append
(
str_end
);
//k
d
Debug() << "str:" << str << endl;
//kDebug() << "str:" << str << endl;
}
bool
Parser
::
delfkt
(
Ufkt
*
item
)
{
k
d
Debug
()
<<
"Deleting id:"
<<
item
->
id
<<
endl
;
kDebug
()
<<
"Deleting id:"
<<
item
->
id
<<
endl
;
if
(
!
item
->
dep
.
isEmpty
())
{
KMessageBox
::
error
(
0
,
i18n
(
"This function is depending on an other function"
));
...
...
@@ -524,12 +524,12 @@ bool Parser::delfkt( Ufkt *item)
if
(
ufkt
.
count
()
==
1
)
{
//k
d
Debug() << "first item, don't delete" << endl;
//kDebug() << "first item, don't delete" << endl;
item
->
fname
=
""
;
}
else
{
//k
d
Debug() << "Deleting something" << endl;
//kDebug() << "Deleting something" << endl;
QChar
const
extstr_c
=
item
->
fstr
.
at
(
0
);
uint
const
id
=
item
->
id
;
delete
[]
item
->
mem
;
...
...
kmplot/xparser.cpp
View file @
66aef9fd
...
...
@@ -160,7 +160,7 @@ void XParser::findFunctionName(QString &function_name, int const id, int const t
}
if
(
ok
)
//a free name was found
{
//k
d
Debug() << "function_name:" << function_name << endl;
//kDebug() << "function_name:" << function_name << endl;
return
;
}
ok
=
true
;
...
...
@@ -765,7 +765,7 @@ bool XParser::sendFunction(int id, const QString &dcopclient_target)
}
Ufkt
*
item
=
&
ufkt
[
ixValue
(
id
)];
k
d
Debug
()
<<
"Transferring "
<<
item
->
fname
.
latin1
()
<<
endl
;
kDebug
()
<<
"Transferring "
<<
item
->
fname
.
latin1
()
<<
endl
;
QString
str_result
;
if
(
dcopclient_target
.
isEmpty
()
&&
item
->
fname
.
at
(
0
)
==
'y'
)
return
false
;
...
...
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