From d78ce049009b1cf75afacd0211da9ebf6407f1be Mon Sep 17 00:00:00 2001 From: sln Date: Thu, 22 Mar 2007 12:34:19 +0000 Subject: [PATCH] Plot2d_SetupCurvesDlg is added MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Dialog contains table with parameters of curves and “-” button for removing curves. Table columns: “Fig” – read-only column for preview of marker. It depends on values of “Marker” and “Color” columns. If values of this columns are changed then preview of marker is updated accordingly. “Text” – column for changing name of legend “Marker” - column for changing type of marker “Color” – column for changing color of curve and curve’s marker “Nb markers” – column for changing number of marker’s for steps. If number of markers is equal to 1 then markers are displayed for steps only. If number of markers is equal to 3 (for example) then markers are displayed for steps and two markers are displayed between side by side steps. --- src/Plot2d/Plot2d_ViewWindow.cxx | 10 ++++++++++ src/Plot2d/Plot2d_ViewWindow.h | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx index 1fdf78431..243e99fbf 100755 --- a/src/Plot2d/Plot2d_ViewWindow.cxx +++ b/src/Plot2d/Plot2d_ViewWindow.cxx @@ -107,6 +107,7 @@ void Plot2d_ViewWindow::contextMenuPopup( QPopupMenu* thePopup ) myActionsMap[ LegendId ]->addTo(thePopup); // settings myActionsMap[ CurvSettingsId ]->addTo(thePopup); + myActionsMap[ CurvesSettingsId ]->addTo(thePopup); } /*! @@ -249,6 +250,14 @@ void Plot2d_ViewWindow::createActions() connect(aAction, SIGNAL(activated()), myViewFrame, SLOT(onSettings())); myActionsMap[ CurvSettingsId ] = aAction; + // Curves settings + aAction = new QtxAction( tr( "TOT_CURVES_SETTINGS"), + aResMgr->loadPixmap("Plot2d", tr("ICON_CURVES_SETTINGS")), + tr("MEN_CURVES_SETTINGS"), 0, this); + aAction->setStatusTip( tr( "PRP_CURVES_SETTINGS") ); + connect( aAction, SIGNAL( activated() ), myViewFrame, SLOT( onCurvesSettings() ) ); + myActionsMap[ CurvesSettingsId ] = aAction; + // Clone aAction = new QtxAction(tr("MNU_CLONE_VIEW"), aResMgr->loadPixmap( "Plot2d", tr( "ICON_PLOT2D_CLONE_VIEW" ) ), tr( "MNU_CLONE_VIEW" ), 0, this); @@ -324,6 +333,7 @@ void Plot2d_ViewWindow::createToolBar() myActionsMap[LegendId]->addTo(myToolBar); myActionsMap[CurvSettingsId]->addTo(myToolBar); + myActionsMap[CurvesSettingsId]->addTo(myToolBar); myActionsMap[CloneId]->addTo(myToolBar); onChangeLegendMode(); } diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h index aa1d4dd62..ada204de0 100755 --- a/src/Plot2d/Plot2d_ViewWindow.h +++ b/src/Plot2d/Plot2d_ViewWindow.h @@ -87,7 +87,7 @@ signals: protected: enum { DumpId, FitAllId, FitRectId, ZoomId, PanId, GlobalPanId, HorId, - VerId, LegendId, CurvPointsId, CurvLinesId, CurvSplinesId, CurvSettingsId, CloneId, + VerId, LegendId, CurvPointsId, CurvLinesId, CurvSplinesId, CurvSettingsId, CurvesSettingsId, CloneId, PModeXLinearId, PModeXLogarithmicId, PModeYLinearId, PModeYLogarithmicId }; typedef QMap ActionsMap; ActionsMap myActionsMap; -- 2.39.2