Cairo shim refactor

.gitmodules

@@ -11,3 +11,6 @@
 [submodule "libclipboard"]
 	path = libclipboard
 	url = https://github.com/OfficialKris/libclipboard.git
+[submodule "mansoura"]
+	path = mansoura
+	url = https://github.com/highperformancecoder/mansoura.git

Makefile

@@ -61,6 +61,8 @@ ifneq ($(build_ecolab),ecolab built)
 $(warning $(shell cat ecolab/build.log))
 $(error Making ecolab failed: check ecolab/build.log)
 endif
+# mansoura/src needs to be before EcoLab's include directory, as it overrides them
+FLAGS+=-Imansoura/src
 include $(ECOLAB_HOME)/include/Makefile
 
 ifndef MXE
@@ -99,6 +101,14 @@ ifneq ($(strip $(build_ravelcapi)),ravelcapi built)
 $(error Making RavelCAPI failed: check RavelCAPI/build.log)
 endif
 
+# Mansoura
+build_mansoura:=$(shell cd mansoura; if  $(MAKE) $(JOBS) $(MAKEOVERRIDES) libmansoura.a >build.log 2>&1; then echo "mansoura built"; fi) 
+$(warning $(build_mansoura))
+ifneq ($(strip $(build_mansoura)),mansoura built)
+$(error Making Mansoura failed: check mansoura/build.log)
+endif
+
+
 ifndef MXE
 # libclipboard
 build_libclipboard:=$(shell cd libclipboard; if cmake -DBUILD_SHARED_LIBS=0 -DCMAKE_C_FLAGS=-fPIC . &>build.log && $(MAKE) $(JOBS) >>build.log 2>&1; then echo "libclipboard built"; fi) 
@@ -182,8 +192,8 @@ PREFIX=/usr/local
 # custom one that picks up its scripts from a relative library
 # directory
 MODLINK=$(LIBMODS:%=$(ECOLAB_HOME)/lib/%)
-MODEL_OBJS=autoLayout.o cairoItems.o canvas.o CSVDialog.o dataOp.o equationDisplay.o godleyIcon.o godleyTable.o godleyTableWindow.o group.o item.o intOp.o lasso.o lock.o minsky.o operation.o operationRS.o operationRS1.o  operationRS2.o phillipsDiagram.o plotWidget.o port.o pubTab.o ravelWrap.o renderNativeWindow.o selection.o sheet.o SVGItem.o switchIcon.o userFunction.o userFunction_units.o variableInstanceList.o variable.o windowInformation.o wire.o 
-ENGINE_OBJS=clipboard.o cairoShimCairo.o databaseIngestor.o derivative.o equationDisplayRender.o equations.o evalGodley.o evalOp.o flowCoef.o \
+MODEL_OBJS=autoLayout.o cairoItems.o canvas.o CSVDialog.o dataOp.o equationDisplay.o godleyIcon.o godleyTable.o godleyTableEditor.o group.o item.o intOp.o lasso.o lock.o minsky.o operation.o operationRS.o operationRS1.o  operationRS2.o phillipsDiagram.o plotWidget.o port.o pubTab.o ravelWrap.o renderNativeWindow.o selection.o sheet.o switchIcon.o userFunction.o userFunction_units.o variableInstanceList.o variable.o windowInformation.o wire.o 
+ENGINE_OBJS=clipboard.o databaseIngestor.o derivative.o equationDisplayRender.o equations.o evalGodley.o evalOp.o flowCoef.o \
 	godleyExport.o latexMarkup.o valueId.o variableValue.o node_latex.o node_matlab.o CSVParser.o \
 	minskyTensorOps.o mdlReader.o saver.o rungeKutta.o
 SCHEMA_OBJS=schema3.o schema2.o schema1.o schema0.o schemaHelper.o variableType.o \
@@ -201,7 +211,7 @@ LIBS+=-Wl,-framework -Wl,Security -Wl,-headerpad_max_install_names
 MODEL_OBJS+=getContext.o
 endif
 
-ALL_OBJS=$(MODEL_OBJS) $(ENGINE_OBJS) $(SCHEMA_OBJS) $(RESTSERVICE_OBJS) RESTService.o addon.o typescriptAPI.o pyminsky.o createLinkGroupIcons.o
+ALL_OBJS=$(MODEL_OBJS) $(ENGINE_OBJS) $(SCHEMA_OBJS) $(RESTSERVICE_OBJS) RESTService.o addon.o typescriptAPI.o pyminsky.o createLinkGroupIcons.o 
 
 
 EXES=RESTService/minsky-RESTService$(EXE)
