-divide result dice by integer return double.

9 files changed, 15 insertions, 14 deletions

diff --git a/diceresult.cpp b/diceresult.cpp
index eb6b5d1..f111ad4 100644
--- a/diceresult.cpp
+++ b/diceresult.cpp
@@ -46,7 +46,7 @@ bool DiceResult::isScalar() const
     }
     return false;
 }
-qint64 DiceResult::getScalar()
+qreal DiceResult::getScalar()
 {
 
     if(m_diceValues.size()==1)
diff --git a/diceresult.h b/diceresult.h
index c36c712..9bd2cde 100644
--- a/diceresult.h
+++ b/diceresult.h
@@ -38,7 +38,7 @@ public:
     void setResultList(QList<Die*> list);
 
     bool isScalar() const;
-    virtual qint64 getScalar();
+    virtual qreal getScalar();
 private:
     QList<Die*> m_diceValues;
 };
diff --git a/main.cpp b/main.cpp
index b5c270b..46648a3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -35,7 +35,8 @@ int main(int argc, char *argv[])
 
     QStringList commands;
 
-    commands << "2*(4+4)"
+    commands<< "100D10/100"
+            << "2*(4+4)"
             << "1+(4*3)D10"
              << "2+4/4"
             << "2D10*2D20*8"
@@ -45,7 +46,7 @@ int main(int argc, char *argv[])
              << "3D100"
              << "4k3"
              << "10D10e[>=6]sc[>=6]"
-             << "100190D6666666s"
+             //<< "100190D6666666s"
              << "10D10e10s"
             << "10D10s"
              << "15D10e10c[8-10]"
diff --git a/node/dicerollernode.h b/node/dicerollernode.h
index e44f754..b08901e 100644
--- a/node/dicerollernode.h
+++ b/node/dicerollernode.h
@@ -14,7 +14,7 @@ public:
     virtual void run(ExecutionNode*);
     quint64 getFaces();
 
-virtual QString toString()const;
+     virtual QString toString()const;
      virtual qint64 getPriority() const;
 //private members
 private:
diff --git a/node/scalaroperatornode.cpp b/node/scalaroperatornode.cpp
index d08532c..97d17d9 100644
--- a/node/scalaroperatornode.cpp
+++ b/node/scalaroperatornode.cpp
@@ -91,9 +91,9 @@ qint64 ScalarOperatorNode::substract(qint64 a,qint64 b)
     return a-b;
 }
 
-qint64 ScalarOperatorNode::divide(qint64 a,qint64 b)
+qreal ScalarOperatorNode::divide(qint64 a,qint64 b)
 {
-    return a/b;
+    return (qreal)a/b;
 }
 
 qint64 ScalarOperatorNode::multiple(qint64 a,qint64 b)
diff --git a/node/scalaroperatornode.h b/node/scalaroperatornode.h
index 97e6e3d..2cd8405 100644
--- a/node/scalaroperatornode.h
+++ b/node/scalaroperatornode.h
@@ -23,7 +23,7 @@ public:
 private:
     qint64 add(qint64,qint64);
     qint64 substract(qint64,qint64);
-    qint64 divide(qint64,qint64);
+    qreal divide(qint64,qint64);
     qint64 multiple(qint64,qint64);
 
 private:
diff --git a/result.h b/result.h
index fe35ea1..3f2ab15 100644
--- a/result.h
+++ b/result.h
@@ -30,7 +30,7 @@ public:
     Result();
 
     virtual bool isScalar() const = 0;
-    virtual qint64 getScalar() = 0;
+    virtual qreal getScalar() = 0;
 
     virtual Result* getPrevious();
     virtual void setPrevious(Result*);
diff --git a/scalarresult.cpp b/scalarresult.cpp
index f8f7491..3500675 100644
--- a/scalarresult.cpp
+++ b/scalarresult.cpp
@@ -26,11 +26,11 @@ ScalarResult::ScalarResult()
 }
 
 
-void ScalarResult::setValue(qint64 i)
+void ScalarResult::setValue(qreal i)
 {
     m_value=i;
 }
-qint64 ScalarResult::getScalar()
+qreal ScalarResult::getScalar()
 {
     return m_value;
 }
diff --git a/scalarresult.h b/scalarresult.h
index 3ef4b61..cbcbf66 100644
--- a/scalarresult.h
+++ b/scalarresult.h
@@ -32,12 +32,12 @@ public:
     ScalarResult();
 
     virtual bool isScalar() const;
-    virtual qint64 getScalar();
+    virtual qreal getScalar();
 
-    void setValue(qint64 i);
+    void setValue(qreal i);
 
 private:
-    qint64 m_value;
+    qreal m_value;
 };
 
 #endif // SCALARRESULT_H