catdog2/lsim
1
0
Fork 0
Code Issues Pull Requests Releases Activity

px pos usw

Browse Source 
git-svn-id: http://svn.lsim.tuxzone.org/trunk@45 4bec179b-ab65-46ed-a5f8-55b8b5c735d0
This commit is contained in:
catdog2
2009-01-17 20:21:05 +00:00
parent 96881b3214
commit 14847864ae
9 changed files with 38 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lsim.kdevelop
View File

@@ -53,7 +53,7 @@
<completionBoxItemOrder>0</completionBoxItemOrder> <completionBoxItemOrder>0</completionBoxItemOrder>
<howEvaluationContextMenu>true</howEvaluationContextMenu> <howEvaluationContextMenu>true</howEvaluationContextMenu>
<showCommentWithArgumentHint>true</showCommentWithArgumentHint> <showCommentWithArgumentHint>true</showCommentWithArgumentHint>
<statusBarTypeEvaluation>false</statusBarTypeEvaluation> <statusBarTypeEvaluation>true</statusBarTypeEvaluation>
<namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases> <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
<processPrimaryTypes>true</processPrimaryTypes> <processPrimaryTypes>true</processPrimaryTypes>
<processFunctionArguments>true</processFunctionArguments> <processFunctionArguments>true</processFunctionArguments>
@@ -62,7 +62,7 @@
<resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental> <resolveIncludePathsUsingMakeExperimental>false</resolveIncludePathsUsingMakeExperimental>
<alwaysParseInBackground>true</alwaysParseInBackground> <alwaysParseInBackground>true</alwaysParseInBackground>
<usePermanentCaching>true</usePermanentCaching> <usePermanentCaching>true</usePermanentCaching>
<alwaysIncludeNamespaces>false</alwaysIncludeNamespaces> <alwaysIncludeNamespaces>true</alwaysIncludeNamespaces>
<includePaths>.;</includePaths> <includePaths>.;</includePaths>
</codecompletion> </codecompletion>
<creategettersetter> <creategettersetter>
@@ -143,11 +143,11 @@
</kdevdebugger> </kdevdebugger>
<kdevtrollproject> <kdevtrollproject>
<run> <run>
<mainprogram>/mnt/sdb1/c++/lsim</mainprogram> <mainprogram/>
<programargs/> <programargs/>
<directoryradio>executable</directoryradio> <directoryradio>executable</directoryradio>
<globaldebugarguments/> <globaldebugarguments/>
<globalcwd>/mnt/sdb1/c++/lsim</globalcwd> <globalcwd/>
<useglobalprogram>false</useglobalprogram> <useglobalprogram>false</useglobalprogram>
<terminal>false</terminal> <terminal>false</terminal>
<autocompile>false</autocompile> <autocompile>false</autocompile>

BIN
lsim.kdevelop.pcs
View File

Binary file not shown.

72
lsim.kdevses
View File