@@ -229,7 +239,7 @@ ifdef CLASSDESC_ARITIES
 FLAGS+=-DUSE_UNROLLED -DCLASSDESC_ARITIES=$(CLASSDESC_ARITIES)
 endif
 
-FLAGS+=-UTR1 -Ischema -Iengine -Imodel -Icertify/include -IRESTService -IRavelCAPI/civita -IRavelCAPI -Ilibclipboard/include -DCLASSDESC $(OPT) -UECOLAB_LIB -DECOLAB_LIB=\"library\" -DJSON_PACK_NO_FALL_THROUGH_TO_STREAMING -Wno-unused-local-typedefs -Wno-pragmas -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-attributes -DCIVITA_ALLOCATOR=civita::LibCAllocator
+FLAGS+=-UTR1 -Ischema -Iengine -Imodel -Icertify/include -Imansoura/src -IRESTService -IRavelCAPI/civita -IRavelCAPI -Ilibclipboard/include -DCLASSDESC $(OPT) -UECOLAB_LIB -DECOLAB_LIB=\"library\" -DJSON_PACK_NO_FALL_THROUGH_TO_STREAMING -Wno-unused-local-typedefs -Wno-pragmas -Wno-unused-command-line-argument -Wno-unknown-warning-option -Wno-attributes -DCIVITA_ALLOCATOR=civita::LibCAllocator
 
 ifdef OBS
 # Fedora environments make duplicated macros a fatal error, and then
@@ -260,7 +270,7 @@ ifeq ($(DEBUG), 1)
 FLAGS+=-Wp,-D_GLIBCXX_ASSERTIONS
 endif
 
-VPATH= schema model engine RESTService RavelCAPI/civita RavelCAPI $(ECOLAB_HOME)/include $(ECOLAB_HOME)/graphcode $(ECOLAB_HOME)/classdesc
+VPATH= schema model engine RESTService RavelCAPI/civita RavelCAPI mansoura/src $(ECOLAB_HOME)/include $(ECOLAB_HOME)/graphcode $(ECOLAB_HOME)/classdesc
 
 # Classdesc rules
 CDINC=-I $(CDINCLUDE) -I $(ECOLAB_HOME)/include -I RESTService
@@ -345,7 +355,7 @@ ifeq ($(OS),CYGWIN)
 FLAGS+=-Wa,-mbig-obj -Wl,-x -Wl,--oformat,pe-bigobj-x86-64
 endif
 
-LIBS:=-LRavelCAPI -lravelCAPI -LRavelCAPI/civita -lcivita  -lboost_date_time$(BOOST_EXT) -lgsl -lgslcblas -lssl -lcrypto $(LIBS)
+LIBS:=-Lmansoura -lmansoura -LRavelCAPI -lravelCAPI -LRavelCAPI/civita -lcivita  -lboost_date_time$(BOOST_EXT) -lgsl -lgslcblas -lssl -lcrypto $(LIBS)
 
 ifdef MXE
 LIBS+=-lgdi32 -lcrypt32 -lbcrypt -lshcore
@@ -465,7 +475,7 @@ gui-js/build/minskyRESTService.node:| $(DLLS:%=$(DYNAMIC_LIB_DIR)/%)
 endif
 
 # N-API node embedded RESTService
-gui-js/build/minskyRESTService.node: addon.o  $(NODE_API) $(RESTSERVICE_OBJS) $(MODEL_OBJS) $(SCHEMA_OBJS) $(ENGINE_OBJS) RavelCAPI/libravelCAPI.a RavelCAPI/civita/libcivita.a 
+gui-js/build/minskyRESTService.node: addon.o  $(NODE_API) $(RESTSERVICE_OBJS) $(MODEL_OBJS) $(SCHEMA_OBJS) $(ENGINE_OBJS) mansoura/libmansoura.a RavelCAPI/libravelCAPI.a RavelCAPI/civita/libcivita.a 
 	mkdir -p gui-js/build
 ifdef MXE
 	$(LINK) -shared -o $@ $^ $(LIBS)
@@ -515,7 +525,7 @@ $(EXES):
 tests: $(EXES)
 	cd test; $(MAKE) $(MAKEOVERRIDES) CPLUSPLUS="$(CPLUSPLUS)"
 
-BASIC_CLEAN=rm -rf *.o *~ "\#*\#" core *.d *.cd *.rcd *.tcd *.xcd *.gcda *.gcno *.so *.dll *.dylib
+BASIC_CLEAN=rm -rf *.o *~ "\#*\#" core *.d *.cd *.rcd *.tcd *.xcd *.gcda *.gcno *.so *.dll *.dylib *.a
 
 clean:
 	-$(BASIC_CLEAN) minsky.xsd
