Updates for cbang changes

Author: jcoffland

README.md

@@ -56,12 +56,13 @@ by C!, can be installed with the following command line:
 
     sudo apt-get update
     sudo apt-get -y install scons build-essential libqt5websockets5-dev \
-      libqt5opengl5-dev libnode-dev libglu1-mesa-dev pkgconf git
+      libqt5opengl5-dev qttools5-dev-tools libnode-dev libglu1-mesa-dev \
+      pkgconf git
 
 ## Building C! (cbang)
 Clone the C! git repository, build the software using scons and set the
 environment variable CBANG_HOME so the CAMotics build system can find it
-later.  **You must install V8 or ChakraCore before this step.**
+later.  **You must install V8 before this step.**
 
     git clone https://github.com/CauldronDevelopmentLLC/cbang.git
     scons -C cbang

SConstruct

@@ -21,8 +21,7 @@ env.CBAddVariables(
     ('python_version', 'Set python version', '3'),
     BoolVariable('with_tpl', 'Enable TPL', True),
     BoolVariable('with_gui', 'Enable graphical user interface', True),
-    BoolVariable('wrap_glibc', 'Enable GlibC function wrapping',
-                 env['PLATFORM'] == 'posix'),
+    BoolVariable('wrap_glibc', 'Enable GlibC function wrapping', False)
     )
 conf = env.CBConfigure()
 
@@ -70,14 +69,12 @@ if not env.GetOption('clean'):
 
     conf.CBConfig('cbang')
     env.CBDefine('USING_CBANG') # Using CBANG macro namespace
-    for lib in 'mariadbclient snappy leveldb yaml re2 sqlite3'.split():
+    for lib in 'mariadbclient snappy leveldb yaml sqlite3'.split():
         if lib in env['LIBS']: env['LIBS'].remove(lib)
 
     # Include path
     env.AppendUnique(CPPPATH = ['#/src'])
 
-    if env['PLATFORM'] != 'win32': env.AppendUnique(CCFLAGS = ['-fPIC'])
-
     # Python
     have_python = conf.CBConfig('python', False)
 
@@ -176,8 +173,8 @@ if env['with_tpl']:
 
 # DXFlib
 if not have_dxflib:
-    libDXFlib = SConscript('src/dxflib/SConscript',
-                           variant_dir = 'build/dxflib')
+    libDXFlib = SConscript(
+        'src/dxflib/SConscript', variant_dir = 'build/dxflib')
     env.Append(LIBS = libDXFlib)
 
 

src/cairo/SConscript

@@ -1,21 +1,22 @@
 Import('*')
 env = env.Clone()
 
-if env['compiler_mode'] == 'gnu':
-  env.AppendUnique(CCFLAGS = ['-Wno-enum-conversion'])
+if not env.GetOption('clean'):
+  if env['compiler_mode'] == 'gnu':
+    env.AppendUnique(CCFLAGS = ['-Wno-enum-conversion'])
 
 
-# Ignore warnings
-import re
-flags = env.subst('${CCFLAGS}')
-flags = re.sub(r'-W((all)|(error))(=[^\s$]+)?(\s|$)', '', flags)
-env.Replace(CCFLAGS = flags)
+  # Ignore warnings
+  import re
+  flags = env.subst('${CCFLAGS}')
+  flags = re.sub(r'-W((all)|(error))(=[^\s$]+)?(\s|$)', '', flags)
+  env.Replace(CCFLAGS = flags)
 
 
-# Configure
-env.AppendUnique(CPPDEFINES = [
-        'CAIRO_NO_MUTEX', 'HAVE_INTTYPES_H', 'CAIRO_HAS_IMAGE_SURFACE'])
-env.Append(CPPPATH = ['#/src/cairo'])
+  # Configure
+  env.AppendUnique(CPPDEFINES = [
+          'CAIRO_NO_MUTEX', 'HAVE_INTTYPES_H', 'CAIRO_HAS_IMAGE_SURFACE'])
+  env.Append(CPPPATH = ['#/src/cairo'])
 
 
 # Bulid library

src/camotics/contour/TriangleSurface.cpp