@@ -1,64 +1,22 @@
<?xml version = '1.0' encoding = 'UTF-8'?> <?xml version = '1.0' encoding = 'UTF-8'?>
<!DOCTYPE KDevPrjSession> <!DOCTYPE KDevPrjSession>
<KDevPrjSession> <KDevPrjSession>
<DocsAndViews NumberOfDocuments="19" > <DocsAndViews NumberOfDocuments="5" >
<Doc0 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/graphicsellipseitem.cpp" > <Doc0 NumberOfViews="1" URL="file:///home/peter/c%2B%2B/lsim/src/simulscene.cpp" >
<View0 Encoding="" Type="Source" />
</Doc0>
<Doc1 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/simulscene.cpp" >
<View0 Encoding="" line="886" Type="Source" />
</Doc1>
<Doc2 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/main.cpp" >
<View0 Encoding="" Type="Source" />
</Doc2>
<Doc3 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/graphicsellipseitem.h" >
<View0 Encoding="" Type="Source" />
</Doc3>
<Doc4 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/lsim.h" >
<View0 Encoding="" Type="Source" />
</Doc4>
<Doc5 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/graphicsview.cpp" >
<View0 Encoding="" line="0" Type="Source" /> <View0 Encoding="" line="0" Type="Source" />
</Doc5> </Doc0>
<Doc6 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/graphicsview.h" > <Doc1 NumberOfViews="1" URL="file:///home/peter/c%2B%2B/lsim/src/homoefielditem.cpp" >
<View0 Encoding="" Type="Source" /> <View0 Encoding="" line="108" Type="Source" />
</Doc6> </Doc1>
<Doc7 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/simulscene.h" > <Doc2 NumberOfViews="1" URL="file:///home/peter/c%2B%2B/lsim/src/graphicsellipseitem.cpp" >
<View0 Encoding="" Type="Source" /> <View0 Encoding="" line="198" Type="Source" />
</Doc7> </Doc2>
<Doc8 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/fielditem.h" > <Doc3 NumberOfViews="1" URL="file:///home/peter/c%2B%2B/lsim/src/lsim.cpp" >
<View0 Encoding="" Type="Source" /> <View0 Encoding="" line="530" Type="Source" />
</Doc8> </Doc3>
<Doc9 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/homobfielditem.h" > <Doc4 NumberOfViews="1" URL="file:///home/peter/c%2B%2B/lsim/src/stopperwidget.cpp" >
<View0 Encoding="" Type="Source" /> <View0 Encoding="" line="66" Type="Source" />
</Doc9> </Doc4>
<Doc10 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/homobfielditem.cpp" >
<View0 Encoding="" Type="Source" />
</Doc10>
<Doc11 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/homoefielditem.h" >
<View0 Encoding="" Type="Source" />
</Doc11>
<Doc12 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/homoefielditem.cpp" >
<View0 Encoding="" Type="Source" />
</Doc12>
<Doc13 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/stopperitem.h" >
<View0 Encoding="" Type="Source" />
</Doc13>
<Doc14 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/stopperitem.cpp" >
<View0 Encoding="" Type="Source" />
</Doc14>
<Doc15 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/application.qrc" >
<View0 Encoding="" Type="Source" />
</Doc15>
<Doc16 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/constants.h" >
<View0 Encoding="" Type="Source" />
</Doc16>
<Doc17 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/fielditem.cpp" >
<View0 Encoding="" line="124" Type="Source" />
</Doc17>
<Doc18 NumberOfViews="1" URL="file:///mnt/sdb1/c%2B%2B/lsim/src/lsim.cpp" >
<View0 Encoding="" line="374" Type="Source" />
</Doc18>
</DocsAndViews> </DocsAndViews>
<pluginList> <pluginList>
<kdevdebugger> <kdevdebugger>

2
src/graphicsellipseitem.cpp
View File

@@ -196,7 +196,7 @@ void GraphicsEllipseItem::calculateProbePath(QPointF startPoint) {
currProbePath->append(newPoint); currProbePath->append(newPoint);
speedListX->append(newspeedX); speedListX->append(newspeedX);
speedListY->append(newspeedY); speedListY->append(newspeedY);
elapsedTimeList->append(elapsedTimeList->at(i-1) + timePerStep); elapsedTimeList->append(elapsedTimeList->at(i-1) + timePerStep);
} }

4
src/homobfieldwidget.cpp
View File

@@ -40,12 +40,14 @@ void HomoBFieldWidget::createWidget() {
QDoubleSpinBox *heightBox = new QDoubleSpinBox; QDoubleSpinBox *heightBox = new QDoubleSpinBox;
heightBox->setRange(HomoBFieldItem::MinimumHeight, 5000); heightBox->setRange(HomoBFieldItem::MinimumHeight, 5000);
heightBox->setKeyboardTracking(false); heightBox->setKeyboardTracking(false);
heightBox->setSuffix(" px");
connect(homoBField ,SIGNAL(heightChanged(double)), heightBox, SLOT(setValue(double)) ); connect(homoBField ,SIGNAL(heightChanged(double)), heightBox, SLOT(setValue(double)) );
connect(heightBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setRectFHeight(double)) ); connect(heightBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setRectFHeight(double)) );
QDoubleSpinBox *widthBox = new QDoubleSpinBox; QDoubleSpinBox *widthBox = new QDoubleSpinBox;
widthBox->setRange(HomoBFieldItem::MinimumWidth, 5000); widthBox->setRange(HomoBFieldItem::MinimumWidth, 5000);
widthBox->setKeyboardTracking(false); widthBox->setKeyboardTracking(false);
widthBox->setSuffix(" px");
connect(homoBField ,SIGNAL(widthChanged(double)),widthBox, SLOT(setValue(double)) ); connect(homoBField ,SIGNAL(widthChanged(double)),widthBox, SLOT(setValue(double)) );
connect(widthBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setRectFWidth(double)) ); connect(widthBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setRectFWidth(double)) );
@@ -57,12 +59,14 @@ void HomoBFieldWidget::createWidget() {
QDoubleSpinBox *posXBox = new QDoubleSpinBox; QDoubleSpinBox *posXBox = new QDoubleSpinBox;
posXBox->setRange(-5000, 5000); posXBox->setRange(-5000, 5000);
posXBox->setKeyboardTracking(false); posXBox->setKeyboardTracking(false);
posXBox->setSuffix(" px");
connect(homoBField ,SIGNAL(ScenePosXChanged(double)),posXBox, SLOT(setValue(double)) ); connect(homoBField ,SIGNAL(ScenePosXChanged(double)),posXBox, SLOT(setValue(double)) );
connect(posXBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setScenePosX(double)) ); connect(posXBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setScenePosX(double)) );
QDoubleSpinBox *posYBox = new QDoubleSpinBox; QDoubleSpinBox *posYBox = new QDoubleSpinBox;
posYBox->setRange(-5000, 5000); posYBox->setRange(-5000, 5000);
posYBox->setKeyboardTracking(false); posYBox->setKeyboardTracking(false);
posYBox->setSuffix(" px");
posYBox->setStatusTip("Position des Feldes in y-Richtung"); posYBox->setStatusTip("Position des Feldes in y-Richtung");
connect(homoBField ,SIGNAL(ScenePosYChanged(double)),posYBox, SLOT(setValue(double)) ); connect(homoBField ,SIGNAL(ScenePosYChanged(double)),posYBox, SLOT(setValue(double)) );
connect(posYBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setScenePosY(double)) ); connect(posYBox, SIGNAL(valueChanged(double)),homoBField ,SLOT(setScenePosY(double)) );

5
src/homoefieldwidget.cpp
View File

