command: added cli calculator by cal/calculate

LibreCAD · Nov 22, 2014 · e6d4f7b · e6d4f7b
1 parent 677a663
commit e6d4f7b
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 12 deletions.
diff --git a/librecad/src/cmd/rs_commands.cpp b/librecad/src/cmd/rs_commands.cpp
@@ -753,5 +753,29 @@ QString RS_Commands::msgAvailableCommands() {
     return tr("Available commands:");
 }
 
+/**
+ * @brief extractCliCal, filter cli calculator math expression
+ * @param cmd, cli string
+ * @return math expression for RS_Math:eval();
+ */
+QString RS_Commands::filterCliCal(const QString& cmd)
+{
+
+    QString str=cmd.trimmed();
+    const QRegExp calCmd(R"(^(cal|calculate))");
+    if(!(str.contains(calCmd)
+         || str.startsWith(tr("cal","command to trigger cli calculator"), Qt::CaseInsensitive)
+         || str.startsWith(tr("calculate","command to trigger cli calculator"), Qt::CaseInsensitive)
+                           )) {
+        return QString();
+    }
+    int index=str.indexOf(QRegExp(R"(\s)"));
+    bool spaceFound=(index>=0);
+    str=str.mid(index);
+    index=str.indexOf(QRegExp(R"(\S)"));
+    if(!(spaceFound && index>=0)) return QString();
+    str=str.mid(index);
+    return str;
+}
 
 // EOF
diff --git a/librecad/src/cmd/rs_commands.h b/librecad/src/cmd/rs_commands.h
@@ -70,10 +70,16 @@ class RS_Commands : public QObject {
     static QString msgAvailableCommands();
     void updateAlias();
 
-	 // Prefixes for function-, Meta- and Alt- keys.
-	 static const char *FnPrefix;
-	 static const char *AltPrefix;
-	 static const char *MetaPrefix;
+    // Prefixes for function-, Meta- and Alt- keys.
+    static const char *FnPrefix;
+    static const char *AltPrefix;
+    static const char *MetaPrefix;
+    /**
+      * @brief extractCliCal, filter cli calculator math expression
+      * @param cmd, cli string
+      * @return math expression for RS_Math:eval();
+      */
+    static QString filterCliCal(const QString& cmd);
 
 protected:
     static RS_Commands* uniqueInstance;

diff --git a/librecad/src/lib/debug/rs_debug.h b/librecad/src/lib/debug/rs_debug.h
@@ -33,6 +33,7 @@
 #endif
 
 #include <QString>
+#include <QDebug>
 
 /** print out a debug header*/
 #define DEBUG_HEADER()  std::cout<<__FILE__<<" : "<<__FUNCTION__<<" : line "<<__LINE__<<std::endl

diff --git a/librecad/src/lib/gui/rs_eventhandler.cpp b/librecad/src/lib/gui/rs_eventhandler.cpp
@@ -30,6 +30,7 @@
 #include "rs_actioninterface.h"
 #include "rs_dialogfactory.h"
 #include "rs_commandevent.h"
+#include "rs_commands.h"
 
 /**
  * Constructor.
@@ -233,15 +234,38 @@ void RS_EventHandler::keyReleaseEvent(QKeyEvent* e) {
 }
 
 
+bool RS_EventHandler::cliCalculator(const QString& cmd) const
+{
+    QString str=RS_Commands::filterCliCal(cmd);
+
+    if(str.isEmpty()){
+//        RS_DIALOGFACTORY->commandMessage("No math expression");
+        return false;
+    }
+    bool ok=true;
+    double result=RS_Math::eval(str,&ok);
+    if(ok)
+        RS_DIALOGFACTORY->commandMessage(str + " = "+QString::number(result));
+    else
+        RS_DIALOGFACTORY->commandMessage("Calculator error for input: "+ str);
+    return true;
+}
 
 /**
  * Handles command line events.
  */
 void RS_EventHandler::commandEvent(RS_CommandEvent* e) {
     RS_DEBUG->print("RS_EventHandler::commandEvent");
-
     QString cmd = e->getCommand();
 
+    // allow using command line as a calculator
+    if (!e->isAccepted())  {
+        if(cliCalculator(cmd)) {
+            e->accept();
+            return;
+        }
+    }
+
     if (coordinateInputEnabled) {
         if (!e->isAccepted()) {
 

diff --git a/librecad/src/lib/gui/rs_eventhandler.h b/librecad/src/lib/gui/rs_eventhandler.h
@@ -54,9 +54,9 @@ class RS_EventHandler {
     void keyPressEvent(QKeyEvent* e);
     void keyReleaseEvent(QKeyEvent* e);
 
-        void commandEvent(RS_CommandEvent* e);
-        void enableCoordinateInput();
-        void disableCoordinateInput();
+    void commandEvent(RS_CommandEvent* e);
+    void enableCoordinateInput();
+    void disableCoordinateInput();
 
     void setDefaultAction(RS_ActionInterface* action);
     RS_ActionInterface* getDefaultAction();
@@ -75,12 +75,19 @@ class RS_EventHandler {
     void setSnapRestriction(RS2::SnapRestriction sr);
 
 protected:
-        RS_GraphicView* graphicView;
-        RS_ActionInterface* defaultAction;
-//    RS_ActionInterface* currentActions[RS_MAXACTIONS];
+    RS_GraphicView* graphicView;
+    RS_ActionInterface* defaultAction;
+    //    RS_ActionInterface* currentActions[RS_MAXACTIONS];
     QList<RS_ActionInterface*> currentActions;
     int actionIndex;
-        bool coordinateInputEnabled;
+    bool coordinateInputEnabled;
+private:
+    /**
+         * @brief cliCalEvent, process cli "cal" calculator command
+         * @param cmd, cli line to check for "cal" command
+         * @return true, if cli starts with "cal"
+         */
+    bool cliCalculator(const QString& cmd) const;
 };
 
 #endif