diff --git a/main.cpp b/main.cpp index 2876c308..2f274f2d 100644 --- a/main.cpp +++ b/main.cpp @@ -117,26 +117,19 @@ PIKbdListener kbd(0, 0, false); int main(int argc, char * argv[]) { - //piCout << PISerial::availableDevicesInfo(); - /*PIIODevice * d = PIIODevice::createFromFullPath(argv[1]); - piCout << d; - if (d) { - d->open(); - piCout << d->constructFullPath() << d->isOpened(); - }*/ - /*piCout << PIString("1.1,0:1").findAny(".,:"); - piCout << PIString("1,1,0:1").findAny(".,:"); - piCout << PIString("1:1,0:1").findAny(".,:"); - piCout << PIString("1.1,0:1").findAnyLast(".,:");*/ - piCout << versionNormalize(""); - piCout << versionNormalize("1"); - piCout << versionNormalize("1.2"); - piCout << versionNormalize("1.2.3"); - piCout << versionNormalize("1.2+rc1.99"); - piCout << versionNormalize("1.2-alpha"); - piCout << versionNormalize("1..4_rc2-999"); - //piCout << versionCompare(".2-alpha", "0.2_alpha"); - //piCout << versionCompare("1_prebeta", "1.0_alpha"); - + PIMathMatrixd m = PIMathMatrixd::identity(3,3); + m*=33; + piCout << m; + PIMathMatrixd m2; + m2 = m; m2.resize(3,5, 99); + piCout << m2; + m2 = m; m2.resize(5,3, 88); + piCout << m2; + m2 = m; m2.resize(4,9, 77); + piCout << m2; + m2 = m; m2.resize(2,2, 66); + piCout << m2; + m2 = m; m2.resize(2,8, 66); + piCout << m2; return 0; } diff --git a/src_main/containers/pivector2d.h b/src_main/containers/pivector2d.h index 50119326..fc8fd467 100644 --- a/src_main/containers/pivector2d.h +++ b/src_main/containers/pivector2d.h @@ -213,9 +213,24 @@ public: } inline PIVector2D & resize(size_t rows, size_t cols, const T & f = T()) { + mat.resize(rows*cols_, f); rows_ = rows; - cols_ = cols; + int cs = (cols - cols_); + if (cs < 0) { + for (size_t r=0; r 0) { + for (size_t r=0; r