'=?utf-8?q?=5Bkartesio=5D_/=3A_Allowed_understanding_of_scientifi?='

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkartesio=5D_/=3A_Allowed_understanding_of_scientifi?=
From:       Luca Tringali <tringalinvent () libero ! it>
Date:       2011-05-31 21:15:49
Message-ID: 20110531211549.9C6F1A60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 75772ac9fc604b3bcbe846b6a416eb39e2bd518a by Luca Tringali.
Committed on 31/05/2011 at 23:13.
Pushed by lucatringali into branch 'master'.

Allowed understanding of scientific notation by the plot routine, and icons \
integrated

M  +11   -1    CMakeLists.txt     
A  +7    -0    icons/CMakeLists.txt     
A  +-    --    icons/hi128-app-kartesio.png     
A  +-    --    icons/hi16-app-kartesio.png     
A  +-    --    icons/hi256-app-kartesio.png     
A  +-    --    icons/hi32-app-kartesio.png     
A  +-    --    icons/hi64-app-kartesio.png     
D  +-    --    icons/kartesio-128x128.png     
D  +-    --    icons/kartesio-16x16.png     
D  +-    --    icons/kartesio-256x256.png     
D  +-    --    icons/kartesio-32x32.png     
D  +-    --    icons/kartesio-64x64.png     
M  +2    -2    src/CMakeLists.txt     
M  +14   -1    src/calculations.cpp     
M  +2    -0    src/mainwindow.cpp     
M  +1    -1    src/mainwindow.h     

http://commits.kde.org/kartesio/75772ac9fc604b3bcbe846b6a416eb39e2bd518a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58bc076..817092a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,17 @@ find_package( Qt4 REQUIRED )
 add_definitions(${KDE4_DEFINITIONS} ${QT_DEFINITIONS})
 include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}  \
${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )  
+include(KDE4Defaults)
 INCLUDE( ${QT_USE_FILE} )
 
+# detect oxygen icon dir at configure time based on KDEDIRS - there may be different \
package installation locations +execute_process(COMMAND \
"${KDE4_KDECONFIG_EXECUTABLE}" --path icon OUTPUT_VARIABLE _dir ERROR_QUIET \
OUTPUT_STRIP_TRAILING_WHITESPACE) +file(TO_CMAKE_PATH "${_dir}" __dir)
+find_path(KDE4_ICON_DIR oxygen PATHS
+    ${__dir}
+)
+message(STATUS "using oxygen application icons from ${KDE4_ICON_DIR}")
+
+
 add_subdirectory(src)