@@ -48,12 +48,15 @@ void HomoEFieldWidget::createWidget()
QDoubleSpinBox *heightBox = new QDoubleSpinBox; QDoubleSpinBox *heightBox = new QDoubleSpinBox;
heightBox->setRange(HomoEFieldItem::MinimumHeight, 5000); heightBox->setRange(HomoEFieldItem::MinimumHeight, 5000);
heightBox->setKeyboardTracking(false); heightBox->setKeyboardTracking(false);
heightBox->setSuffix(" px");
connect(homoEField ,SIGNAL(heightChanged(double)), heightBox, SLOT(setValue(double)) ); connect(homoEField ,SIGNAL(heightChanged(double)), heightBox, SLOT(setValue(double)) );
connect(heightBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setRectFHeight(double)) ); connect(heightBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setRectFHeight(double)) );
QDoubleSpinBox *widthBox = new QDoubleSpinBox; QDoubleSpinBox *widthBox = new QDoubleSpinBox;
widthBox->setRange(HomoEFieldItem::MinimumWidth, 5000); widthBox->setRange(HomoEFieldItem::MinimumWidth, 5000);
widthBox->setKeyboardTracking(false); widthBox->setKeyboardTracking(false);
widthBox->setSuffix(" px");
connect(homoEField ,SIGNAL(widthChanged(double)),widthBox, SLOT(setValue(double)) ); connect(homoEField ,SIGNAL(widthChanged(double)),widthBox, SLOT(setValue(double)) );
connect(widthBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setRectFWidth(double)) ); connect(widthBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setRectFWidth(double)) );
@@ -66,12 +69,14 @@ void HomoEFieldWidget::createWidget()
QDoubleSpinBox *posXBox = new QDoubleSpinBox; QDoubleSpinBox *posXBox = new QDoubleSpinBox;
posXBox->setRange(-5000, 5000); posXBox->setRange(-5000, 5000);
posXBox->setKeyboardTracking(false); posXBox->setKeyboardTracking(false);
posXBox->setSuffix(" px");
connect(homoEField ,SIGNAL(ScenePosXChanged(double)),posXBox, SLOT(setValue(double)) ); connect(homoEField ,SIGNAL(ScenePosXChanged(double)),posXBox, SLOT(setValue(double)) );
connect(posXBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setScenePosX(double)) ); connect(posXBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setScenePosX(double)) );
QDoubleSpinBox *posYBox = new QDoubleSpinBox; QDoubleSpinBox *posYBox = new QDoubleSpinBox;
posYBox->setRange(-5000, 5000); posYBox->setRange(-5000, 5000);
posYBox->setKeyboardTracking(false); posYBox->setKeyboardTracking(false);
posYBox->setSuffix(" px");
connect(homoEField ,SIGNAL(ScenePosYChanged(double)),posYBox, SLOT(setValue(double)) ); connect(homoEField ,SIGNAL(ScenePosYChanged(double)),posYBox, SLOT(setValue(double)) );
connect(posYBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setScenePosY(double)) ); connect(posYBox, SIGNAL(valueChanged(double)),homoEField ,SLOT(setScenePosY(double)) );

5
src/lsim.cpp
View File

