actual version libs withiout pip

git-svn-id: svn://db.shs.com.ru/libs@2 a8b55f48-bf90-11e4-a774-851b48703e85

mbricks/.kdev4/mbricks.kdev4

@@ -1,25 +0,0 @@
-[Buildset]
-BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x0e\x00m\x00b\x00r\x00i\x00c\x00k\x00s)
-
-[CMake]
-Build Directory Count=1
-CMakeDir=file:///usr/share/cmake-2.8/Modules
-Current Build Directory Index=0
-ProjectRootRelative=./
-
-[CMake][CMake Build Directory 0]
-Build Directory Path=file:///mnt/data/orders/libs/mbricks/
-Build Type=
-CMake Binary=file:///usr/bin/cmake
-Environment Profile=
-Extra Arguments=
-Install Directory=file:///usr/local
-
-[Defines And Includes][Compiler]
-Name=GCC
-Path=gcc
-Type=GCC
-
-[MakeBuilder]
-Default Make Environment Profile=
-Number Of Jobs=8

mbricks/brick_base.h

@@ -5,6 +5,7 @@
 #include "piconfig.h"
 #include "pivariant.h"
 #include "picollection.h"
+#include "pimathmodule.h"
 
 #define MBRICK(brick) PIOBJECT_SUBCLASS(brick, BrickBase) friend class BrickManager; public: virtual BrickBase * copy() {brick * t = new brick(*this); t->setName(name()); t->type = type; t->copied(); return t;}
 

mbricks/brick_composite.cpp

@@ -357,7 +357,7 @@ void buildTree(PIVector<BrickBase * > & bricks, PIVector<PIVector<BrickBase * >
 		if (mlev > bricks[i]->level_)
 			mlev = bricks[i]->level_;
 		if (mlev >= 0) return;
-		cout << "minimum level = " << mlev << ", so rebuild tree manually\n";
+		piCout << "minimum level =" << mlev << ", so rebuild tree manually";
 	tree.clear();
 	int clev = 0;
 	uint cnt = 0;

mbricks/brick_interface.h

@@ -4,6 +4,7 @@
 #include "brick_base.h"
 #include "piserial.h"
 #include "piethernet.h"
+#include "pifile.h"
 
 static PIMutex mutex;
 

mbricks/brick_manager.cpp

@@ -219,7 +219,7 @@ bool BrickManager::loadScheme(const PIString & file) {
 		cname = sr.getValue(prefix + "codeName", "");
 		b = BrickComposite::findBaseBrick(cname);
 		if (b == 0) {
-			cout << "Error while loading scheme: can`t find brick \"" << cname << "\"" << endl;
+			piCout << "Error while loading scheme: can`t find brick \"" << cname << "\"";
 			continue;
 		} else
 			b = b->copy();
@@ -232,7 +232,7 @@ bool BrickManager::loadScheme(const PIString & file) {
 		bf = findBrick(sr.getValue(prefix + "from Name", "").value().stdString());
 		bt = findBrick(sr.getValue(prefix + "to Name", "").value().stdString());
 		if (bf == 0 || bt == 0) {
-			cout << "Error while loading scheme: can`t create connection " << i << endl;
+			piCout << "Error while loading scheme: can`t create connection " << i;
 			continue;
 		}
 		BrickBase::connect(bf, sr.getValue(prefix + "from Port", 0), bt, sr.getValue(prefix + "to Port", 0));

mbricks/brick_math.cpp

@@ -116,7 +116,7 @@ bool BrickMathDelayTicks::tick_body(double time) {
 
 
 bool BrickMathDelaySeconds::tick_body(double time) {
-	t = round(parameters[0].toFloat() / dt) + 1;
+	t = piRound(parameters[0].toFloat() / dt) + 1;
 	if (t < 1) t = 1;
 	if (v.size() != t) {
 		v.resize(t);

mbricks/brick_math.h

@@ -147,7 +147,7 @@ class BrickMathQuantize: public BrickMathBase {
 	BrickMathQuantize(double step = 1.): BrickMathBase(2, 1) {setStep(step); type = "Quantize"; setName(type); inNames[1] = "Step";}
 	enum Inputs {Input, Step};
 	void setStep(double step) {inputs[Step] = step;}
-	virtual bool tick_body(double time) {outputs[0] = round(inputs[Input] / inputs[Step]) * inputs[Step]; return true;}
+	virtual bool tick_body(double time) {outputs[0] = piRound(inputs[Input] / inputs[Step]) * inputs[Step]; return true;}
 };
 ADD_NEW_TO_COLLECTION(Mathematic, BrickMathQuantize)
 
@@ -172,7 +172,7 @@ class BrickMathDelayTicks: public BrickMathBase {
 	void setDelay(int ticks) {parameters[0].setValue(ticks); v.resize(ticks); v.assign(ticks, 0.);}
 	virtual bool tick_body(double time);
 private:
-	deque<double> v;
+	PIDeque<double> v;
 };
 ADD_NEW_TO_COLLECTION(Mathematic, BrickMathDelayTicks)
 
@@ -184,7 +184,7 @@ class BrickMathDelaySeconds: public BrickMathBase {
 	void setDelay(double secs) {parameters[0].setValue(secs);}
 	virtual bool tick_body(double time);
 private:
-	deque<double> v;
+	PIDeque<double> v;
 	uint t;
 };
 ADD_NEW_TO_COLLECTION(Mathematic, BrickMathDelaySeconds)

mbricks/mbricks.kdev4

@@ -1,3 +0,0 @@
-[Project]
-Manager=KDevCMakeManager
-Name=mbricks