Commit f3012923 authored by Anne-Marie Mahfouf's avatar Anne-Marie Mahfouf

german -> english

the doxygen comments are to be in the .h file

svn path=/trunk/kdeedu/kmplot/; revision=302276
parent 9c0de358
......@@ -105,10 +105,10 @@ void View::plotfkt(int ix, QPainter *pDC)
double dx, x, y, dmin, dmax;
QString fname, fstr;
QPoint p1, p2;
QPen pen(ps.fktext[ix].farbe, (int)(ps.fktext[ix].dicke*s));
QPen pen(ps.fktext[ix].color, (int)(ps.fktext[ix].dicke*s));
pen.setCapStyle(Qt::RoundCap);
if(ix==-1 || ix>=ps.ufanz) return ; // ungltiger Index
if(ix==-1 || ix>=ps.ufanz) return ; // ungltiger Index
if(ps.fktext[ix].f_mode==0) return ; // NOPLOT
dx=sw;
......@@ -197,7 +197,7 @@ void View::plotfkt(int ix, QPainter *pDC)
else if(ps.fktext[ix].f2_mode==1 && p_mode< 2) p_mode=2;
else break;
pen=QPen(ps.fktext[ix].farbe, 1);
pen=QPen(ps.fktext[ix].color, 1);
pDC->setPen(pen);
}
}
......@@ -320,7 +320,7 @@ void View::paintEvent(QPaintEvent *)
void View::mouseMoveEvent(QMouseEvent *e)
{ char sx[20], sy[20];
if(csflg==1) // Fadenkreuz lschen
if(csflg==1) // Fadenkreuz lchen
{ bitBlt(this, area.left(), fcy, &hline, 0, 0, area.width(), 1);
bitBlt(this, fcx, area.top(), &vline, 0, 0, 1, area.height());
csflg=0;
......@@ -368,7 +368,7 @@ void View::mouseMoveEvent(QMouseEvent *e)
bitBlt(&vline, 0, 0, this, fcx=ptd.x(), area.top(), 1, area.height());
// Fadenkreuz zeichnen
QPen pen((csmode>=0)? ps.fktext[csmode].farbe : 0, 1);
QPen pen((csmode>=0)? ps.fktext[csmode].color : 0, 1);
DC.begin(this);
DC.setPen(pen);
......@@ -406,7 +406,7 @@ void View::mousePressEvent(QMouseEvent *e)
{ case 0:
case 'x':
case 'y':
case 'r': continue; // Fangen nicht mglich
case 'r': continue; // Fangen nicht mlich
}
k=0;
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Mller
* Copyright (C) 1998, 1999 Klaus-Dieter Mler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......@@ -58,7 +58,7 @@ CDiagr::~CDiagr()
}
void CDiagr::Create(QPoint Ref, // Bezugspunkt links unten
int lx, int ly, // Achsenlngen
int lx, int ly, // Achsenlgen
double xmin, double xmax, // x-Wertebereich
double ymin, double ymax, // y-Wertebereich
char mode) // Modus (Achsen, Pfeile, Rahmen)
......@@ -174,7 +174,7 @@ void CDiagr::Achsen(QPainter* pDC) // Achsen zeichnen
{ int a, b, tl;
double d, da, db;
if(mode&ACHSEN)
if(mode&AXES)
{ int dx, dy;
pDC->setPen(QPen(axesColor, axesThickness));
......@@ -196,7 +196,7 @@ void CDiagr::Achsen(QPainter* pDC) // Achsen zeichnen
}
pDC->setPen(QPen(axesColor, gradThickness));
if(mode&ACHSEN)
if(mode&AXES)
{ da=oy-gradLength;
db=oy+gradLength;
tl=(mode&RAHMEN)? 0: gradLength;
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Mller
* Copyright (C) 1998, 1999 Klaus-Dieter Mler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......@@ -39,7 +39,7 @@
#define Lineh(x1, y, x2) drawLine(x1, y, x2, y)
#define Linev(x, y1, y2) drawLine(x, y1, x, y2)
#define ACHSEN 1 /**< visible axes */
#define AXES 1 /**< visible axes */
#define PFEILE 2 /**< axes with arrows */
#define RAHMEN 4 /**< visible frame */
#define EXTRAHMEN 8 /**< bigger frame */
......@@ -84,7 +84,7 @@ public:
gradThickness,
gradLength,
xclipflg, // clipflg wird auf 1 gesetzt, wenn die
yclipflg; // Koordinaten auerhalb des Diagramms liegen
yclipflg; // Koordinaten aurhalb des Diagramms liegen
private:
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Mller
* Copyright (C) 1998, 1999 Klaus-Dieter Mler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......@@ -70,7 +70,7 @@ void KEditFunction::clearWidgets()
min->clear();
max->clear();
kIntNumInputLineWidth->setValue( m_parser->dicke0 );
kColorButtonColor->setColor( m_parser->fktext[ m_parser->getNextIndex() ].farbe );
kColorButtonColor->setColor( m_parser->fktext[ m_parser->getNextIndex() ].color );
}
/**
......@@ -93,7 +93,7 @@ void KEditFunction::setWidgets()
min->setText( m_parser->fktext[ m_index ].str_dmin );
max->setText( m_parser->fktext[ m_index ].str_dmax );
kIntNumInputLineWidth->setValue( m_parser->fktext[ m_index ].dicke );
kColorButtonColor->setColor( m_parser->fktext[ m_index ].farbe );
kColorButtonColor->setColor( m_parser->fktext[ m_index ].color );
}
/**
......@@ -149,7 +149,7 @@ void KEditFunction::accept()
}
m_parser->fktext[ index ].dicke = kIntNumInputLineWidth->value();
m_parser->fktext[ index ].farbe = kColorButtonColor->color().rgb();
m_parser->fktext[ index ].color = kColorButtonColor->color().rgb();
// call inherited method
QEditFunction::accept();
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Möller
* Copyright (C) 1998, 1999 Klaus-Dieter M�ler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Mller
* Copyright (C) 1998, 1999 Klaus-Dieter Mler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......@@ -70,7 +70,7 @@ void KEditParametric::clearWidgets()
min->clear();
max->clear();
kIntNumInputLineWidth->setValue( m_parser->dicke0 );
kColorButtonColor->setColor( m_parser->fktext[ m_parser->getNextIndex() ].farbe );
kColorButtonColor->setColor( m_parser->fktext[ m_parser->getNextIndex() ].color );
}
/**
......@@ -89,7 +89,7 @@ void KEditParametric::setWidgets()
min->setText( m_parser->fktext[ m_x_index ].str_dmin );
max->setText( m_parser->fktext[ m_x_index ].str_dmax );
kIntNumInputLineWidth->setValue( m_parser->fktext[ m_x_index ].dicke );
kColorButtonColor->setColor( m_parser->fktext[ m_x_index ].farbe );
kColorButtonColor->setColor( m_parser->fktext[ m_x_index ].color );
}
/**
......@@ -138,7 +138,7 @@ void KEditParametric::accept()
}
m_parser->fktext[ index ].dicke = kIntNumInputLineWidth->value();
m_parser->fktext[ index ].farbe = kColorButtonColor->color().rgb();
m_parser->fktext[ index ].color = kColorButtonColor->color().rgb();
index = m_parser->addfkt( yFunction() );
if( index == -1 )
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Mller
* Copyright (C) 1998, 1999 Klaus-Dieter Mler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......@@ -46,9 +46,6 @@ KEditPolar::KEditPolar( XParser* parser, QWidget* parent, const char* name ) :
m_parser = parser;
}
/**
* Fill the dialog's widgets with the properties of the parser function number index.
*/
void KEditPolar::initDialog( int index )
{
m_index = index;
......@@ -56,9 +53,6 @@ void KEditPolar::initDialog( int index )
else setWidgets();
}
/**
* Clear alls widgets values
*/
void KEditPolar::clearWidgets()
{
kLineEditYFunction->clear();
......@@ -67,12 +61,9 @@ void KEditPolar::clearWidgets()
min->clear();
max->clear();
kIntNumInputLineWidth->setValue( m_parser->dicke0 );
kColorButtonColor->setColor( m_parser->fktext[ m_parser->getNextIndex() ].farbe );
kColorButtonColor->setColor( m_parser->fktext[ m_parser->getNextIndex() ].color );
}
/**
* Fill the dialog's widgets with values from the parser
*/
void KEditPolar::setWidgets()
{
QString function = m_parser->fktext[ m_index ].extstr;
......@@ -83,12 +74,9 @@ void KEditPolar::setWidgets()
min->setText( m_parser->fktext[ m_index ].str_dmin );
max->setText( m_parser->fktext[ m_index ].str_dmax );
kIntNumInputLineWidth->setValue( m_parser->fktext[ m_index ].dicke );
kColorButtonColor->setColor( m_parser->fktext[ m_index ].farbe );
kColorButtonColor->setColor( m_parser->fktext[ m_index ].color );
}
/**
* Overwrites the dialog's accept() method to make sure, that the user's input is valid.
*/
void KEditPolar::accept()
{
// if we are editing an existing function, first delete the old one
......@@ -123,15 +111,12 @@ void KEditPolar::accept()
}
m_parser->fktext[ index ].dicke = kIntNumInputLineWidth->value();
m_parser->fktext[ index ].farbe = kColorButtonColor->color().rgb();
m_parser->fktext[ index ].color = kColorButtonColor->color().rgb();
// call inherited method
QEditPolar::accept();
}
/**
* return the well formed function equation
*/
const QString KEditPolar::functionItem()
{
return "r" + kLineEditYFunction->text();
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Möller
* Copyright (C) 1998, 1999 Klaus-Dieter M�ler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......@@ -37,17 +37,32 @@ class KEditPolar : public QEditPolar
KEditPolar( XParser* parser, QWidget* parent = NULL, const char* name = NULL );
virtual ~KEditPolar() {};
/**
* Fill the dialog's widgets with the properties of the parser function number index.
*/
void initDialog( int index = -1 );
// void setFunction( int index );
/**
* return the well formed function equation
*/
const QString functionItem();
private:
/**
* Clear alls widgets values
*/
void clearWidgets();
/**
* Fill the dialog's widgets with values from the parser
*/
void setWidgets();
XParser* m_parser;
int m_index;
protected slots:
/**
* Overwrites the dialog's accept() method to make sure, that the user's input is valid.
*/
virtual void accept();
void slotHelp();
};
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Mller
* Copyright (C) 1998, 1999 Klaus-Dieter Mler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......@@ -99,7 +99,7 @@ void KmPlotIO::save( const QString filename )
tag.setAttribute( "visible-deriv", ps.fktext[ ix ].f1_mode );
tag.setAttribute( "visible-2nd-deriv", ps.fktext[ ix ].f2_mode );
tag.setAttribute( "width", ps.fktext[ ix ].dicke );
tag.setAttribute( "color", QColor( ps.fktext[ ix ].farbe ).name() );
tag.setAttribute( "color", QColor( ps.fktext[ ix ].color ).name() );
addTag( doc, tag, "equation", ps.fktext[ ix ].extstr );
......@@ -262,7 +262,7 @@ void KmPlotIO::parseFunction( const QDomElement & n )
ps.fktext[ ix ].f1_mode = n.attribute( "visible-deriv" ).toInt();
ps.fktext[ ix ].f2_mode = n.attribute( "visible-2nd-deriv" ).toInt();
ps.fktext[ ix ].dicke = n.attribute( "width" ).toInt();
ps.fktext[ ix ].farbe = QColor( n.attribute( "color" ) ).rgb();
ps.fktext[ ix ].color = QColor( n.attribute( "color" ) ).rgb();
ps.fktext[ ix ].extstr = n.namedItem( "equation" ).toElement().text();
QCString fstr = ps.fktext[ ix ].extstr.utf8();
......
......@@ -33,14 +33,14 @@ tlgy, // y-Achsenteilung
drskalx, // x-Ausdruckskalierung
drskaly; // y-Ausdruckskalierung
QString xminstr, // String fr xmind
xmaxstr, // String fr xmaxd
yminstr, // String fr ymind
ymaxstr, // String fr ymaxd
tlgxstr, // String fr tlgx
tlgystr, // String fr tlgy
drskalxstr, // String fr drskalx
drskalystr; // String fr drskaly
QString xminstr, // String fr xmind
xmaxstr, // String fr xmaxd
yminstr, // String fr ymind
ymaxstr, // String fr ymaxd
tlgxstr, // String fr tlgx
tlgystr, // String fr tlgy
drskalxstr, // String fr drskalx
drskalystr; // String fr drskaly
QString font_header, font_axes; // Font family names
......@@ -52,7 +52,7 @@ bool printtable; // header table printing option
void getSettings()
{
mode = ACHSEN | PFEILE | EXTRAHMEN;
mode = AXES | PFEILE | EXTRAHMEN;
rsw = 1.;
// axes settings
......@@ -119,16 +119,16 @@ void getSettings()
// graph settings
ps.dicke0 = Settings::gridLineWidth();
ps.fktext[ 0 ].farbe = Settings::color0().rgb();
ps.fktext[ 1 ].farbe = Settings::color1().rgb();
ps.fktext[ 2 ].farbe = Settings::color2().rgb();
ps.fktext[ 3 ].farbe = Settings::color3().rgb();
ps.fktext[ 4 ].farbe = Settings::color4().rgb();
ps.fktext[ 5 ].farbe = Settings::color5().rgb();
ps.fktext[ 6 ].farbe = Settings::color6().rgb();
ps.fktext[ 7 ].farbe = Settings::color7().rgb();
ps.fktext[ 8 ].farbe = Settings::color8().rgb();
ps.fktext[ 9 ].farbe = Settings::color9().rgb();
ps.fktext[ 0 ].color = Settings::color0().rgb();
ps.fktext[ 1 ].color = Settings::color1().rgb();
ps.fktext[ 2 ].color = Settings::color2().rgb();
ps.fktext[ 3 ].color = Settings::color3().rgb();
ps.fktext[ 4 ].color = Settings::color4().rgb();
ps.fktext[ 5 ].color = Settings::color5().rgb();
ps.fktext[ 6 ].color = Settings::color6().rgb();
ps.fktext[ 7 ].color = Settings::color7().rgb();
ps.fktext[ 8 ].color = Settings::color8().rgb();
ps.fktext[ 9 ].color = Settings::color9().rgb();
printtable = true;
// precision settings
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Möller
* Copyright (C) 1998, 1999 Klaus-Dieter M�ler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Mller
* Copyright (C) 1998, 1999 Klaus-Dieter Mler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......@@ -35,7 +35,7 @@ XParser::XParser()
fktext = new FktExt[ UFANZ ];
for ( ix = 0; ix < UFANZ; ++ix )
fktext[ ix ].farbe = 0;
fktext[ ix ].color = 0;
}
XParser::XParser( int anz, int m_size, int s_size ) : Parser( anz, m_size, s_size )
......@@ -44,7 +44,7 @@ XParser::XParser( int anz, int m_size, int s_size ) : Parser( anz, m_size, s_siz
fktext = new FktExt[ ufanz ];
for ( ix = 0; ix < ufanz; ++ix )
fktext[ ix ].farbe = 0;
fktext[ ix ].color = 0;
}
XParser::~XParser()
......@@ -151,7 +151,7 @@ int XParser::delfkt( int ix )
fktext[ ix ].k_anz = 0;
fktext[ ix ].dmin = fktext[ ix ].dmax = 0.;
fktext[ ix ].extstr = ""; //.resize(1);
// fktext[ ix ].farbe = fktext[ ix ].farbe0;
// fktext[ ix ].color = fktext[ ix ].color0;
return ix;
}
......
/*
* KmPlot - a math. function plotter for the KDE-Desktop
*
* Copyright (C) 1998, 1999 Klaus-Dieter Mller
* Copyright (C) 1998, 1999 Klaus-Dieter M�ler
* 2000, 2002 kd.moeller@t-online.de
*
* This file is part of the KDE Project.
......@@ -43,7 +43,7 @@ public:
~XParser();
int dicke0; // Linienstrke Voreinstellung
int dicke0; // Linienst�ke Voreinstellung
struct FktExt // Funktionsattribute:
{
......@@ -51,15 +51,15 @@ public:
f1_mode, // 1 => Graph von f' zeichnen
f2_mode; // 1 => Graph von f" zeichnen
int dicke, // Stiftdicke
k_anz; // Lnge der Parameterliste
k_anz; // L�ge der Parameterliste
QString str_dmin, str_dmax; // Definitionsbereich
double dmin,
dmax,
k_liste[ 10 ]; // Parameterliste
QString extstr; // vollstndiger Eingabeterm
QRgb farbe, // Farbe des Graphen
farbe0; // Farbvoreinstellung
QString extstr; // vollst�diger Eingabeterm
QRgb color, // color des Graphen
color0; // Farbvoreinstellung
}
*fktext;
};
......
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 to comment