#include <HYDROGUI_SplitPolylinesDlg.h>
#include <HYDROGUI_ObjComboBox.h>
#include <HYDROGUI_ObjListBox.h>
-#include <HYDROGUI_Tool.h>
+#include <HYDROGUI_Tool2.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewWindow.h>
#include <OCCViewer_ViewPort3d.h>
aLayout->setSpacing( 5 );
myTab = new QTabWidget( aFrame );
- aLayout->addWidget( myTab, 0, 0 );
+ aLayout->addWidget( myTab, 1, 0, 1, 2 );
QFrame* aPointPage = new QFrame();
myMainPolyline1 = new HYDROGUI_ObjComboBox( theModule, tr( "POLYLINE" ), KIND_POLYLINEXY, aPointPage );
switch( GetMode() )
{
case ByPoint:
- return Handle( HYDROData_PolylineXY )::DownCast( myMainPolyline1->GetObject() );
+ if( !myMainPolyline1->GetObject().IsNull() )
+ return Handle( HYDROData_PolylineXY )::DownCast( myMainPolyline1->GetObject() );
case ByTool:
- return Handle( HYDROData_PolylineXY )::DownCast( myMainPolyline2->GetObject() );
+ if( !myMainPolyline2->GetObject().IsNull() )
+ return Handle( HYDROData_PolylineXY )::DownCast( myMainPolyline2->GetObject() );
default:
return Handle( HYDROData_PolylineXY )();
}
+ return Handle( HYDROData_PolylineXY )();
}
Handle( HYDROData_PolylineXY ) HYDROGUI_SplitPolylinesDlg::GetToolPolyline() const
{
myMainPolyline1->reset();
myMainPolyline2->reset();
+ myToolPolyline->reset();
myPolylines->reset();
Handle( HYDROData_Entity ) anObject = HYDROGUI_Tool::GetSelectedObject( module() );