-#add_subdirectory(icons)
\ No newline at end of file
+add_subdirectory(icons)
\ No newline at end of file
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
new file mode 100644
index 0000000..4d09e7c
--- /dev/null
+++ b/icons/CMakeLists.txt
@@ -0,0 +1,7 @@
+kde4_install_icons(${ICON_INSTALL_DIR})
+
+#install(FILES hi16-app-kartesio.png DESTINATION  \
${PREFIX}/share/icons/hicolor/16/apps/kartesio.png) +#install(FILES \
hi32-app-kartesio.png DESTINATION  \
${PREFIX}/share/icons/hicolor/32/apps/kartesio.png) +#install(FILES \
hi64-app-kartesio.png DESTINATION  \
${PREFIX}/share/icons/hicolor/64/apps/kartesio.png) +#install(FILES \
hi128-app-kartesio.png DESTINATION  \
${PREFIX}/share/icons/hicolor/128/apps/kartesio.png) +#install(FILES \
hi256-app-kartesio.png DESTINATION  \
${PREFIX}/share/icons/hicolor/256/apps/kartesio.png) \ No newline at end of file
diff --git a/icons/hi128-app-kartesio.png b/icons/hi128-app-kartesio.png
new file mode 100644
index 0000000..beabf95
Binary files /dev/null and b/icons/hi128-app-kartesio.png differ
diff --git a/icons/hi16-app-kartesio.png b/icons/hi16-app-kartesio.png
new file mode 100644
index 0000000..d9fcdc0
Binary files /dev/null and b/icons/hi16-app-kartesio.png differ
diff --git a/icons/hi256-app-kartesio.png b/icons/hi256-app-kartesio.png
new file mode 100644
index 0000000..fcc11a5
Binary files /dev/null and b/icons/hi256-app-kartesio.png differ
diff --git a/icons/hi32-app-kartesio.png b/icons/hi32-app-kartesio.png
new file mode 100644
index 0000000..1921fd7
Binary files /dev/null and b/icons/hi32-app-kartesio.png differ
diff --git a/icons/hi64-app-kartesio.png b/icons/hi64-app-kartesio.png
new file mode 100644
index 0000000..cc06fa4
Binary files /dev/null and b/icons/hi64-app-kartesio.png differ
diff --git a/icons/kartesio-128x128.png b/icons/kartesio-128x128.png
deleted file mode 100644
index beabf95..0000000
Binary files a/icons/kartesio-128x128.png and /dev/null differ
diff --git a/icons/kartesio-16x16.png b/icons/kartesio-16x16.png
deleted file mode 100644
index d9fcdc0..0000000
Binary files a/icons/kartesio-16x16.png and /dev/null differ
diff --git a/icons/kartesio-256x256.png b/icons/kartesio-256x256.png
deleted file mode 100644
index fcc11a5..0000000
Binary files a/icons/kartesio-256x256.png and /dev/null differ
diff --git a/icons/kartesio-32x32.png b/icons/kartesio-32x32.png
deleted file mode 100644
index 1921fd7..0000000
Binary files a/icons/kartesio-32x32.png and /dev/null differ
diff --git a/icons/kartesio-64x64.png b/icons/kartesio-64x64.png
deleted file mode 100644
index cc06fa4..0000000
Binary files a/icons/kartesio-64x64.png and /dev/null differ
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f94ef86..ccbb1f6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,8 +8,8 @@ set(kartesio_SRCS
 SET(kartesio_MOC_HDRS mainwindow.h)
 kde4_add_ui_files(kartesio_SRCS mainwindow.ui )
 
-QT4_WRAP_CPP ( kartesio_MOC_SRCS ${kartesio_MOC_HDRS} )
 QT4_AUTOMOC ( ${kartesio_SRCS} ${kartesio_MOC_SRCS} )
+QT4_WRAP_CPP ( kartesio_MOC_SRCS ${kartesio_MOC_HDRS} )
 
 
 SET(kartesio_EXECUTABLE
@@ -18,7 +18,7 @@ SET(kartesio_EXECUTABLE
                 ${kartesio_UI_HDRS}
 )
 
-kde4_add_app_icon(kartesio_SRCS "../icons/*.png")
+kde4_add_app_icon(kartesio_SRCS \
"${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-kartesio.png")  \
kde4_add_executable(kartesio ${kartesio_EXECUTABLE})  
 target_link_libraries(kartesio ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARIES} kdeeduui)
diff --git a/src/calculations.cpp b/src/calculations.cpp
index d632062..c564046 100644
--- a/src/calculations.cpp
+++ b/src/calculations.cpp
@@ -191,6 +191,11 @@ QString Calculations::solvex(char *yvalue, QString dnum) {
     //yvalue contains the equation of Y-axis variable
     //Remember that the function to elevate to power is Math.pow(b,e)
     //dnum is the value of x
+    //the E must be changed to *10^: for example, the function
+    //y=4.6374269005847954E-8*(x^3)+-1.8212280701754386E-5*(x^2)+0.002477485380117*x+0
 +    //should be
+    //y=4.6374269005847954*10^-8*(x^3)+-1.8212280701754386*10^-5*(x^2)+0.002477485380117*x+0
 +    
     QString mreport;
     QString tempy;
     QString tempyold;
@@ -226,7 +231,15 @@ QString Calculations::solvex(char *yvalue, QString dnum) {
         if (tempyn=="random") tempy = "Math.random";
         if (tempyn=="round") tempy = "Math.round";
         if (tempyn=="sqrt") tempy = "Math.sqrt";
-
+	//if (tempyn=="E") tempy = "*10^";
+	if (tempyn=="E") {
+	  tempy = "*Math.pow(10,";
+	  do{
+	    i++;
+	    tempy = tempy + yvalue[i];
+	  }while ((QString(yvalue[i+1])!=QString("*")));//until i+1=="*"
+	  tempy = tempy + ")";
+	}
         //the simbol ^ should be replaced by Math.pow(base, exp)
         if (olda==1) {
             //we need to know when we get a simbol to know the power exponent is \
                ended
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5bbf53c..305df1f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -4,6 +4,7 @@ MainWindow::MainWindow(QWidget *parent)
         : KXmlGuiWindow(parent)
 {
 
+    setWindowIcon( KIcon( "kartesio" ) ); 
     KAction* clearAction = new KAction(this);
     clearAction->setText(i18n("&New"));
     clearAction->setIcon(KIcon("document-new"));
@@ -175,6 +176,7 @@ void MainWindow::plot(QTableWidget *table, QString function, bool \
                original, bool
             //in a future we can consider to change it supporting some backends, but \
it's really complex  QString myscript = mycalcs.solvex(tmreporto,istr); //myscript is \
the equation converted in QScript language and with the value of x axis (istr) \
instead of "x" variable  //QString myscript = replacevar(tmreporto,istr, "x"); \
//myscript is the equation converted in QScript language and with the value of x axis \
(istr) instead of "x" variable +	    //if (i==int(mycalcs.m_xmin)) \
QMessageBox::information(this, "string", mycalcs.solvex(tmreporto,istr));  \
QScriptValue three = myEngine.evaluate(myscript);  
             double tvalue = three.toNumber();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 4dc7e30..27a5e36 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,7 +1,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "ui_mainwindow.h"
+#include "src/ui_mainwindow.h"
 #include "calculations.h"
 
 using namespace std;


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic