diff --git a/lsim.kdevelop.pcs b/lsim.kdevelop.pcs index 8187b46..5c6fa29 100644 Binary files a/lsim.kdevelop.pcs and b/lsim.kdevelop.pcs differ diff --git a/lsim.kdevses b/lsim.kdevses index ce2eaeb..b80fc99 100644 --- a/lsim.kdevses +++ b/lsim.kdevses @@ -1,12 +1,12 @@ - + - + @@ -24,8 +24,41 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lsim.tag b/lsim.tag index 096d24e..434a936 100644 --- a/lsim.tag +++ b/lsim.tag @@ -18,41 +18,19 @@ a9d062184e1c09d26080c7fe53b33b9e - - - editcopy.xpm - /mnt/sdb1/c++/lsim/src/ - editcopy_8xpm - - static char * - editcopy - editcopy_8xpm.html - 471211cb286a77cc53f043408037d009 - [] + + const qint32 + FILEVERSION + constants_8h.html + 35adba01364c142c79c98095184811ed + - - - editcut.xpm - /mnt/sdb1/c++/lsim/src/ - editcut_8xpm - - static char * - editcut - editcut_8xpm.html - 5c6dbb1908552e3c6ce9edc3ad0b1185 - [] - - - - editpaste.xpm - /mnt/sdb1/c++/lsim/src/ - editpaste_8xpm - - static char * - editpaste - editpaste_8xpm.html - 5bcfa6e8879a52d13089d8f26955d1df - [] + + const qint32 + FILEMAGIC + constants_8h.html + a7d61b7e5329c4c4f0605c593a8bc410 + @@ -74,6 +52,8 @@ fielditem.h homoefielditem.h homobfielditem.h + stopperitem.h + simulscene.h fielditem.h @@ -81,42 +61,6 @@ fielditem_8h FieldItem - - filenew.xpm - /mnt/sdb1/c++/lsim/src/ - filenew_8xpm - - static char * - filenew - filenew_8xpm.html - 12be11f9078c2358841f610019b44f62 - [] - - - - fileopen.xpm - /mnt/sdb1/c++/lsim/src/ - fileopen_8xpm - - static char * - fileopen - fileopen_8xpm.html - 260076d78280bdab25890dd5febe8ba3 - [] - - - - filesave.xpm - /mnt/sdb1/c++/lsim/src/ - filesave_8xpm - - static char * - filesave - filesave_8xpm.html - 4c51cfe135473cf998f1ed91ef2bd5da - [] - - graphicsellipseitem.cpp /mnt/sdb1/c++/lsim/src/ @@ -137,6 +81,7 @@ /mnt/sdb1/c++/lsim/src/ graphicsview_8cpp graphicsview.h + simulscene.h graphicsview.h @@ -164,6 +109,7 @@ homobfieldwidget_8cpp homobfieldwidget.h homobfielditem.h + simulscene.h expdoublespinbox.h @@ -179,6 +125,7 @@ homoefielditem_8cpp homoefielditem.h homoefieldwidget.h + simulscene.h homoefielditem.h @@ -210,6 +157,10 @@ simulscene.h expdoublespinbox.h homoefieldwidget.h + constants.h + homobfielditem.h + homoefielditem.h + stopperitem.h lsim.h @@ -432,6 +383,46 @@ [] + + moc_stopperitem.cpp + /mnt/sdb1/c++/lsim/src/ + moc__stopperitem_8cpp + stopperitem.h + + static QT_BEGIN_MOC_NAMESPACE const uint + qt_meta_data_StopperItem + moc__stopperitem_8cpp.html + 8e14635a7c47185b60acae0c3013769c + [] + + + static const char + qt_meta_stringdata_StopperItem + moc__stopperitem_8cpp.html + 800437c011c33ced0f3167732e922bc7 + [] + + + + moc_stopperwidget.cpp + /mnt/sdb1/c++/lsim/src/ + moc__stopperwidget_8cpp + stopperwidget.h + + static QT_BEGIN_MOC_NAMESPACE const uint + qt_meta_data_StopperWidget + moc__stopperwidget_8cpp.html + 2dc9c3f0d582e619b25e826cefdac95a + [] + + + static const char + qt_meta_stringdata_StopperWidget + moc__stopperwidget_8cpp.html + c77203f6fd8c9000fd2e3eae2939be05 + [] + + probechargewidget.cpp /mnt/sdb1/c++/lsim/src/ @@ -439,6 +430,7 @@ probechargewidget.h graphicsellipseitem.h expdoublespinbox.h + constants.h probechargewidget.h @@ -509,14 +501,44 @@ graphicsellipseitem.h homoefielditem.h homobfielditem.h + stopperitem.h simulscene.h /mnt/sdb1/c++/lsim/src/ simulscene_8h + graphicsellipseitem.h SimulScene SimulScene::resizeRects + + stopperitem.cpp + /mnt/sdb1/c++/lsim/src/ + stopperitem_8cpp + stopperitem.h + stopperwidget.h + + + stopperitem.h + /mnt/sdb1/c++/lsim/src/ + stopperitem_8h + fielditem.h + StopperItem + + + stopperwidget.cpp + /mnt/sdb1/c++/lsim/src/ + stopperwidget_8cpp + stopperwidget.h + stopperitem.h + expdoublespinbox.h + + + stopperwidget.h + /mnt/sdb1/c++/lsim/src/ + stopperwidget_8h + StopperWidget + ExpDoubleSpinBox classExpDoubleSpinBox.html @@ -664,6 +686,20 @@ bcdc7dd52b655d13caf540afe0a1ab5a (int angle) + + void + deleteMe + classFieldItem.html + 8c287825759b490a1594cf78a2fe4a92 + () + + + void + toggleSelection + classFieldItem.html + 0e5242641b4c85e76ca3c15ab746cc36 + () + virtual void setRectF @@ -797,6 +833,20 @@ 3632ac0ad8751fc2f411fbe8377d995c () + + virtual QList< QVariant > + getSaveDataList + classFieldItem.html + 4c9febd36616c103d0d0998687f0bc3b + ()=0 + + + virtual void + setSaveDataList + classFieldItem.html + c73b8c2da94991c4d6b4390ebb9b9c18 + (QList< QVariant > list)=0 + static bool isFieldItem @@ -811,6 +861,13 @@ 10c79fa0b47e07e35e276e85d58e0878 (QGraphicsSceneWheelEvent *event) + + virtual void + contextMenuEvent + classFieldItem.html + 857396d0b45193d965e2269d384cdfc3 + (QGraphicsSceneContextMenuEvent *event) + QPointF myScenePos @@ -832,6 +889,13 @@ c606d1d3b329826a200f9bb15715240d + + SimulScene * + mySimulScene + classFieldItem.html + a1820c77bb7e5b954af94da4a7384bd0 + + GraphicsEllipseItem @@ -899,6 +963,34 @@ e8c50bea63a7e0a4e4cb80cab277906b (const QPainterPath &theValue) + + void + resetProbe + classGraphicsEllipseItem.html + 9aed48a468806382a135e477f671aef7 + () + + + void + setAdaptiveStepControl + classGraphicsEllipseItem.html + e09837cdffe2c1d458ebae03eb7b51d0 + (bool theValue) + + + void + setAdaptiveStepLength + classGraphicsEllipseItem.html + 25c7e4e9fdaf8c941db1874b6e79ee20 + (double theValue) + + + void + updateScenePosLabels + classGraphicsEllipseItem.html + 69724e22e8f67b3533a89bd1f364e82c + () + void startSpeedXChanged @@ -948,6 +1040,48 @@ 5aeccf41db0391d25f2da1357986c479 (double newY) + + void + adaptiveStepControlChanged + classGraphicsEllipseItem.html + 5bc3a0cbcaf862f31af8d0351cf57998 + (bool truefalse) + + + void + adaptiveStepLengthChanged + classGraphicsEllipseItem.html + 07dd9a7fc1f2ea341bdec44e819d74cb + (double length) + + + void + ScenePosXChangedPixel + classGraphicsEllipseItem.html + 53c85163e9c49899efb48add6e1cbf78 + (QString newX) + + + void + ScenePosYChangedPixel + classGraphicsEllipseItem.html + 5160cdcc430b39eec0b4e35f90ffb049 + (QString newY) + + + void + ScenePosXChangedMeter + classGraphicsEllipseItem.html + 4b56a3c7f093afced479c88bd3f45864 + (QString newX) + + + void + ScenePosYChangedMeter + classGraphicsEllipseItem.html + fe8ffa93bc025eacf4af7b3f27967bed + (QString newY) + GraphicsEllipseItem @@ -976,6 +1110,13 @@ 130f0b45e6fe641c29928e51b468418b () + + QList< double > * + getElapsedTimeList + classGraphicsEllipseItem.html + fb8316f0ff07dcdd2200b9b8941c04d9 + () + double getCharge @@ -1001,8 +1142,8 @@ double getMasse classGraphicsEllipseItem.html - edd61d768890e05097cac9285ff63aba - (double speed) + 62ef6ccc95b4f453d2e157eaf8360013 + (double speed=0) QPainterPath @@ -1011,6 +1152,55 @@ 2e652c4e80a854b57ae6fc765ed77920 () const + + double + getRealSimulTime + classGraphicsEllipseItem.html + 40ce07c01bab5c363742249cd78c8a4b + () const + + + bool + isAdaptiveStepControlEnabled + classGraphicsEllipseItem.html + 3b13c4f5c5d28757282cc1c680b920cd + () const + + + double + getAdaptiveStepLength + classGraphicsEllipseItem.html + ed4460dcb096c8911b001c86bc807d07 + () const + + + QList< double > * + getSpeedListX + classGraphicsEllipseItem.html + faf44e63ffe8e8cfc57b90d67930de52 + () const + + + QList< double > * + getSpeedListY + classGraphicsEllipseItem.html + 39c5173d52ddf728f168a84c480f4303 + () const + + + QList< QVariant > + getSaveDataList + classGraphicsEllipseItem.html + 7edfedc59385266abbb30edc8f9f39ed + () + + + void + setSaveDataList + classGraphicsEllipseItem.html + 9a3a4511c0b32abb10bc1d69721b54a3 + (QList< QVariant > list) + void mousePressEvent @@ -1025,6 +1215,13 @@ 2e04dec51a601e3a83a7cdd924c58a75 (QTimerEvent *event) + + void + setupVars + classGraphicsEllipseItem.html + dadcdefc02599f53e621ce265c5976c2 + () + QList< QPointF > * currProbePath @@ -1046,6 +1243,13 @@ 1f55285da882bada1df7a093d56193ed + + QList< double > * + elapsedTimeList + classGraphicsEllipseItem.html + 6efcffab3013afe8e139dc07ff1be652 + + double masse @@ -1081,6 +1285,20 @@ 2aab36c74f1e052f672ef50a5fcab2a4 + + bool + adaptiveStepControlEnabled + classGraphicsEllipseItem.html + dcf3edb6d05c9ccaa69ce35c8f53ec1b + + + + double + adaptiveStepLength + classGraphicsEllipseItem.html + e044e7987b92d99a7c882e8f1eb1fdf0 + + QPointF myScenePos @@ -1113,12 +1331,19 @@ 4af6cad75be87d86297dae8fbcd0c620 () + + void + centerOnProbe + classGraphicsView.html + 591cd66b9aa7235d93c503b484a508e4 + () + GraphicsView classGraphicsView.html - 1a185da1facb776224b4cc9bbbe0aab9 - () + d239949f5fbf8be21e189f7980dfbc05 + (QWidget *parent=0, QStatusBar *statusbar=0) @@ -1127,6 +1352,27 @@ 367eed0f7fa5ab7b3cbc956f0d89d6d6 () + + void + drawBackground + classGraphicsView.html + f6c975739341f0c1eb8cb139b8521783 + (QPainter *painter, const QRectF &rect) + + + void + mouseMoveEvent + classGraphicsView.html + dc6f66e172be1bab25237f7811aa144a + (QMouseEvent *e) + + + QStatusBar * + mainWindowStatusBar + classGraphicsView.html + 22f54a162f8fcdade96e473ccf2658a4 + + HomoBFieldItem @@ -1227,6 +1473,13 @@ 52c1a5efd250fed63efd055863b27b93 (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) + + virtual bool + contains + classHomoBFieldItem.html + bf0995ea983b5a7c2ea9b3fcf2b81019 + (const QPointF point) + int type @@ -1269,6 +1522,20 @@ 7310d5af24b8a1f1955db694f3638fe6 () const + + QList< QVariant > + getSaveDataList + classHomoBFieldItem.html + ae734b8a4bd337653d65a68ab1e558f3 + () + + + void + setSaveDataList + classHomoBFieldItem.html + 177b500051522479020a1cd6ed26485a + (QList< QVariant > list) + void wheelEvent @@ -1380,13 +1647,6 @@ 3587e6994b7797227638d666fe56e0d8 (double theValue) - - double - getOuterPenWidth - classHomoEFieldItem.html - 0bcefbec64ba7552fe9f941fe9da1907 - () const - void fieldPowerChanged @@ -1443,6 +1703,13 @@ 9e852d12ede674be0390d63144f43385 (int pixel) + + virtual bool + contains + classHomoEFieldItem.html + 259a6dc0842ce4db3aced47d96829ee0 + (const QPointF point) + double getFieldPower @@ -1450,6 +1717,27 @@ cebd0e26d96ef0a916198f8c05c4bc78 () const + + double + getOuterPenWidth + classHomoEFieldItem.html + 0bcefbec64ba7552fe9f941fe9da1907 + () const + + + QList< QVariant > + getSaveDataList + classHomoEFieldItem.html + 60744cab72995e26b349c6f421bbc543 + () + + + void + setSaveDataList + classHomoEFieldItem.html + c341c49b98a12213a33f938771c3b587 + (QList< QVariant > list) + int fieldLineDistance @@ -1514,6 +1802,52 @@ lsim classlsim.html + + WindowMode + classlsim.html + 7af74dc52e753da3003861efa324bb3b + + + + EditMode + classlsim.html + 7af74dc52e753da3003861efa324bb3bab2ac025369058203269b2ace5ca8821 + + + + SimulationMode + classlsim.html + 7af74dc52e753da3003861efa324bb3b7194edceb386ce9c1e3f20430b309a93 + + + + void + goToFullscreen + classlsim.html + 596cdb0cbaff6aec33036a0ee60f17ab + (bool yesno) + + + void + windowModeChanged + classlsim.html + d1887f82ddfe493ca381d5b397a5cfc5 + (WindowMode mode) + + + void + timeLineDurationChangedSec + classlsim.html + 794899b6081ffeb45f516209b7d01c41 + (double duration) + + + void + fullScreenModeChanged + classlsim.html + 9cf7a8e3d28460930b82efa487a76042 + (bool mode) + lsim @@ -1528,6 +1862,20 @@ c7ed11c62400d659f82db0a0bd5a35af () + + void + setMode + classlsim.html + 869ef396ddb96cadc636e301cc8ab8a3 + (const WindowMode &theValue) + + + lsim::WindowMode + getMode + classlsim.html + a38ffb7fcd850367902602ffef791dad + () const + void closeEvent @@ -1549,6 +1897,13 @@ 11024901f919c3cfed0a6636bfafbbe1 (QAction *action) + + void + actWindowModeSwitcher + classlsim.html + 40a5f72e2add0e07a17396c8c3fc0be8 + (QAction *action) + void setSceneMode @@ -1563,6 +1918,90 @@ b955c8a5093f2a8ff9eb30aed0c21c30 () + + void + startCalculation + classlsim.html + d0bb64b264186c2fa0ca41e04a29fb1c + () + + + void + startTimer + classlsim.html + df674f1dc0808ea0fa9b20df391f1aae + () + + + void + handleDockLocationChange + classlsim.html + 8a72bbecc64d766434be02cf98bd4805 + () + + + void + handleUpDownActionChanges + classlsim.html + 572a8f67fd821e45ba3f985291174666 + () + + + void + initWindowMode + classlsim.html + 4172783b251777aa31045dfa712a7a00 + (WindowMode newMode) + + + void + clearAnyFocus + classlsim.html + 1598537f540f09fd1d93ab9f61a1d956 + () + + + void + resetAll + classlsim.html + 06440c0ac5ddcb3f5e296234382036e8 + () + + + void + resetAllActionSlot + classlsim.html + 0c021373e48cecac8a1d81ffddc0458a + () + + + void + timeLineDurationChangeWrapperToSec + classlsim.html + 34f9f8328753cbeb30fed5d04deacd8d + (int length) + + + void + timeLineDurationSetWrapperToMsec + classlsim.html + 5d2c3d51f1bd2df653778e35b1b6841d + (double length) + + + void + saveFileAs + classlsim.html + 667efa6d1fd82cac28924ef58aeb90dc + () + + + void + openFile + classlsim.html + f306c5d0fd8ffb2c1cfd509a4ee9265b + () + void createActions @@ -1605,6 +2044,13 @@ ea64591e3b29730ebb227370317f5565 () + + void + displayOpenFailedBox + classlsim.html + 29469712e3bc9519eeb8d635f97096cc + () + GraphicsView * gview @@ -1634,17 +2080,38 @@ - QToolBar * - fileToolBar + QMenu * + viewMenu classlsim.html - 18bd65b018d50615dc6ccf193e61c778 + 5d03bcccca055efb4d988921470f606e QToolBar * - editToolBar + timerControlBar classlsim.html - 15022ed5d2f9303674c94fa0684c38f8 + c895fce85ba18026191bbda151687d41 + + + + QToolBar * + sceneModeBar + classlsim.html + d8b8badea471ebed2cd1845f2319ea66 + + + + QToolBar * + upDownBar + classlsim.html + 7a633c83ab4e34b5812aa129ad0b2844 + + + + QToolBar * + windowModeBar + classlsim.html + f974865f92155ae148a452f1b0dcc2eb @@ -1661,6 +2128,13 @@ 9ab76164acbf8c9cfe766d295d84e5d9 + + QActionGroup * + windowModeActGroup + classlsim.html + 6ea0e2d11ac120201a9dfc6b554583aa + + QDockWidget * fieldItemEditDock @@ -1677,9 +2151,23 @@ QDockWidget * - dock_2 + sceneDock classlsim.html - 6d3765ed2ed2af79528c84b363c4351c + d570d830808fca4d39106529a5cd13eb + + + + QDockWidget * + simulOptDock + classlsim.html + 4c105529917f034d97ca32e42683187b + + + + QDockWidget * + simulDataDock + classlsim.html + 9448e4c2b3aff5e7947a4e2d0b8014c2 @@ -1689,6 +2177,13 @@ 04dd463751aac6c8e0b5f38ec8d32074 + + WindowMode + myMode + classlsim.html + ba8caf9b7bfe2d20b1890d4353a4e791 + + lsim::Actions @@ -1729,6 +2224,13 @@ 6c81e95c70e50a089632805843ec40ab + + QAction * + calculate + structlsim_1_1Actions.html + 65f9e8f21b8429e166e3a2636c1ab387 + + QAction * timerStart @@ -1743,6 +2245,69 @@ e21383d2adcb3d34d4b631b7b130da53 + + QAction * + timerPause + structlsim_1_1Actions.html + d03f1a5f3550ce720172bac19f96ff38 + + + + QAction * + fileSaveAsAct + structlsim_1_1Actions.html + 61c8e583145d735f3c2c89dd4d62659c + + + + QAction * + fileOpenAct + structlsim_1_1Actions.html + db25e2eaa4d01ec35b696df523481604 + + + + QAction * + moveItemDown + structlsim_1_1Actions.html + 58a8739e26bb434f6746093274a663e3 + + + + QAction * + moveItemUp + structlsim_1_1Actions.html + 5945117784e58dce78ee3cc9f80168bf + + + + QAction * + moveItemOnTop + structlsim_1_1Actions.html + a800da9aec131145abf2ef77b3b5bf7b + + + + QAction * + moveItemOnBottom + structlsim_1_1Actions.html + 9f148aacd86ede565a6e2e0d040f1fa6 + + + + QAction * + editModeAct + structlsim_1_1Actions.html + 1ece0cf74b2e4869faa175044fa6db96 + + + + QAction * + simulationModeAct + structlsim_1_1Actions.html + e40f9bfafcaf6547fb86a4f8bcfc753b + + QAction * itemEditModeAct @@ -1764,6 +2329,41 @@ 96d1e49194d341c87f3b65c5a2966e1b + + QAction * + insertStopperItemAct + structlsim_1_1Actions.html + a37f656ad70eabfc2cc5d7103c98909f + + + + QAction * + probeChargeItemPlaceAct + structlsim_1_1Actions.html + 37c04a54025329888d19946c61a836c4 + + + + QAction * + resetAct + structlsim_1_1Actions.html + 0e49c027b196128cbc43a43e2ac7b9c5 + + + + QAction * + fullScreenAct + structlsim_1_1Actions.html + 4220e1fa13259ad206a699b4496c7574 + + + + QAction * + centerOnProbeAct + structlsim_1_1Actions.html + 5c7e018ed5d17ffce96270d4ff144886 + + ProbeChargeWidget @@ -1824,6 +2424,18 @@ 9a5e7fd2816ae007a43df2587bcbb93c0246be3b5ff9623c764e0c268856efa8 + + StopperItemInsert + classSimulScene.html + 9a5e7fd2816ae007a43df2587bcbb93c1594d0d75b8caf9ed66dd89b08f11027 + + + + ProbeChargeItemPlace + classSimulScene.html + 9a5e7fd2816ae007a43df2587bcbb93c22afd68c85ea538351d4e62a39d3750c + + ItemType classSimulScene.html @@ -1857,6 +2469,20 @@ e586360d85b6eea44cb7def1a2b3ab8a () + + void + pauseTimer + classSimulScene.html + a8828632901d663bb20ef8059746a074 + (bool yesno) + + + void + startPauseTimer + classSimulScene.html + a6a451a00b7ec819eec9693e6b1c0165 + (bool yesno) + void deleteSelectedFieldItems @@ -1893,11 +2519,11 @@ (double theValue) - double - getMeterPerPx + void + setPxPerSec classSimulScene.html - 501a15eebf6fdb98bff8984a370c3197 - () const + 7ae2989e66498efb400c94b23422962a + (double theValue) void @@ -1906,6 +2532,83 @@ e5957131232c8d3139975f909f49b43c (bool visible=true) + + void + setTimeLineDuration + classSimulScene.html + c9c34818c18d1f04ffe230894c2ea88a + (int duration) + + + void + moveFieldItemDown + classSimulScene.html + 9c5b12df3e50d103fbd039db61af6c5b + (QGraphicsItem *fieldItem) + + + void + moveSelectedFieldItemDown + classSimulScene.html + 529ebc2a22696e9994caa10150625673 + () + + + void + moveFieldItemUp + classSimulScene.html + 4905624af24651da72476952fc165205 + (QGraphicsItem *fieldItem) + + + void + moveSelectedFieldItemUp + classSimulScene.html + 585fa004c877be6a4248265443520272 + () + + + void + moveFieldItemOnTop + classSimulScene.html + 274d9923dae1208ee7125e43c3c6319c + (QGraphicsItem *fieldItem) + + + void + moveSelectedFieldItemOnTop + classSimulScene.html + 62a26154021a78ddcc366ceccbf9df1d + () + + + void + moveFieldItemOnBottom + classSimulScene.html + 7c4a57b0511d494ef566cbdccf61b8fb + (QGraphicsItem *fieldItem) + + + void + moveSelectedFieldItemOnBottom + classSimulScene.html + 30d4b517a40e59930d40b3863b8ce365 + () + + + void + resetScene + classSimulScene.html + fc412cc5dfb37e3b8c6379e8eeda332e + () + + + void + handleTimeLineValueChange + classSimulScene.html + b30f4f36d25b832b72b7a395c27836f7 + (qreal value) + void sceneModeChanged @@ -1934,6 +2637,13 @@ e2a1abff3b5f2b7f1fdc7d97d39a7e41 (double meterPerPx) + + void + pxPerSecChanged + classSimulScene.html + 42cf432c8224899b74b27b25343d8d91 + (double pxps) + void flightPathVisibilityChanged @@ -1941,6 +2651,48 @@ 8cb739462a0a96f444f046187e3f09c3 (bool visible) + + void + timeLineDurationChanged + classSimulScene.html + 3fa509a7ba2f4c8267215390e37e7369 + (int duration) + + + void + timeLineInRunningState + classSimulScene.html + 652f3111a74745c480c2323fc9510a32 + (bool yesno=false) + + + void + realSimulTimeChanged + classSimulScene.html + 8659e0e4a5714ad9b25fb8aa9e30541b + (QString theString) + + + void + probeSpeedXChanged + classSimulScene.html + c1d2f6cea815e34ed4355069f766e78b + (QString text) + + + void + probespeedYChanged + classSimulScene.html + 9b22772bd0a4b22b4316a75700d541e8 + (QString text) + + + void + probeSpeedChanged + classSimulScene.html + 4ed010006b210da2e56f8e66903941a3 + (QString text) + SimulScene @@ -1955,6 +2707,20 @@ c6a71446effdacb37a5d29c6e329ebdd () + + qreal + getHighestZIndexFieldItems + classSimulScene.html + c996705fd4a740e831ef2737e640c847 + () + + + qreal + getLowestZIndexFieldItems + classSimulScene.html + dde367387a72a9cdec2e60a11064e796 + () + ~SimulScene @@ -1969,6 +2735,20 @@ 67924bc0b015b4f15739d6648fdcc508 () + + double + getMeterPerPx + classSimulScene.html + 501a15eebf6fdb98bff8984a370c3197 + () const + + + double + getPxPerSec + classSimulScene.html + b1e153af4058e8591b5b66078d0d8cf6 + () const + int getSteps @@ -1983,6 +2763,13 @@ a50c6c3080a5103b0c404a8eb903fdfc (QPointF point, double charge, double speedX, double speedY, char xy) + + bool + stopsHere + classSimulScene.html + a5f92e758a61ba703b336d3e25d5cd90 + (const QPointF &p1, const QPointF &p2) + QWidget * getProbeDockWidget @@ -1992,10 +2779,73 @@ bool - getFlightPathShouldBeVisible + isFlightPathVisible classSimulScene.html - c54f4ebbd92179d82efe817fe3a6060d - () const + 9f5aecad0098f4349e5f5ac56d2986b5 + () + + + int + getTimeLineDuration + classSimulScene.html + ee16d4447dbcd151ff6e0d353c361f3f + () + + + QListWidget * + getFieldListWidget + classSimulScene.html + aa8aa487d9da5c330a738c2fa0d09116 + () + + + QList< QGraphicsItem * > + getItemsInZOrder + classSimulScene.html + 48340dba317b1fdf9b631280282db95e + () + + + QList< QGraphicsItem * > + getFieldItemsInZOrder + classSimulScene.html + 9e36c1fcae78c0dee5a3bb731d80272a + () + + + GraphicsEllipseItem * + getProbeChargeItem + classSimulScene.html + 3c6cbec457a3a923c97c786e4d57634d + () + + + void + clearFlightPath + classSimulScene.html + c487c7205a4a4970cac0483ffd7b5388 + () + + + QList< QVariant > + getSaveDataList + classSimulScene.html + e60847d34c3e5a022067a6974c3836fe + () + + + void + setSaveDataList + classSimulScene.html + 01fd20b2062db0c3735af46ddeda0375 + (QList< QVariant > list) + + + void + connectNewFieldItem + classSimulScene.html + 8c3168d72895dcc535f832cef80aab3b + (FieldItem *item) void @@ -2025,6 +2875,13 @@ f506b19b6fbb7c291af65edd70c44d37 (QKeyEvent *keyEvent) + + void + drawBackground + classSimulScene.html + 9de1b791b469a664ff22c1453390096f + (QPainter *painter, const QRectF &rect) + void displayResizeRects @@ -2053,6 +2910,13 @@ f8c0c0890a28ba471bd8a43a493d1665 (QGraphicsSceneMouseEvent *mouseEvent, QGraphicsRectItem *pressedRectItem, QRectF &currRect, QPointF &newPos, qreal minWidth, qreal minHeight) + + void + setupVars + classSimulScene.html + 8cd6c4deb7a93c5fbc9d6ed92d7c5e80 + () + QTimeLine * timer @@ -2060,13 +2924,6 @@ cc0c5530431faa20ed6334ff621b7f19 - - bool - flightPathShouldBeVisible - classSimulScene.html - 47000919efbe8cd348cdaffdbd35fabe - - SceneMode myMode @@ -2095,6 +2952,13 @@ 31eca12990de4da6232736388bdb2f58 + + double + pxPerSec + classSimulScene.html + daa5297e33069fdf90111cf7963e76c2 + + HomoEFieldItem * currHomoEfieldInsertItem @@ -2123,6 +2987,27 @@ 83ea5fb292382dcb28e4379f37bcc72c + + StopperItem * + currStopperInsertItem + classSimulScene.html + ca72ab0aa04eb5dd284f85f03cefe177 + + + + StopperItem * + currStopperEditItem + classSimulScene.html + 2672aa4033880b893ff7947a0606e059 + + + + bool + ChargePlacementInProgress + classSimulScene.html + 94a310aca20a534797f823d05fa7179f + + QGraphicsItem * pressedResizeItem @@ -2151,6 +3036,20 @@ fad34d48dea97fe1050a503fa07c2c97 + + QListWidget * + fieldListWidget + classSimulScene.html + 6d8b21dd5e4b0c2ac5c0cf1b1120c3f4 + + + + QMap< double, int > + aniStepList + classSimulScene.html + ac27e601e401e73e08cbf673b27d99e7 + + resizeRects reRects @@ -2158,6 +3057,41 @@ 9e03c217dc3c5d14774ca1b8a407780e + + QList< HomoEFieldItem * > + calcEFieldList + classSimulScene.html + 223b6e574b288b0b414de3a4038046be + + + + QList< HomoBFieldItem * > + calcBFieldList + classSimulScene.html + 88f5e123d1ce0a091cce3291550139da + + + + QList< StopperItem * > + calcStopperList + classSimulScene.html + 5ad96baeaa6f331c3168144373e50eaa + + + + static const qreal + FieldDefaultZValue + classSimulScene.html + 0463f6e25016b5ca2d48e8821e10eca6 + + + + static const qreal + FieldZStep + classSimulScene.html + 170a7d2e2d5c4ed41890fb25a7246d99 + + SimulScene::resizeRects @@ -2220,4 +3154,150 @@ + + StopperItem + classStopperItem.html + FieldItem + + Type + classStopperItem.html + ebb1f3d059cbcc5f26a52a652ec165ac432b89efb0b39fd59965927481861afe + + + + MinimumWidth + classStopperItem.html + ee4631f6c5da7f3500a82eadcfd7facf5c3715a926b1547a4c337b20d8df254f + + + + Height + classStopperItem.html + 5ad70daea127052f7a2cb2f000abe39f827b3aa73e2e0f7c2c9288fb9c838d11 + + + + void + setOuterPenWidth + classStopperItem.html + 5153fdfab2377406c23445430aa06566 + (double theValue) + + + + StopperItem + classStopperItem.html + 661b0adffd3312f94045c8efe4b60e3f + (QPointF start, QPointF end) + + + virtual QRectF + boundingRect + classStopperItem.html + e942c8aea5ab0f6e45b149560ca1d411 + () const + + + virtual void + paint + classStopperItem.html + 072b112c3c0caf07049ee68cbb547ad5 + (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) + + + int + type + classStopperItem.html + 3e571ac37bb91908ba85b64e30388876 + () const + + + QWidget * + getDockWidget + classStopperItem.html + bdac52d66f60fd4d0ff513f321f7a6ca + () const + + + void + setLine + classStopperItem.html + d36f855b58735b8b19beb2c6355bd65a + (QLineF line) + + + + ~StopperItem + classStopperItem.html + dd2867f488e9d317c9c0102cea3c14a8 + () + + + double + getOuterPenWidth + classStopperItem.html + 9a7c51dde7a742a4a7f0f66c35a21a42 + () const + + + QList< QVariant > + getSaveDataList + classStopperItem.html + 1cc65a698b9fd39a5c1cad6fad4a75be + () + + + void + setSaveDataList + classStopperItem.html + e8c1a4fb80ab690a674edc49eaf4cf14 + (QList< QVariant > list) + + + double + outerPenWidth + classStopperItem.html + d34a59d820c6d5bdd91678a444301243 + + + + StopperWidget * + stopperWidget + classStopperItem.html + cb64c92317472b7b5e196d1eb79ab3c8 + + + + + StopperWidget + classStopperWidget.html + + + StopperWidget + classStopperWidget.html + e02a386a2252d250ddff9fcd6e1fe815 + (QWidget *parent, Qt::WindowFlags f, StopperItem *stopperI) + + + virtual + ~StopperWidget + classStopperWidget.html + 68d2d9ff214e2150a16d1366c4d3d4c8 + () + + + void + createWidget + classStopperWidget.html + a7b0bedb8a575a20c9b346f1823080ad + () + + + StopperItem * + stopperItem + classStopperWidget.html + 260a3db23108078db132598f278ece99 + + + diff --git a/src/constants.h b/src/constants.h index dc92100..e2958ff 100644 --- a/src/constants.h +++ b/src/constants.h @@ -27,4 +27,4 @@ const double PI = acos( -1.0 ); const double SPEED_OF_LIGHT = 299792458.0; const qint32 FILEVERSION=1; -const qint32 FILEMAGIC=52224242425254; +const qint32 FILEMAGIC=522245254; diff --git a/src/fielditem.cpp b/src/fielditem.cpp index 184affc..a6ddd27 100644 --- a/src/fielditem.cpp +++ b/src/fielditem.cpp @@ -133,7 +133,7 @@ void FieldItem::wheelEvent(QGraphicsSceneWheelEvent * event) { setRotation(getRotation()+( (event->delta()/abs(event->delta()))) ); } else if (event->modifiers() == Qt::ControlModifier) { - setRotation(getRotation()+( (event->delta()/abs(event->delta()))*5 )); + setRotation(getRotation()+( (event->delta()/abs(event->delta()))*6 )); } } void FieldItem::contextMenuEvent ( QGraphicsSceneContextMenuEvent * event ){ @@ -163,4 +163,4 @@ void FieldItem::deleteMe() { void FieldItem::toggleSelection() { setSelected(!isSelected()); -} \ No newline at end of file +} diff --git a/src/homobfielditem.cpp b/src/homobfielditem.cpp index e6921b7..e16b7d4 100644 --- a/src/homobfielditem.cpp +++ b/src/homobfielditem.cpp @@ -27,7 +27,7 @@ HomoBFieldItem::HomoBFieldItem(QRectF sizeRect): FieldItem() { setRectF(sizeRect); - setFieldLineDistance(10); + setFieldLineDistance(15); setFlag(ItemIsMovable); setFlag(ItemIsSelectable); setFlag(ItemIsFocusable); @@ -43,7 +43,7 @@ HomoBFieldItem::~HomoBFieldItem() { QList HomoBFieldItem::getSaveDataList() { QList list; list << type(); - list << scenePos(); + list << pos(); list << getRectF(); list << zValue(); list << getIsDirectionIntoPlane(); diff --git a/src/homoefielditem.cpp b/src/homoefielditem.cpp index 4e8e9f6..66e77fb 100644 --- a/src/homoefielditem.cpp +++ b/src/homoefielditem.cpp @@ -30,7 +30,7 @@ HomoEFieldItem::HomoEFieldItem(QRectF sizeRect) setRectF(sizeRect); dockWidget = new HomoEFieldWidget(0,0,this); setFieldPower(10); - setFieldLineDistance(12); + setFieldLineDistance(14); setFlag(ItemIsMovable); setFlag(ItemIsSelectable); setFlag(ItemIsFocusable); @@ -48,7 +48,7 @@ HomoEFieldItem::HomoEFieldItem(QRectF sizeRect) QList HomoEFieldItem::getSaveDataList() { QList list; list << type(); - list << scenePos(); + list << pos(); list << getRectF(); list << zValue(); list << getRotation(); diff --git a/src/lsim.cpp b/src/lsim.cpp index b3dde61..6faeee1 100644 --- a/src/lsim.cpp +++ b/src/lsim.cpp @@ -58,6 +58,7 @@ lsim::lsim() { void lsim::saveFileAs() { clearAnyFocus(); + simulscene->stopTimer(); QFile file(QFileDialog::getSaveFileName(this, tr("Speichern unter..."), QString(), tr("lsim Dateien (*.lsm);;Alle Dateien (*)"))); if (file.fileName() == "") return; //wenn keine datei gewaehlt @@ -128,41 +129,16 @@ void lsim::openFile() { in >> fieldItemSaveList; FieldItem* currItem; if (fieldItemSaveList.first() == HomoEFieldItem::Type) { - HomoEFieldItem* currHomoEfieldInsertItem = new HomoEFieldItem(QRectF(0,0,0,0)); - //die resize items aus und einblenden bei rotation - connect( currHomoEfieldInsertItem, SIGNAL(rotationChanged()), simulscene, SLOT(displayResizeRects())); - //bei groesenanderung und verschieben resizerects mitverschieben - connect( currHomoEfieldInsertItem, SIGNAL(heightChanged(double)), simulscene, SLOT(moveResizeRects())); - connect( currHomoEfieldInsertItem, SIGNAL(widthChanged(double)), simulscene, SLOT(moveResizeRects())); - connect( currHomoEfieldInsertItem, SIGNAL(ScenePosChanged(QPointF)), simulscene, SLOT(moveResizeRects())); - //item ueber sceneChange informieren - connect(simulscene,SIGNAL(changed(QList)),currHomoEfieldInsertItem,SLOT(handleSceneChange(QList))); - currItem = currHomoEfieldInsertItem; + currItem = new HomoEFieldItem(QRectF(0,0,0,0)); } else if (fieldItemSaveList.first() == HomoBFieldItem::Type) { - HomoBFieldItem* currHomoBfieldInsertItem = new HomoBFieldItem(QRectF(0,0,0,0)); - //die resize items aus und einblenden bei rotation - connect( currHomoBfieldInsertItem, SIGNAL(rotationChanged()), simulscene, SLOT(displayResizeRects())); - //bei groesenanderung und verschieben resizerects mitverschieben - connect( currHomoBfieldInsertItem, SIGNAL(heightChanged(double)), simulscene, SLOT(moveResizeRects())); - connect( currHomoBfieldInsertItem, SIGNAL(widthChanged(double)), simulscene, SLOT(moveResizeRects())); - connect( currHomoBfieldInsertItem, SIGNAL(ScenePosChanged(QPointF)), simulscene, SLOT(moveResizeRects())); - //item ueber sceneChange informieren - connect(simulscene,SIGNAL(changed(QList)),currHomoBfieldInsertItem,SLOT(handleSceneChange(QList))); - currItem = currHomoBfieldInsertItem; + currItem = new HomoBFieldItem(QRectF(0,0,0,0)); } else if (fieldItemSaveList.first() == StopperItem::Type) { - StopperItem* currStopperInsertItem = new StopperItem(QPointF(0,0),QPointF(0,0)); - //die resize items aus und einblenden bei rotation - connect( currStopperInsertItem, SIGNAL(rotationChanged()), simulscene, SLOT(displayResizeRects())); - //bei groesenanderung und verschieben resizerects mitverschieben - connect( currStopperInsertItem, SIGNAL(heightChanged(double)), simulscene, SLOT(moveResizeRects())); - connect( currStopperInsertItem, SIGNAL(widthChanged(double)), simulscene, SLOT(moveResizeRects())); - connect( currStopperInsertItem, SIGNAL(ScenePosChanged(QPointF)), simulscene, SLOT(moveResizeRects())); - //item ueber sceneChange informieren - connect(simulscene,SIGNAL(changed(QList)),currStopperInsertItem,SLOT(handleSceneChange(QList))); - currItem = currStopperInsertItem; + currItem = new StopperItem(QPointF(0,0),QPointF(0,0)); } else { continue; } + + simulscene->connectNewFieldItem(currItem); simulscene->addItem(currItem); currItem->setSaveDataList(fieldItemSaveList); } @@ -171,8 +147,8 @@ void lsim::openFile() { } void lsim::displayOpenFailedBox() { - QMessageBox::warning ( this, tr("\326ffnen. Fehlgeschlagen"), - tr("Die Datei konnte leider nicht ge\366fnet werden")); + QMessageBox::warning ( this, tr("\326ffnen Fehlgeschlagen"), + tr("Die Datei konnte leider nicht ge\366ffnet werden")); } void lsim::closeEvent (QCloseEvent *event) { @@ -911,4 +887,4 @@ void lsim::goToFullscreen(bool yesno) { setWindowState(windowState() ^ Qt::WindowFullScreen); //qDebug()<< (windowState() == Qt::WindowFullScreen); emit fullScreenModeChanged(windowState() == Qt::WindowFullScreen); -} \ No newline at end of file +} diff --git a/src/simulscene.cpp b/src/simulscene.cpp index 1548fb5..d0ad8cf 100644 --- a/src/simulscene.cpp +++ b/src/simulscene.cpp @@ -394,15 +394,7 @@ void SimulScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) { //das neue item auswaehlen clearSelection(); currHomoEfieldInsertItem->setSelected(true); - - //die resize items aus und einblenden bei rotation - connect( currHomoEfieldInsertItem, SIGNAL(rotationChanged()), this, SLOT(displayResizeRects())); - //bei groesenanderung und verschieben resizerects mitverschieben - connect( currHomoEfieldInsertItem, SIGNAL(heightChanged(double)), this, SLOT(moveResizeRects())); - connect( currHomoEfieldInsertItem, SIGNAL(widthChanged(double)), this, SLOT(moveResizeRects())); - connect( currHomoEfieldInsertItem, SIGNAL(ScenePosChanged(QPointF)), this, SLOT(moveResizeRects())); - //item ueber sceneChange informieren - connect(this,SIGNAL(changed(QList)),currHomoEfieldInsertItem,SLOT(handleSceneChange(QList))); + connectNewFieldItem(currHomoEfieldInsertItem); } update(); //moegliche darstellungsprobleme beseitigen @@ -431,15 +423,7 @@ void SimulScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) { //das neue item auswaehlen clearSelection(); currHomoBfieldInsertItem->setSelected(true); - - //die resize items aus und einblenden bei rotation - connect( currHomoBfieldInsertItem, SIGNAL(rotationChanged()), this, SLOT(displayResizeRects())); - //bei groesenanderung und verschieben resizerects mitverschieben - connect( currHomoBfieldInsertItem, SIGNAL(heightChanged(double)), this, SLOT(moveResizeRects())); - connect( currHomoBfieldInsertItem, SIGNAL(widthChanged(double)), this, SLOT(moveResizeRects())); - connect( currHomoBfieldInsertItem, SIGNAL(ScenePosChanged(QPointF)), this, SLOT(moveResizeRects())); - //item ueber sceneChange informieren - connect(this,SIGNAL(changed(QList)),currHomoBfieldInsertItem,SLOT(handleSceneChange(QList))); + connectNewFieldItem(currHomoBfieldInsertItem); } update(); //moegliche darstellungsprobleme beseitigen QApplication::restoreOverrideCursor(); @@ -466,15 +450,7 @@ void SimulScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) { //das neue item auswaehlen clearSelection(); currStopperInsertItem->setSelected(true); - - //die resize items aus und einblenden bei rotation - connect( currStopperInsertItem, SIGNAL(rotationChanged()), this, SLOT(displayResizeRects())); - //bei groesenanderung und verschieben resizerects mitverschieben - connect( currStopperInsertItem, SIGNAL(heightChanged(double)), this, SLOT(moveResizeRects())); - connect( currStopperInsertItem, SIGNAL(widthChanged(double)), this, SLOT(moveResizeRects())); - connect( currStopperInsertItem, SIGNAL(ScenePosChanged(QPointF)), this, SLOT(moveResizeRects())); - //item ueber sceneChange informieren - connect(this,SIGNAL(changed(QList)),currStopperInsertItem,SLOT(handleSceneChange(QList))); + connectNewFieldItem(currStopperInsertItem); } update(); //moegliche darstellungsprobleme beseitigen QApplication::restoreOverrideCursor(); @@ -506,6 +482,17 @@ void SimulScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *mouseEvent) { QGraphicsScene::mouseReleaseEvent(mouseEvent); } +void SimulScene::connectNewFieldItem(FieldItem* item) { + //die resize items aus und einblenden bei rotation + connect( item, SIGNAL(rotationChanged()), this, SLOT(displayResizeRects())); + //bei groesenanderung und verschieben resizerects mitverschieben + connect( item, SIGNAL(heightChanged(double)), this, SLOT(moveResizeRects())); + connect( item, SIGNAL(widthChanged(double)), this, SLOT(moveResizeRects())); + connect( item, SIGNAL(ScenePosChanged(QPointF)), this, SLOT(moveResizeRects())); + //item ueber sceneChange informieren + connect(this,SIGNAL(changed(QList)),item,SLOT(handleSceneChange(QList))); +} + void SimulScene::keyPressEvent (QKeyEvent *keyevent) { if(keyevent->matches(QKeySequence::Delete)) { deleteSelectedFieldItems(); @@ -1154,4 +1141,4 @@ void SimulScene::resetScene() { setupVars(); ellipse1->resetProbe(); -} \ No newline at end of file +} diff --git a/src/simulscene.h b/src/simulscene.h index ee6be5a..e033e81 100644 --- a/src/simulscene.h +++ b/src/simulscene.h @@ -86,6 +86,7 @@ class SimulScene : public QGraphicsScene { QList getSaveDataList(); void setSaveDataList(QList list); + void connectNewFieldItem(FieldItem* item); public slots: void setSceneMode(SceneMode mode); diff --git a/src/stopperitem.cpp b/src/stopperitem.cpp index 6e326a3..eb1501c 100644 --- a/src/stopperitem.cpp +++ b/src/stopperitem.cpp @@ -38,7 +38,7 @@ StopperItem::StopperItem(QPointF start, QPointF end): FieldItem() { QList StopperItem::getSaveDataList() { QList list; list << type(); - list << scenePos(); + list << pos(); list << getRectF(); list << zValue(); list << getRotation();