diff --git a/lsim.kdevelop b/lsim.kdevelop
index ee263e1..31edf0e 100644
--- a/lsim.kdevelop
+++ b/lsim.kdevelop
@@ -53,7 +53,7 @@
0
true
true
- false
+ true
std=_GLIBCXX_STD;__gnu_cxx=std
true
true
@@ -62,7 +62,7 @@
false
true
true
- false
+ true
.;
@@ -143,11 +143,11 @@
- /mnt/sdb1/c++/lsim
+
executable
- /mnt/sdb1/c++/lsim
+
false
false
false
diff --git a/lsim.kdevelop.pcs b/lsim.kdevelop.pcs
index 26dc375..3fe69f8 100644
Binary files a/lsim.kdevelop.pcs and b/lsim.kdevelop.pcs differ
diff --git a/lsim.kdevses b/lsim.kdevses
index e94ac50..501a47c 100644
--- a/lsim.kdevses
+++ b/lsim.kdevses
@@ -1,64 +1,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/graphicsellipseitem.cpp b/src/graphicsellipseitem.cpp
index 6f3f645..c02e9c4 100644
--- a/src/graphicsellipseitem.cpp
+++ b/src/graphicsellipseitem.cpp
@@ -196,7 +196,7 @@ void GraphicsEllipseItem::calculateProbePath(QPointF startPoint) {
currProbePath->append(newPoint);
speedListX->append(newspeedX);
- speedListY->append(newspeedY);
+ speedListY->append(newspeedY);
elapsedTimeList->append(elapsedTimeList->at(i-1) + timePerStep);
}
diff --git a/src/homobfieldwidget.cpp b/src/homobfieldwidget.cpp
index 0b16756..72feb11 100644
--- a/src/homobfieldwidget.cpp
+++ b/src/homobfieldwidget.cpp
@@ -40,12 +40,14 @@ void HomoBFieldWidget::createWidget() {
QDoubleSpinBox *heightBox = new QDoubleSpinBox;
heightBox->setRange(HomoBFieldItem::MinimumHeight, 5000);
heightBox->setKeyboardTracking(false);
+ heightBox->setSuffix(" px");
connect(homoBField ,SIGNAL(heightChanged(double)), heightBox, SLOT(setValue(double)) );
connect(heightBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setRectFHeight(double)) );
QDoubleSpinBox *widthBox = new QDoubleSpinBox;
widthBox->setRange(HomoBFieldItem::MinimumWidth, 5000);
widthBox->setKeyboardTracking(false);
+ widthBox->setSuffix(" px");
connect(homoBField ,SIGNAL(widthChanged(double)),widthBox, SLOT(setValue(double)) );
connect(widthBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setRectFWidth(double)) );
@@ -57,12 +59,14 @@ void HomoBFieldWidget::createWidget() {
QDoubleSpinBox *posXBox = new QDoubleSpinBox;
posXBox->setRange(-5000, 5000);
posXBox->setKeyboardTracking(false);
+ posXBox->setSuffix(" px");
connect(homoBField ,SIGNAL(ScenePosXChanged(double)),posXBox, SLOT(setValue(double)) );
connect(posXBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setScenePosX(double)) );
QDoubleSpinBox *posYBox = new QDoubleSpinBox;
posYBox->setRange(-5000, 5000);
posYBox->setKeyboardTracking(false);
+ posYBox->setSuffix(" px");
posYBox->setStatusTip("Position des Feldes in y-Richtung");
connect(homoBField ,SIGNAL(ScenePosYChanged(double)),posYBox, SLOT(setValue(double)) );
connect(posYBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setScenePosY(double)) );
diff --git a/src/homoefieldwidget.cpp b/src/homoefieldwidget.cpp
index c065170..56fb550 100644
--- a/src/homoefieldwidget.cpp
+++ b/src/homoefieldwidget.cpp
@@ -48,12 +48,15 @@ void HomoEFieldWidget::createWidget()
QDoubleSpinBox *heightBox = new QDoubleSpinBox;
heightBox->setRange(HomoEFieldItem::MinimumHeight, 5000);
heightBox->setKeyboardTracking(false);
+ heightBox->setSuffix(" px");
+
connect(homoEField ,SIGNAL(heightChanged(double)), heightBox, SLOT(setValue(double)) );
connect(heightBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setRectFHeight(double)) );
QDoubleSpinBox *widthBox = new QDoubleSpinBox;
widthBox->setRange(HomoEFieldItem::MinimumWidth, 5000);
widthBox->setKeyboardTracking(false);
+ widthBox->setSuffix(" px");
connect(homoEField ,SIGNAL(widthChanged(double)),widthBox, SLOT(setValue(double)) );
connect(widthBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setRectFWidth(double)) );
@@ -66,12 +69,14 @@ void HomoEFieldWidget::createWidget()
QDoubleSpinBox *posXBox = new QDoubleSpinBox;
posXBox->setRange(-5000, 5000);
posXBox->setKeyboardTracking(false);
+ posXBox->setSuffix(" px");
connect(homoEField ,SIGNAL(ScenePosXChanged(double)),posXBox, SLOT(setValue(double)) );
connect(posXBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setScenePosX(double)) );
QDoubleSpinBox *posYBox = new QDoubleSpinBox;
posYBox->setRange(-5000, 5000);
posYBox->setKeyboardTracking(false);
+ posYBox->setSuffix(" px");
connect(homoEField ,SIGNAL(ScenePosYChanged(double)),posYBox, SLOT(setValue(double)) );
connect(posYBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setScenePosY(double)) );
diff --git a/src/lsim.cpp b/src/lsim.cpp
index 939e6d2..6370597 100644
--- a/src/lsim.cpp
+++ b/src/lsim.cpp
@@ -528,9 +528,11 @@ void lsim::createDocks() {
//description labels
QLabel *time_per_step_label = new QLabel(tr("Zeit pro Schritt:"));
- QLabel *steps_label = new QLabel(tr("Schritte:"));
+ QLabel *steps_label = new QLabel(tr("Maximale Schrittanzahl:"));
QLabel *meter_per_pixel_label = new QLabel(tr("Ein Pixel entspricht:"));
QLabel *adaptive_time_step_label = new QLabel(tr("Automatische Schrittl\344nge:"));
+ QLabel *adaptive_time_step_box_label = new QLabel(tr("Schrittl\344nge:"));
+
//Scene settings Layout
QGridLayout *sceneGridLayout = new QGridLayout;
@@ -540,6 +542,7 @@ void lsim::createDocks() {
sceneGridLayout->addWidget(time_step_box,1,1);
sceneGridLayout->addWidget(adaptive_time_step_label,2,0,Qt::AlignRight);
sceneGridLayout->addWidget(adaptive_time_step_box,2,1);
+ sceneGridLayout->addWidget(adaptive_time_step_box_label,3,0,Qt::AlignRight);
sceneGridLayout->addWidget(adaptive_step_length_box,3,1);
sceneGridLayout->addWidget(meter_per_pixel_label,4,0,Qt::AlignRight);
sceneGridLayout->addWidget(meter_per_px_box,4,1);
diff --git a/src/probechargewidget.cpp b/src/probechargewidget.cpp
index 69699cf..15262ca 100644
--- a/src/probechargewidget.cpp
+++ b/src/probechargewidget.cpp
@@ -72,6 +72,7 @@ void ProbeChargeWidget::createWidget()
QDoubleSpinBox *posXBox = new QDoubleSpinBox;
posXBox->setRange(-5000, 5000);
+ posXBox->setSuffix(" px");
posXBox->setKeyboardTracking(false);
connect(posXBox, SIGNAL(valueChanged(double)), ellipseItem, SLOT(setScenePosX(double)) );
connect(ellipseItem, SIGNAL(ScenePosXChanged(double)), posXBox, SLOT(setValue(double)) );
@@ -79,6 +80,7 @@ void ProbeChargeWidget::createWidget()
QDoubleSpinBox *posYBox = new QDoubleSpinBox;
posYBox->setRange(-5000, 5000);
+ posYBox->setSuffix(" px");
posYBox->setKeyboardTracking(false);
connect(posYBox, SIGNAL(valueChanged(double)), ellipseItem, SLOT(setScenePosY(double)) );
connect(ellipseItem, SIGNAL(ScenePosYChanged(double)), posYBox, SLOT(setValue(double)) );
diff --git a/src/stopperwidget.cpp b/src/stopperwidget.cpp
index f1ade1b..b1bf8d7 100644
--- a/src/stopperwidget.cpp
+++ b/src/stopperwidget.cpp
@@ -44,6 +44,7 @@ void StopperWidget::createWidget()
QDoubleSpinBox *widthBox = new QDoubleSpinBox;
widthBox->setRange(StopperItem::MinimumWidth, 5000);
widthBox->setKeyboardTracking(false);
+ widthBox->setSuffix(" px");
connect(stopperItem ,SIGNAL(widthChanged(double)),widthBox, SLOT(setValue(double)) );
connect(widthBox, SIGNAL(valueChanged(double)),stopperItem ,SLOT(setRectFWidth(double)) );
@@ -55,12 +56,14 @@ void StopperWidget::createWidget()
QDoubleSpinBox *posXBox = new QDoubleSpinBox;
posXBox->setRange(-5000, 5000);
posXBox->setKeyboardTracking(false);
+ posXBox->setSuffix(" px");
connect(stopperItem ,SIGNAL(ScenePosXChanged(double)),posXBox, SLOT(setValue(double)) );
connect(posXBox, SIGNAL(valueChanged(double)),stopperItem ,SLOT(setScenePosX(double)) );
QDoubleSpinBox *posYBox = new QDoubleSpinBox;
posYBox->setRange(-5000, 5000);
posYBox->setKeyboardTracking(false);
+ posYBox->setSuffix(" px");
connect(stopperItem ,SIGNAL(ScenePosYChanged(double)),posYBox, SLOT(setValue(double)) );
connect(posYBox, SIGNAL(valueChanged(double)),stopperItem ,SLOT(setScenePosY(double)) );