Commit 8beaad89 authored by nobody's avatar nobody

This commit was manufactured by cvs2svn to create tag

'KDE_3_3_2_RELEASE'.

svn path=/tags/KDE_3_3_2_RELEASE/kdeedu/kmplot/; revision=367579
parents be517189 79888d28
......@@ -327,7 +327,6 @@ void View::plotfkt(int ix, QPainter *pDC)
x=dmax+1;
continue;
}
errno=0;
switch(p_mode)
{
case 0:
......@@ -353,8 +352,6 @@ void View::plotfkt(int ix, QPainter *pDC)
break;
}
}
if(errno!=0) continue;
if(fktmode=='r')
{
......@@ -373,16 +370,7 @@ void View::plotfkt(int ix, QPainter *pDC)
}
if ( dgr.xclipflg || dgr.yclipflg)
{
if(mflg>=1)
p1=p2;
else
{
pDC->drawLine(p1, p2);
p1=p2;
mflg=1;
}
}
p1=p2;
else
{
if(mflg<=1)
......@@ -1235,7 +1223,6 @@ void View::findMinMaxValue(int ix, char p_mode, bool minimum, double &dmin, doub
x=dmax+1;
continue;
}
errno=0;
switch(p_mode)
{
case 0:
......@@ -1265,7 +1252,6 @@ void View::findMinMaxValue(int ix, char p_mode, bool minimum, double &dmin, doub
break;
}
}
if(errno!=0) continue;
if (x>=dmin && x<=dmax)
{
......@@ -1380,8 +1366,6 @@ void View::getYValue(int ix, char p_mode, double x, double &y, QString &str_par
progressbar->increase();
paintEvent(0);
}
if(errno!=0) continue;
if ( (x+dx > target && forward_direction) || ( x+dx < target && !forward_direction)) //right x-value is found
target_found = true;
......@@ -1648,7 +1632,6 @@ void View::areaUnderGraph(int const ix, char const p_mode, double &dmin, double
break;
continue;
}
errno=0;
switch(p_mode)
{
case 0:
......@@ -1678,38 +1661,29 @@ void View::areaUnderGraph(int const ix, char const p_mode, double &dmin, double
break;
}
}
if(errno!=0) continue;
p.setX(dgr.Transx(x));
p.setY(dgr.Transy(y));
if (dmin<=x && x<=dmax)
{
if(dgr.xclipflg || dgr.yclipflg)
if( dgr.xclipflg || dgr.yclipflg ) //out of bounds
{
if ( y<0)
if (y>-10e10 && y<10e10)
{
//p.setY(dgr.Transy(ymin));
rectheight = origoy-p.y() ;
}
else
{
//p.setY(dgr.Transy(ymax));
rectheight= -1*( p.y()-origoy) ;
if ( y<0)
rectheight = origoy-p.y() ;
else
rectheight= -1*( p.y()-origoy);
calculated_area = calculated_area + ( dx*y);
DC->fillRect(p.x(),p.y(),rectwidth,rectheight,color);
}
calculated_area = calculated_area + ( dx*y);
DC->fillRect(p.x(),p.y(),rectwidth,rectheight,color);
}
else
{
if ( y<0)
{
rectheight = origoy-p.y();
}
else
{
rectheight = -1*( p.y()-origoy);
}
calculated_area = calculated_area + (dx*y);
/*kdDebug() << "Area: " << area << endl;
kdDebug() << "x:" << p.height() << endl;
......
......@@ -41,7 +41,6 @@
// local includes
#include "diagr.h"
#include "errno.h"
#include "xparser.h"
class XParser;
......
......@@ -28,7 +28,7 @@ Comment[hr]=Crtač funkcija
Comment[hu]=függvényábrázoló
Comment[is]=Teiknar gröf falla
Comment[it]=Disegno di funzioni
Comment[ja]=関数プロッタ
Comment[ja]=関数プロッタ
Comment[lt]=funkcijinis braižytuvas
Comment[lv]=Funkciju Zīmētājs
Comment[mn]=Функцийн плоттер
......@@ -52,7 +52,6 @@ Comment[tg]=Плоттери Функсионалӣ
Comment[tr]=Fonksiyon Noktalayıcı
Comment[ven]=Mushumo wa tshiiti tsha nyito
Comment[xh]=Umzobi Womsebenzi
Comment[xx]=xxFunction Plotterxx
Comment[zh_CN]=函数绘图程序
Comment[zh_TW]=函數繪圖程式
Comment[zu]=Umbheki Womsebenzi
......@@ -63,8 +62,8 @@ Name[hi]=के-एम-प्लॉट
Name[sv]=Kmplot
Name[ta]=கேஎம்பிளாட்
Name[ven]=Mutodo wa Km
Name[xx]=xxKmPlotxx
GenericName=Function Plotter
GenericName[ar]=راسم الدّالّة
GenericName[bg]=Чертане на функции
GenericName[bs]=Crtač funkcija
GenericName[ca]=Traçador de funcions
......@@ -82,7 +81,7 @@ GenericName[hr]=Crtač funkcija
GenericName[hu]=Függvényábrázoló
GenericName[is]=Teiknar gröf falla
GenericName[it]=Disegno di funzioni
GenericName[ja]=関数プロッタ
GenericName[ja]=関数プロッタ
GenericName[lt]=funkcijinis braižytuvas
GenericName[nb]=Funksjonsplotter
GenericName[nl]=functieplotter
......@@ -99,7 +98,6 @@ GenericName[sv]=Funktionsritare
GenericName[ta]=இயக்க வரைவி
GenericName[tg]=Плоттери Функсионалӣ
GenericName[ven]=Mupulothi wa mushumo
GenericName[xx]=xxFunction Plotterxx
GenericName[zh_CN]=函数绘图程序
GenericName[zu]=Umcabangi Womcimbi
Categories=Qt;KDE;Education;Math
......
......@@ -795,13 +795,11 @@ int Parser::errmsg()
}
double ln(double x)
{ if (x>0)
return log(x);
{ return log(x);
}
double llog(double x)
{ if (x>0)
return log10(x);
{ return log10(x);
}
double sign(double x)
......
......@@ -2,30 +2,34 @@
Encoding=UTF-8
Comment=KmPlot File
Comment[bg]=Файл KmPlot
Comment[bs]=KmPlot datoteka
Comment[ca]=Fitxer de KmPlot
Comment[da]=KmPlot-fil
Comment[de]=KmPlot-Datei
Comment[es]=Archivo de KmPlot
Comment[et]=KmPloti fail
Comment[fi]=KGeo-kaavio
Comment[fr]=Fichier KmPlot
Comment[gl]=Ficheiro de KmPlot
Comment[hu]=KmPlot-fájl
Comment[is]=KmPlot-skrá
Comment[it]=File di KmPlot
Comment[ja]=KmPlot ファイル
Comment[nb]=KmPlot-fil
Comment[nl]=KmPlot-bestand
Comment[nn]=KmPlot-fil
Comment[pl]=Plik KmPlot
Comment[pt]=Ficheiro do KmPlot
Comment[pt_BR]=Arquivo do KMPlot
Comment[ru]=Файл KmPlot
Comment[sk]=Súbor KmPlot
Comment[sl]=Datoteka KmPlot
Comment[sr]=Фајл KmPlot-а
Comment[sr@Latn]=Фајл KmPlot-а
Comment[sr@Latn]=Fajl KmPlot-a
Comment[sv]=Kmplot-fil
Comment[ta]= கேஎம்பிளாட் கோப்பு
Comment[tg]=Файли KmPlot
Comment[tr]=KmPlot Dosyası
Comment[xx]=xxKmPlot Filexx
Comment[zh_CN]=KmPlot 文件
Icon=kmplot
Type=MimeType
......
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