@@ -528,9 +528,11 @@ void lsim::createDocks() {
//description labels //description labels
QLabel *time_per_step_label = new QLabel(tr("Zeit pro Schritt:")); 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 *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_label = new QLabel(tr("Automatische Schrittl\344nge:"));
QLabel *adaptive_time_step_box_label = new QLabel(tr("Schrittl\344nge:"));
//Scene settings Layout //Scene settings Layout
QGridLayout *sceneGridLayout = new QGridLayout; QGridLayout *sceneGridLayout = new QGridLayout;
@@ -540,6 +542,7 @@ void lsim::createDocks() {
sceneGridLayout->addWidget(time_step_box,1,1); sceneGridLayout->addWidget(time_step_box,1,1);
sceneGridLayout->addWidget(adaptive_time_step_label,2,0,Qt::AlignRight); sceneGridLayout->addWidget(adaptive_time_step_label,2,0,Qt::AlignRight);
sceneGridLayout->addWidget(adaptive_time_step_box,2,1); 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(adaptive_step_length_box,3,1);
sceneGridLayout->addWidget(meter_per_pixel_label,4,0,Qt::AlignRight); sceneGridLayout->addWidget(meter_per_pixel_label,4,0,Qt::AlignRight);
sceneGridLayout->addWidget(meter_per_px_box,4,1); sceneGridLayout->addWidget(meter_per_px_box,4,1);

2
src/probechargewidget.cpp
View File

@@ -72,6 +72,7 @@ void ProbeChargeWidget::createWidget()
QDoubleSpinBox *posXBox = new QDoubleSpinBox; QDoubleSpinBox *posXBox = new QDoubleSpinBox;
posXBox->setRange(-5000, 5000); posXBox->setRange(-5000, 5000);
posXBox->setSuffix(" px");
posXBox->setKeyboardTracking(false); posXBox->setKeyboardTracking(false);
connect(posXBox, SIGNAL(valueChanged(double)), ellipseItem, SLOT(setScenePosX(double)) ); connect(posXBox, SIGNAL(valueChanged(double)), ellipseItem, SLOT(setScenePosX(double)) );
connect(ellipseItem, SIGNAL(ScenePosXChanged(double)), posXBox, SLOT(setValue(double)) ); connect(ellipseItem, SIGNAL(ScenePosXChanged(double)), posXBox, SLOT(setValue(double)) );
@@ -79,6 +80,7 @@ void ProbeChargeWidget::createWidget()
QDoubleSpinBox *posYBox = new QDoubleSpinBox; QDoubleSpinBox *posYBox = new QDoubleSpinBox;
posYBox->setRange(-5000, 5000); posYBox->setRange(-5000, 5000);
posYBox->setSuffix(" px");
posYBox->setKeyboardTracking(false); posYBox->setKeyboardTracking(false);
connect(posYBox, SIGNAL(valueChanged(double)), ellipseItem, SLOT(setScenePosY(double)) ); connect(posYBox, SIGNAL(valueChanged(double)), ellipseItem, SLOT(setScenePosY(double)) );
connect(ellipseItem, SIGNAL(ScenePosYChanged(double)), posYBox, SLOT(setValue(double)) ); connect(ellipseItem, SIGNAL(ScenePosYChanged(double)), posYBox, SLOT(setValue(double)) );

3
src/stopperwidget.cpp
View File

@@ -44,6 +44,7 @@ void StopperWidget::createWidget()
QDoubleSpinBox *widthBox = new QDoubleSpinBox; QDoubleSpinBox *widthBox = new QDoubleSpinBox;
widthBox->setRange(StopperItem::MinimumWidth, 5000); widthBox->setRange(StopperItem::MinimumWidth, 5000);
widthBox->setKeyboardTracking(false); widthBox->setKeyboardTracking(false);
widthBox->setSuffix(" px");
connect(stopperItem ,SIGNAL(widthChanged(double)),widthBox, SLOT(setValue(double)) ); connect(stopperItem ,SIGNAL(widthChanged(double)),widthBox, SLOT(setValue(double)) );
connect(widthBox, SIGNAL(valueChanged(double)),stopperItem ,SLOT(setRectFWidth(double)) ); connect(widthBox, SIGNAL(valueChanged(double)),stopperItem ,SLOT(setRectFWidth(double)) );
@@ -55,12 +56,14 @@ void StopperWidget::createWidget()
QDoubleSpinBox *posXBox = new QDoubleSpinBox; QDoubleSpinBox *posXBox = new QDoubleSpinBox;
posXBox->setRange(-5000, 5000); posXBox->setRange(-5000, 5000);
posXBox->setKeyboardTracking(false); posXBox->setKeyboardTracking(false);
posXBox->setSuffix(" px");
connect(stopperItem ,SIGNAL(ScenePosXChanged(double)),posXBox, SLOT(setValue(double)) ); connect(stopperItem ,SIGNAL(ScenePosXChanged(double)),posXBox, SLOT(setValue(double)) );
connect(posXBox, SIGNAL(valueChanged(double)),stopperItem ,SLOT(setScenePosX(double)) ); connect(posXBox, SIGNAL(valueChanged(double)),stopperItem ,SLOT(setScenePosX(double)) );
QDoubleSpinBox *posYBox = new QDoubleSpinBox; QDoubleSpinBox *posYBox = new QDoubleSpinBox;
posYBox->setRange(-5000, 5000); posYBox->setRange(-5000, 5000);
posYBox->setKeyboardTracking(false); posYBox->setKeyboardTracking(false);
posYBox->setSuffix(" px");
connect(stopperItem ,SIGNAL(ScenePosYChanged(double)),posYBox, SLOT(setValue(double)) ); connect(stopperItem ,SIGNAL(ScenePosYChanged(double)),posYBox, SLOT(setValue(double)) );
connect(posYBox, SIGNAL(valueChanged(double)),stopperItem ,SLOT(setScenePosY(double)) ); connect(posYBox, SIGNAL(valueChanged(double)),stopperItem ,SLOT(setScenePosY(double)) );