Hello community, here is the log from the commit of package kmplot for openSUSE:Factory checked in at 2012-01-30 12:26:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmplot (Old) and /work/SRC/openSUSE:Factory/.kmplot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmplot", Maintainer is "adrian@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kmplot/kmplot.changes 2011-12-08 12:11:28.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmplot.new/kmplot.changes 2012-01-30 12:26:07.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Jan 18 20:58:37 CET 2012 - dmueller@suse.de + +- update to 4.8.0 + * first stable release of KDE 4.8 (only critical fixes over 4.7.98) + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- +Tue Jan 10 16:33:21 CET 2012 - dmueller@suse.de + +- update to 4.7.98 + * RC2+ milestone release of KDE 4.8 + * see http://kde.org/announcements/4.8/ for details + + +------------------------------------------------------------------- Old: ---- kmplot-4.7.4.tar.bz2 New: ---- kmplot-4.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmplot.spec ++++++ --- /var/tmp/diff_new_pack.NHtwty/_old 2012-01-30 12:26:09.000000000 +0100 +++ /var/tmp/diff_new_pack.NHtwty/_new 2012-01-30 12:26:09.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kmplot # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,7 +45,7 @@ BuildRequires: ocaml BuildRequires: ocaml-facile %endif -Version: 4.7.4 +Version: 4.8.0 Release: 0 Summary: Mathematical Function Plotter License: GPL-2.0+ ++++++ kmplot-4.7.4.tar.bz2 -> kmplot-4.8.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmplot-4.7.4/CMakeLists.txt new/kmplot-4.8.0/CMakeLists.txt --- old/kmplot-4.7.4/CMakeLists.txt 2011-10-02 15:25:19.000000000 +0200 +++ new/kmplot-4.8.0/CMakeLists.txt 2011-09-26 11:44:48.000000000 +0200 @@ -5,6 +5,7 @@ include(CheckIncludeFiles) include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) +add_definitions (-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) check_include_files(ieeefp.h HAVE_IEEEFP_H) configure_file(config-kmplot.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kmplot/config-kmplot.h) Files old/kmplot-4.7.4/doc/index.cache.bz2 and new/kmplot-4.8.0/doc/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmplot-4.7.4/kmplot/equationeditorwidget.cpp new/kmplot-4.8.0/kmplot/equationeditorwidget.cpp --- old/kmplot-4.7.4/kmplot/equationeditorwidget.cpp 2011-10-02 15:25:19.000000000 +0200 +++ new/kmplot-4.8.0/kmplot/equationeditorwidget.cpp 2011-10-20 22:54:06.000000000 +0200 @@ -60,7 +60,9 @@ connect(functionList, SIGNAL(activated(const QString&)), this, SLOT(insertFunction(const QString&))); connect(constantList, SIGNAL(activated(int)), this, SLOT(insertConstant(int))); - functionList->addItems(XParser::self()->predefinedFunctions(false)); + QStringList functions = XParser::self()->predefinedFunctions(false); + functions.sort(); + functionList->addItems(functions); connect(XParser::self()->constants(), SIGNAL(constantsChanged()), this, SLOT(updateConstantList())); updateConstantList(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmplot-4.7.4/kmplot/functioneditorwidget.ui new/kmplot-4.8.0/kmplot/functioneditorwidget.ui --- old/kmplot-4.7.4/kmplot/functioneditorwidget.ui 2011-10-02 15:25:19.000000000 +0200 +++ new/kmplot-4.8.0/kmplot/functioneditorwidget.ui 2011-07-27 20:40:47.000000000 +0200 @@ -257,7 +257,7 @@ <attribute name="title"> <string>Integral</string> </attribute> - <layout class="QGridLayout" name="gridLayout"> + <layout class="QGridLayout" name="gridLayout3"> <property name="margin"> <number>9</number> </property> @@ -571,8 +571,8 @@ <string>Enter an equation</string> </property> <property name="whatsThis"> - <string>Enter an expression for the function. The prefix "r" will be added automatically. -Example: loop(angle)=ln(angle)</string> + <string>Enter an expression for the function. +Example: loop(a)=ln(a)</string> </property> </widget> </item> @@ -701,7 +701,6 @@ </property> <property name="whatsThis"> <string>Enter an expression for the function. -The dummy variable is t. Example: x^2 + y^2 = 25.</string> </property> </widget> @@ -753,7 +752,6 @@ </property> <property name="whatsThis"> <string>Enter an expression for the function. -The dummy variable is t. Example: f''(x) = -f</string> </property> <property name="text"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmplot-4.7.4/kmplot/kmplot.desktop new/kmplot-4.8.0/kmplot/kmplot.desktop --- old/kmplot-4.7.4/kmplot/kmplot.desktop 2011-10-28 09:43:46.000000000 +0200 +++ new/kmplot-4.8.0/kmplot/kmplot.desktop 2012-01-10 15:15:14.000000000 +0100 @@ -40,6 +40,7 @@ Comment[it]=Grafici di funzioni Comment[ja]=関数プロッタ Comment[ka]=ფუნქციების გრაფიკები +Comment[kk]=Функцияның графигі Comment[km]=ឧបករណ៍គូសក្រាហ្វិកអនុគមន៍ Comment[ko]=함수 플로터 Comment[lt]=Funkcijų braižytuvas @@ -59,7 +60,7 @@ Comment[ru]=Построение графиков функций Comment[se]=Funkšuvdnasárgojeaddji Comment[sk]=Kreslenie funkcií -Comment[sl]=Risanje funkcij +Comment[sl]=Izrisovalnik funkcij Comment[sv]=Funktionsritare Comment[ta]=இயக்க வரைவி Comment[tg]=Плоттери Функсионалӣ @@ -107,6 +108,7 @@ Name[it]=KmPlot Name[ja]=KmPlot Name[ka]=KmPlot +Name[kk]= Name[km]=KmPlot Name[ko]=KmPlot Name[lt]=KmPlot @@ -175,6 +177,7 @@ GenericName[it]=Grafici di funzioni matematiche GenericName[ja]=数学関数プロッタ GenericName[ka]=მათიმატიკური ფუნქციების გრაფიკები +GenericName[kk]=Математикалық функцияның графигі GenericName[km]=ឧបករណ៍គូសក្រាហ្វិកអនុគមន៍គណិតវិទ្យា GenericName[ko]=수학 함수 플로터 GenericName[lt]=Matematinių funkcijų braižytuvas @@ -191,7 +194,7 @@ GenericName[pt_BR]=Desenho de funções matemáticas GenericName[ru]=Программа построения графиков GenericName[sk]=Kreslenie matematických funkcií -GenericName[sl]=Risanje matematičnih funkcij +GenericName[sl]=Izrisovalnik matematičnih funkcij GenericName[sv]=Matematisk funktionsritare GenericName[ta]=கணக்கியல் இயக்க வரைவி GenericName[tr]=Matematiksel Fonksiyon Çizici diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmplot-4.7.4/kmplot/kmplot_part.desktop new/kmplot-4.8.0/kmplot/kmplot_part.desktop --- old/kmplot-4.7.4/kmplot/kmplot_part.desktop 2011-10-02 15:25:19.000000000 +0200 +++ new/kmplot-4.8.0/kmplot/kmplot_part.desktop 2012-01-10 15:15:14.000000000 +0100 @@ -32,9 +32,10 @@ Name[hr]=KmPlotPart Name[hu]=KmPlotPart Name[is]=KmPlotPart -Name[it]=KmPlotPart +Name[it]=Component KmPlot Name[ja]=KmPlot コンポーネント Name[ka]=KmPlotPart +Name[kk]=KmPlotPart Name[km]=KmPlotPart Name[ko]=KmPlotPart Name[lt]=KmPlotPart diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmplot-4.7.4/kmplot/parser.cpp new/kmplot-4.8.0/kmplot/parser.cpp --- old/kmplot-4.7.4/kmplot/parser.cpp 2011-10-02 15:25:19.000000000 +0200 +++ new/kmplot-4.8.0/kmplot/parser.cpp 2011-10-20 22:54:06.000000000 +0200 @@ -66,14 +66,6 @@ {"arccosh", "arcosh", acosh}, // Area-cosinus hyperbolicus = inverse of cosh {"arctanh", "artanh", atanh}, // Area-tangens hyperbolicus = inverse of tanh - // Trigometric functions - {"sin", QString(), lsin}, // Sinus - {"cos", QString(), lcos}, // Cosinus - {"tan", QString(), ltan}, // Tangens - {"arcsin", QString(), larcsin}, // Arcus sinus = inverse of sin - {"arccos", QString(), larccos}, // Arcus cosinus = inverse of cos - {"arctan", QString(), larctan}, // Arcus tangens = inverse of tan - // Reciprocal-hyperbolic {"cosech", QString(), cosech}, // Co-Secans hyperbolicus {"sech", QString(), sech}, // Secans hyperbolicus @@ -90,6 +82,14 @@ {"arcsec", "arsec", larcsec}, // Arcus secans = inverse of sec {"arccot", "arcot", larccot}, // Arcus co-tangens = inverse of cotan + // Trigometric functions + {"sin", QString(), lsin}, // Sinus + {"cos", QString(), lcos}, // Cosinus + {"tan", QString(), ltan}, // Tangens + {"arcsin", QString(), larcsin}, // Arcus sinus = inverse of sin + {"arccos", QString(), larccos}, // Arcus cosinus = inverse of cos + {"arctan", QString(), larctan}, // Arcus tangens = inverse of tan + // Other {"sqrt", QString(), sqrt}, // Square root {"sqr", QString(), sqr}, // Square @@ -185,7 +185,6 @@ for ( int func = 0; func < VectorCount; ++func ) names << vectorFunctions[func].name; - names.sort(); return names; } @@ -1308,7 +1307,7 @@ return asin(1/x) / Parser::radiansPerAngleUnit(); } double larccot(double x) { - return atan(1/x) / Parser::radiansPerAngleUnit(); + return (M_PI/2 - atan(x)) / Parser::radiansPerAngleUnit(); } double sech(double x) { return (1 / cosh(x)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmplot-4.7.4/kmplot/settingspagegeneral.ui new/kmplot-4.8.0/kmplot/settingspagegeneral.ui --- old/kmplot-4.7.4/kmplot/settingspagegeneral.ui 2011-10-02 15:25:19.000000000 +0200 +++ new/kmplot-4.8.0/kmplot/settingspagegeneral.ui 2011-07-27 20:40:47.000000000 +0200 @@ -76,7 +76,7 @@ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> <property name="buddy"> - <cstring>kcfg_zoomStep</cstring> + <cstring>kcfg_zoomInStep</cstring> </property> </widget> </item> @@ -89,7 +89,7 @@ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> </property> <property name="buddy"> - <cstring>kcfg_zoomStep</cstring> + <cstring>kcfg_zoomOutStep</cstring> </property> </widget> </item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmplot-4.7.4/kmplot/view.cpp new/kmplot-4.8.0/kmplot/view.cpp --- old/kmplot-4.7.4/kmplot/view.cpp 2011-10-02 15:25:19.000000000 +0200 +++ new/kmplot-4.8.0/kmplot/view.cpp 2011-07-27 20:40:47.000000000 +0200 @@ -755,52 +755,9 @@ void View::drawLabels( QPainter *painter ) { - // Determine which letters to use for the axes - QString xLabel; - QString yLabel; - bool xLabelsIdentical = true; - bool yLabelsIdentical = true; + const QString xLabel = Settings::labelHorizontalAxis(); + const QString yLabel = Settings::labelVerticalAxis(); - foreach ( Function * function, XParser::self()->m_ufkt ) - { - QString x, y; - - switch ( function->type() ) - { - case Function::Cartesian: - case Function::Differential: - x = function->eq[0]->variables().isEmpty() ? QString() : function->eq[0]->variables()[0]; - y = function->eq[0]->name(); - break; - - case Function::Implicit: - x = function->eq[0]->variables().isEmpty() ? QString() : function->eq[0]->variables()[0]; - y = (function->eq[0]->variables().size()<2) ? QString() : function->eq[0]->variables()[1]; - break; - - case Function::Parametric: - case Function::Polar: - continue; - } - - if ( xLabel.isEmpty() ) - xLabel = x; - else if ( xLabel != x ) - xLabelsIdentical = false; - - if ( yLabel.isEmpty() ) - yLabel = y; - else if ( yLabel != y ) - yLabelsIdentical = false; - } - -// if ( !xLabelsIdentical || xLabel.isEmpty() ) - xLabel = Settings::labelHorizontalAxis(); -// if ( !yLabelsIdentical || yLabel.isEmpty() ) - yLabel = Settings::labelVerticalAxis(); - - - QColor axesColor = Settings::axesColor(); int const dx=10; int const dy=15; QFont const font = Settings::axesFont(); @@ -4188,8 +4145,6 @@ Function * it = m_currentPlot.function(); - QPoint mousePos = mapFromGlobal( QCursor::pos() ); - return ( underMouse() && (!it || crosshairPositionValid( it )) ); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org