Merge branch 'master' of bitbucket.org:cppit/juci

juci/CMakeLists.txt

@@ -4,7 +4,6 @@ set(module juci_to_python_api)
 
 project (${project_name})
 
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 INCLUDE(FindPkgConfig)
@@ -61,9 +60,6 @@ else()
   message(FATAL_ERROR "The gtkmm libraries are required. Quitting.")
 endif()
 
-
-
-
 # name of the executable on Windows will be example.exe
 add_executable(${project_name}
   #list of every needed file to create the executable
@@ -74,14 +70,13 @@ add_executable(${project_name}
   source
   window
   api
+
   #there is no need for extentions
   )
 
-
 add_library(${module} SHARED
- 
+  api
-  api.h
+  api_ext
-  api_ext.cc
   )
 # dependencies
 

juci/api.cc

@@ -0,0 +1,47 @@
+#include "api.h"
+namespace juci_api{
+
+  void cpp::ReplaceWord(const std::string word) {
+    //TODO implement api::ReplaceWord / change string to iter?
+    //some_namespace::controller::replaceWord(word_*);
+    std::cout << "unimplemented function: 'api::ReplaceWord()' called"
+	      << std::endl;
+
+    std::cout << "The string: "  << g_test_string  << std::endl;
+  }
+
+  void cpp::ReplaceLine(const std::string line) {
+    //TODO implement api::ReplaceLine / change string to iter?
+    //some_namespace::controller::replaceLine(line_);
+    std::cout << "unimplemented function: 'api::ReplaceLine()' called"
+	      << std::endl;
+  }    
+ 
+  //helpers
+  boost::python::api::object py::openPythonScript(const std::string path,
+						  boost::python::api::object python_name_space) {
+    std::string temp = g_project_root + path + ".py";
+    boost::python::str the_path(temp);
+    return boost::python::exec_file(the_path, python_name_space);//, python_name_space);
+  }
+
+   void py::LoadPlugin(const std::string& plugin_name) {
+    try{
+      /* initialize python interpreter */
+      Py_Initialize();
+      boost::python::api::object main_module = boost::python::import("__main__");
+      boost::python::api::object main_namespace = main_module.attr("__dict__");
+    
+      /* runs script from python */
+      //boost::python::object ignored1 = setPythonVar("word", word, main_namespace);
+      boost::python::api::object ignored2 = openPythonScript(plugin_name, main_namespace);   
+      /* extracts desired values */   
+      //boost::python::object pySnippet =  boost::python::eval("getSnippet()", main_namespace);
+      //word = boost::python::extract<std::string>(pySnippet);
+      /* add snippet to textView */
+      //TODO add snippet
+    }catch(boost::python::error_already_set const&) {
+      PyErr_Print();
+    }
+  }
+}

juci/api.h

@@ -1,77 +1,47 @@
+#ifndef JUCI_API_H_
+#define JUCI_API_H_
+
 #include <boost/python.hpp>
 #include <Python.h>
 #include <string>
-//
+
 //    Plugin API
 //
-namespace juci_api{
+const std::string g_project_root("/home/forgie/bachelor/app/juci/");
+static std::string g_test_string("test");
+namespace juci_api {
   //
   //   calls from python to C++
   //
-  namespace cpp{
+  namespace cpp {
+
     
-    //
     //    Replaceword:
     //        replaces a word in the editor with a string
-    //
+    
-    void ReplaceWord(const std::string word_){
+    void ReplaceWord(const std::string word_);
-      //TODO implement api::ReplaceWord / change string to iter?
-      //some_namespace::controller::replaceWord(word_*);
-      std::cout << "unimplemented function: 'api::ReplaceWord()' called"
-		<< std::endl;
-    }
         
     //
     //    ReplaceLine:
     //        Replaces a line in the editor with a string
     //
-    void ReplaceLine(const std::string line_){
+    void ReplaceLine(const std::string line_);
-      //TODO implement api::ReplaceLine / change string to iter?
-      //some_namespace::controller::replaceLine(line_);
-      std::cout << "unimplemented function: 'api::ReplaceLine()' called"
-		<< std::endl;
-    }    
     
   }//namespace cpp
 
   //
   //   calls from C++ to Python
   //
-  namespace py{
+  namespace py {
-    const std::string g_project_root("~/bachelor/app/juci/");
+    
+
     //helpers
     boost::python::api::object openPythonScript(const std::string path,
-						boost::python::api::object python_name_space) {
+						boost::python::api::object python_name_space);
-      std::string temp = g_project_root + path + ".py";
-      boost::python::str the_path(temp);
-      return boost::python::exec_file(the_path, python_name_space);//, python_name_space);
-    }
     
     //void snippet(std::string& word);
 
-    void plugin(const std::string& plugin_name){
+    void LoadPlugin(const std::string& plugin_name);
-      try{
-	/* initialize python interpreter */
-	Py_Initialize();
-	boost::python::api::object main_module = boost::python::import("__main__");
-	boost::python::api::object main_namespace = main_module.attr("__dict__");
-    
-	/* runs script from python */
-	//boost::python::object ignored1 = setPythonVar("word", word, main_namespace);
-	boost::python::api::object ignored2 = openPythonScript(plugin_name, main_namespace);   
-	/* extracts desired values */   
-	//boost::python::object pySnippet =  boost::python::eval("getSnippet()", main_namespace);
-	//word = boost::python::extract<std::string>(pySnippet);
-	/* add snippet to textView */
-	//TODO add snippet
-      }catch(boost::python::error_already_set const&){
-	PyErr_Print();
-      }
-    }
-    
   }// py   
-  
 }//juci_api
-
+#endif // JUCI_API_H
-
-   

juci/api_ext.cc

@@ -1,6 +1,5 @@
 #include "api.h"
-
+BOOST_PYTHON_MODULE(juci_to_python_api) {
-BOOST_PYTHON_MODULE(jucy_to_python_api) {
       using namespace boost::python;
       // text editing
       def("replaceLine", &juci_api::cpp::ReplaceLine);

juci/menu.cc

@@ -192,8 +192,14 @@ void Menu::Controller::OnFileNewHeaderFile() {
 
 void Menu::Controller::OnPluginAddSnippet() {
   std::cout << "Add snipper" << std::endl; //TODO(Forgi add you snippet magic code)
+  juci_api::py::LoadPlugin("snippet");
 }
 
+
+// void Menu::Controller::LoadPlugin() {
+//  juci_api::py::LoadPlugin("plugin_name");
+// }
+
 void Menu::Controller::OnFileOpenFile() {
   std::cout << "Open file clicked" << std::endl;
   //TODO(Oyvang) Legg til funksjon

juci/menu.h

@@ -4,6 +4,8 @@
 #include <iostream>
 #include "gtkmm.h"
 #include "keybindings.h"
+#include "api.h"
+
 
 namespace Menu {
     class Model {