@@ -525,8 +535,9 @@ clean:
 	-cd engine && $(BASIC_CLEAN)
 	-cd schema && $(BASIC_CLEAN)
 	-cd ecolab && $(MAKE) clean
+	-cd mansoura && $(MAKE) clean
 	-cd RavelCAPI && $(MAKE) clean
-	-cd libclipboard && $(MAKE) clean && rm -f CMakeCache.txt
+	-cd libclipboard && $(MAKE) clean ; rm -f CMakeCache.txt
 
 mac-dist:
 # force rebuild of the node file to force rewriting of dependent dylibs

RESTService/pyminsky.cc

@@ -21,6 +21,10 @@
 //#define REST_PROCESS_BUFFER classdesc::PythonBuffer
 #include "minsky.h"
 #include "CSVTools.xcd"
+#include "plot.xcd"
+#include "plot.rcd"
+#include "SVGItem.xcd"
+#include "SVGItem.rcd"
 #include "minsky_epilogue.h"
 #include "pythonBuffer.h"
 

RESTService/typescriptAPI.cc

@@ -6,8 +6,6 @@
 #include "assetClass.tcd"
 #include "bookmark.h"
 #include "bookmark.tcd"
-#include "cairoSurfaceImage.tcd"
-#include "cairoRenderer.tcd"
 #include "callableFunction.tcd"
 #include "canvas.tcd"
 #define CLASSDESC_typescriptAPI___CAPIRenderer
@@ -29,7 +27,7 @@
 #include "fontDisplay.tcd"
 #include "godleyIcon.tcd"
 #include "godleyTable.tcd"
-#include "godleyTableWindow.tcd"
+#include "godleyTableEditor.tcd"
 #include "group.tcd"
 #include "handleLockInfo.tcd"
 #include "hypercube.tcd"
@@ -39,14 +37,13 @@
 #include "itemT.tcd"
 #include "lasso.tcd"
 #include "lock.tcd"
+#include "mansouraPlot.tcd"
 #include "noteBase.tcd"
 #include "operation.tcd"
 #include "operationBase.tcd"
 #include "operationType.tcd"
-#include "pango.tcd"
 #include "pannableTab.tcd"
 #include "phillipsDiagram.tcd"
-#include "plot.tcd"
 #include "plotOptions.tcd"
 #include "plotWidget.tcd"
 #include "polyRESTProcessBase.tcd"
@@ -63,6 +60,7 @@
 #include "simulation.tcd"
 #include "slider.tcd"
 #include "SVGItem.tcd"
+#include "SVGItem.xcd"
 #include "switchIcon.tcd"
 #include "tensorInterface.tcd"
 #include "tensorVal.tcd"
@@ -253,11 +251,11 @@ int main()
   api.addClass<civita::XVector>();
   api.addClass<CSVDialog>();
   api.addClass<DataSpecSchema>();
-  api.addClass<ecolab::Plot::LineStyle>();
   api.addClass<EngNotation>();
   api.addClass<EventInterface>();
   api.addClass<GroupItems>();
   api.addClass<HandleLockInfo>();
+  api.addClass<mansoura::Plot::LineStyle>();
   api.addClass<Port>();
   api.addClass<PubItem>();
   api.addClass<ravel::DataSpec>();
@@ -313,7 +311,7 @@ int main()
   cout << "class classdesc__pack_t {}\n";
   cout << "class classdesc__RESTProcess_t {}\n";
   cout << "class ecolab__cairo__Surface {}\n";
-  cout << "class ICairoShim {}\n";
+  cout << "class mansoura__IMansoura {}\n";
   cout<<endl;
 
   // these need to be declared in a specific order

createLinkGroupIcons.cc

@@ -1,16 +1,16 @@
-#include "plot.h"
+#include "mansouraPlot.h"
 #include "cairo_base.h"
 #include "ecolab_epilogue.h"
 #include <cairo.h>
-using namespace ecolab;
+using namespace mansoura;
 using namespace std;
 
 int main()
 {
   const double width=30, height=10;
   for (int i=0; i<paletteSz; ++i)
     {
-      const cairo::Surface surface(cairo_image_surface_create(CAIRO_FORMAT_ARGB32,width,height));
+      const ecolab::cairo::Surface surface(cairo_image_surface_create(CAIRO_FORMAT_ARGB32,width,height));
       auto cr=surface.cairo();
       auto c=palette[i];
       cairo_set_source_rgba(cr,0.5*c.r,0.5*c.g,0.5*c.b,0.5*c.a);