Plot2d_SetupCurvesDlg is added

Dialog contains table with parameters of curves and \93-\94 button for removing curves.

Table columns:

\93Fig\94 \96 read-only column for preview of marker. It depends on values of \93Marker\94 and \93Color\94 columns. If values of this columns are changed then preview of marker is updated accordingly.

\93Text\94 \96 column for changing name of legend

\93Marker\94 - column for changing type of marker

\93Color\94 \96 column for changing color of curve and curve\92s marker

\93Nb markers\94 \96 column for changing number of marker\92s 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.

diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx
index 1fdf78431df0be57fd216580e09897533ce5debf..243e99fbf040bf730ed7fc39b3769b86156a5df2 100755 (executable)
--- 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 aa1d4dd6227c77d6de0f4fb51b634e36a0f5ee2b..ada204de0e164d5692c33ce3f15429700ebeb1b1 100755 (executable)
--- 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<int, QtxAction*> ActionsMap;
   ActionsMap        myActionsMap;