@@ -188,10 +188,9 @@ void TriangleSurface::read(const JSON::Value &value) {
   if (value.hasList("vertices")) {
     vertices.clear();
     bounds = Rectangle3D();
-    auto &l = value.get("vertices");
 
-    for (unsigned i = 0; i < l->size(); i++) {
-      vertices.push_back(l->getNumber(i));
+    for (auto &vert: *value.get("vertices")) {
+      vertices.push_back(vert->getNumber());
 
       unsigned n = vertices.size();
       if (n % 3 == 0)

src/camotics/machine/MachineModel.cpp

@@ -40,8 +40,8 @@ void MachineModel::read(const JSON::Value &value) {
   workpiece.read(value.getList("workpiece"));
 
   auto &parts = value.getDict("parts");
-  for (unsigned i = 0; i < parts.size(); i++)
-    add(new MachinePart(parts.keyAt(i), parts.get(i)));
+  for (auto e: parts.entries())
+    add(new MachinePart(e.key(), e.value()));
 }
 
 

src/camotics/machine/MachinePart.cpp

@@ -30,17 +30,17 @@ MachinePart::MachinePart(const string &name, const JSON::ValuePtr &config) :
 
 
 void MachinePart::read(const JSON::Value &value) {
-  color.read(value.getList("color"));
-  init.read(value.getList("init"));
-  home.read(value.getList("home"));
-  min.read(value.getList("min"));
-  max.read(value.getList("max"));
+  color   .read(value.getList("color"));
+  init    .read(value.getList("init"));
+  home    .read(value.getList("home"));
+  min     .read(value.getList("min"));
+  max     .read(value.getList("max"));
   movement.read(value.getList("movement"));
 
   if (value.hasList("lines")) {
     auto &lines = value.getList("lines");
-    for (unsigned i = 0; i < lines.size(); i++)
-      this->lines.push_back(lines.getNumber(i));
+    for (auto &line: lines)
+      this->lines.push_back(line->getNumber());
   }
 
   auto &vertices = value.getList("mesh");

src/camotics/project/Files.cpp

@@ -43,8 +43,8 @@ string Files::getRelativePath(unsigned i) const {
 SmartPointer<File> Files::find(const string &_path) const {
   string path = SystemUtilities::absolute(directory, _path);
 
-  for (unsigned i = 0; i < size(); i++)
-    if (path == files[i]->getPath()) return files[i];
+  for (auto &file: files)
+    if (path == file->getPath()) return file;
 
   return 0;
 }
@@ -56,16 +56,16 @@ void Files::add(const string &path) {
 
 
 void Files::read(const JSON::Value &value) {
-  for (unsigned i = 0; i < value.size(); i++)
-    add(SystemUtilities::absolute(directory, value.getString(i)));
+  for (auto v: value)
+    add(SystemUtilities::absolute(directory, v->getString()));
 }
 
 
 void Files::write(JSON::Sink &sink) const {
   sink.beginList();
 
-  for (unsigned i = 0; i < files.size(); i++)
-    sink.append(get(i)->getRelativePath(directory));
+  for (auto &file: files)
+    sink.append(file->getRelativePath(directory));
 
   sink.endList();
 }

src/camotics/qt/BBCtrlAPI.cpp

@@ -165,9 +165,9 @@ void BBCtrlAPI::onTextMessageReceived(const QString &message) {
 
     bool updatePosition = false;
 
-    for (unsigned i = 0; i < json->size(); i++) {
-      string key = json->keyAt(i);
-      vars.insert(key, json->get(key));
+    for (auto e: json->entries()) {
+      auto &key = e.key();
+      vars.insert(key, e.value());
 
       if (key == "xp" || key == "yp" || key == "zp" ||
           key == "offset_x" || key == "offset_y" || key == "offset_z")

src/gcode/ToolPath.cpp

@@ -59,15 +59,15 @@ int ToolPath::find(double time) const {return find(time, 0, size());}
 void ToolPath::read(const JSON::Value &value) {
   GCode::Axes start;
   GCode::MoveType type = GCode::MoveType::MOVE_RAPID;
-  int line = 0;
   SmartPointer<string> filename;
-  int tool = 1;
-  double feed = 0;
+  int line     = 0;
+  int tool     = 1;
+  double feed  = 0;
   double speed = 0;
-  double time = 0;
+  double time  = 0;
 
-  for (unsigned i = 0; i < value.size(); i++) {
-    auto &dict = value.getDict(i);
+  for (auto v: value) {
+    auto &dict = v->getDict();
 
     GCode::Axes end;
     for (int j = 0; j < 9; j++)
@@ -82,9 +82,9 @@ void ToolPath::read(const JSON::Value &value) {
         filename = new string(_filename);
     }
 
-    line = dict.getNumber("line", line);
-    tool = dict.getNumber("tool", tool);
-    feed = dict.getNumber("feed", feed);
+    line  = dict.getNumber("line",  line);
+    tool  = dict.getNumber("tool",  tool);
+    feed  = dict.getNumber("feed",  feed);
     speed = dict.getNumber("speed", speed);
     double delta = dict.getNumber("time", 0);
 

src/gcode/ToolTable.cpp

@@ -78,12 +78,9 @@ void ToolTable::add(const Tool &tool) {
 void ToolTable::read(const JSON::Value &value) {
   clear();
 
-  for (unsigned i = 0; i < value.size(); i++) {
-    string key = value.keyAt(i);
-    unsigned number = String::parseU32(key);
-    Tool tool(number);
-
-    tool.read(value.getDict(i));
+  for (auto e: value.entries()) {
+    Tool tool(String::parseU32(e.key()));
+    tool.read(e.value()->getDict());
     set(tool);
   }
 }