X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FwxManualPaintPanel.cpp;h=e8f8d2c523e3cf90657b437f59d052d2ad1c134d;hb=07c470d8eed4bd0b96f829c7dc9f63cc5d714869;hp=78f1d036f0ef660d83cd37d1279542b56aaa7bd0;hpb=5c6b0f79c56a52bb4b7fa4beff359ba99ae3293a;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
index 78f1d03..e8f8d2c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/wxManualPaintPanel.cpp
@@ -22,7 +22,24 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
                      _txtDistanceFill   = new wxStaticText(panel, -1, wxString(_T("  Distance fill  ")));
                      _sldDistanceFill   = new wxSlider(panel, -1, 500, 1, 500, wxDefaultPosition, wxDefaultSize, wxSL_LABELS);
                      _distancefillCtrl  = new wxTextCtrl(panel , -1,_T("500") );
-
+                     //DFCH -- BarSlices
+                     double range[2];
+                     GetScalarRange( range );
+                     int min = 0;//range[0];
+                     int max = 6000;//range[1];
+                     _mBarSlices = new mBarRange( panel, 70, 65 );
+                     _mBarSlices->SetMin( 0 );
+                     _mBarSlices->SetStart( 0 );
+                     _mBarSlices->SetOrientation( true );
+                     _mBarSlices->setActiveStateTo( true );
+                     _mBarSlices->setVisibleLabels( true );
+                     _mBarSlices->setDeviceEndMargin( 10 );
+                     _mBarSlices->setDeviceBlitStart( 10, 10 );
+                     _mBarSlices->setIfWithActualDrawed( false );
+                     _mBarSlices->setRepresentedValues( min, max );
+                     _mBarSlices->SetStart( min );
+                     _mBarSlices->SetEnd( max );
+                     //DFCH -- End BarSlices
 
 	wxString lst2D3D[2];
 	lst2D3D[0]=_T("2D");
@@ -70,6 +87,16 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
 	Connect(btnCopy->GetId()	        , wxEVT_COMMAND_BUTTON_CLICKED      , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnCopy);
 	Connect(btnUndo->GetId()	        , wxEVT_COMMAND_BUTTON_CLICKED      , (wxObjectEventFunction)(void (wxPanel::*)(wxCommandEvent&)) &wxManualPaintPanel::OnUndo);
 
+	Connect(_mBarSlices->GetId(),wxEVT_TSBAR,(wxObjectEventFunction) (wxCommandEventFunction) &wxManualPaintPanel::onBarrange );
+//			Connect(modBarRange->GetId(),98765,(wxObjectEventFunction) (wxCommandEventFunction)  &wxWidgetSliderMinMax::onActualChange_Bar );
+	Connect(_mBarSlices->GetId(),wxEVT_TSBAR_ACTUAL,(wxObjectEventFunction) (wxCommandEventFunction)  &wxManualPaintPanel::onActualChange_Bar );
+	Connect(_mBarSlices->GetId(),wxEVT_TSBAR_START,(wxObjectEventFunction) (wxCommandEventFunction)  &wxManualPaintPanel::onStartChange_Bar );
+	Connect(_mBarSlices->GetId(),wxEVT_TSBAR_END,(wxObjectEventFunction) (wxCommandEventFunction)  &wxManualPaintPanel::onEndChange_Bar );
+	Connect(_mBarSlices->GetId(),wxEVT_SELECTION_END,(wxObjectEventFunction) (wxCommandEventFunction)  &wxManualPaintPanel::onSelectionEnd );
+	Connect(_mBarSlices->GetId(),wxEVT_TSBAR_MOVED,(wxObjectEventFunction) (wxCommandEventFunction)  &wxManualPaintPanel::onMovedBar );
+
+
+
 	wxFlexGridSizer *sizer1         = new wxFlexGridSizer(1);
 
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
@@ -78,10 +105,14 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
     sizer1->Add(_rbBrushTool, 1, wxGROW );
 
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(txtGrayLevel);
+    wxFlexGridSizer *sizerGrayLevel = new wxFlexGridSizer(2);
+    sizerGrayLevel->Add(txtGrayLevel);
+    sizerGrayLevel->Add(_graylevelCtrl);
+    sizer1->Add(sizerGrayLevel, 1, wxGROW);
     sizer1->Add(_sldGrayLevel, 1, wxGROW );
-    sizer1->Add(_graylevelCtrl);
+
+    sizer1->Add( new wxStaticText( this, -1, _T( "Selected Range" ) ), 1, wxGROW );
+    sizer1->Add( _mBarSlices, 1, wxGROW );
 
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
     sizer1->Add(_rb2D3D, 1, wxGROW );
@@ -94,16 +125,17 @@ wxManualPaintPanel::wxManualPaintPanel(wxWindow * parent)
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
     sizer1->Add(_rbBrushForm, 1, wxGROW );
 
-
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(_txtToleranceFill);
+    wxFlexGridSizer *sizerTolerance = new wxFlexGridSizer(2);
+    sizerTolerance->Add(_txtToleranceFill);
+    sizerTolerance->Add(_tolerancefillCtrl);
+    sizer1->Add( sizerTolerance );
     sizer1->Add(_sldToleranceFill, 1, wxGROW );
-    sizer1->Add(_tolerancefillCtrl);
 
-    sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
-    sizer1->Add(_txtDistanceFill);
+    wxFlexGridSizer *sizerDistance = new wxFlexGridSizer(2);
+    sizerDistance->Add(_txtDistanceFill);
+    sizerDistance->Add(_distancefillCtrl);
+    sizer1->Add( sizerDistance );
     sizer1->Add(_sldDistanceFill, 1, wxGROW );
-    sizer1->Add(_distancefillCtrl);
 
 
     sizer1->Add(new wxStaticText(panel,-1,_T("  ")));
@@ -255,3 +287,39 @@ void wxManualPaintPanel::OnCopy(wxCommandEvent &event)
 void wxManualPaintPanel::OnUndo(wxCommandEvent &event)
 {
 }
+
+//--------------------------------------------------------------------------------------------------------------------------------
+// Min-Max Barrange received events
+//--------------------------------------------------------------------------------------------------------------------------------
+void wxManualPaintPanel :: onBarrange(wxCommandEvent& event)
+{
+}
+void wxManualPaintPanel :: onActualChange_Bar(wxCommandEvent& event)
+{
+	/*mbbtkSliderMinMax->bbSetOutputOutActual(modBarRange->GetActual());
+	mbbtkSliderMinMax->bbSignalOutputModification(std::string("OutActual"));*/
+}
+void wxManualPaintPanel :: onStartChange_Bar(wxCommandEvent& event)
+{
+	SetRangeMin( _mBarSlices->GetStart() );
+}
+
+void wxManualPaintPanel :: onEndChange_Bar(wxCommandEvent& event)
+{
+	SetRangeMax( _mBarSlices->GetEnd() );
+}
+
+void wxManualPaintPanel :: onSelectionEnd(wxCommandEvent& event)
+{
+}
+
+void wxManualPaintPanel :: onMovedBar(wxCommandEvent& event)
+{
+}
+ //--------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
+ //--------------------------------------------------------------------------
+ //--------------------------------------------------------------------------
+
+
+