STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 8)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation")
# Specific to GUI:
-SET(SALOME_GUI_INSTALL_PARAVIEW_LIBS lib/paraview CACHE PATH
- "Install path: SALOME GUI ParaView libraries")
SET(SALOME_GUI_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/gui" CACHE PATH
"Install path: SALOME GUI specific data")
SET(SALOME_GUI_INSTALL_RES_SCRIPTS "${SALOME_INSTALL_RES}/gui" CACHE PATH
MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME_INSTALL_SCRIPT_PYTHON)
MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES)
MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED)
-MARK_AS_ADVANCED(SALOME_GUI_INSTALL_PARAVIEW_LIBS SALOME_GUI_INSTALL_RES_DATA SALOME_GUI_INSTALL_RES_SCRIPTS SALOME_GUI_INSTALL_PLUGINS)
+MARK_AS_ADVANCED(SALOME_GUI_INSTALL_RES_DATA SALOME_GUI_INSTALL_RES_SCRIPTS SALOME_GUI_INSTALL_PLUGINS)
MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC)
# Accumulate environment variables for GUI module
SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_BINS}
${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON}
${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_PYTHON_SHARED})
-SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS}
- ${CMAKE_INSTALL_PREFIX}/${SALOME_GUI_INSTALL_PARAVIEW_LIBS})
+SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${SALOME_INSTALL_LIBS})
# Sources
# ========
def set_env( args ):
"""Add environment required for GUI module"""
- vtk_overloads_dir = os.path.join( os.getenv( "GUI_ROOT_DIR" ), "lib", "paraview" )
- dirs = re.split( ":|;", os.getenv( 'VTK_AUTOLOAD_PATH', vtk_overloads_dir ) )
- if vtk_overloads_dir not in dirs: dirs[0:0] = [vtk_overloads_dir]
- #os.environ['VTK_AUTOLOAD_PATH'] = os.pathsep.join(dirs)
- #print 'QT_PLUGIN_PATH: ', os.environ['QT_PLUGIN_PATH']
qt_plugin_dir = os.path.join( os.getenv( "QTDIR" ), "plugins" )
dirs = re.split( ":|;", os.getenv( 'QT_PLUGIN_PATH', qt_plugin_dir ) )
if qt_plugin_dir not in dirs: dirs[0:0] = [qt_plugin_dir]
dirs2 = list(set(dirs))
os.environ['QT_PLUGIN_PATH'] = os.pathsep.join(dirs2)
- #print 'QT_PLUGIN_PATH: ', os.environ['QT_PLUGIN_PATH']
- #print 'QT_QPA_PLATFORM_PLUGIN_PATH: ', os.environ['QT_QPA_PLATFORM_PLUGIN_PATH']
return
#include <Standard_Type.hxx>
#include <string.h>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( CASCatch_Failure, Standard_Transient )
+IMPLEMENT_STANDARD_RTTIEXT(CASCatch_Failure, Standard_Transient)
#ifndef NO_CXX_EXCEPTION
static Handle(CASCatch_Failure) RaisedError;
#ifndef CASCATCH_FAILURE_HXX
#define CASCATCH_FAILURE_HXX
-#include <Basics_OCCTVersion.hxx>
-
#include <Standard_Transient.hxx>
#include <Standard_DefineHandle.hxx>
-DEFINE_STANDARD_HANDLE( CASCatch_Failure, Standard_Transient )
-
#include <Standard.hxx>
/*!
Standard_EXPORT virtual void Throw() const;public:
public:
-
- OCCT_DEFINE_STANDARD_RTTIEXT(CASCatch_Failure,Standard_Transient)
+ DEFINE_STANDARD_RTTIEXT(CASCatch_Failure, Standard_Transient)
private:
/*!\var myMessage
};
+DEFINE_STANDARD_HANDLE(CASCatch_Failure, Standard_Transient)
#endif // CASCATCH_FAILURE_HXX
#ifndef DDS_H
#define DDS_H
-#include <Basics_OCCTVersion.hxx>
-
#include <TCollection_AsciiString.hxx>
-
#include <NCollection_DefineDataMap.hxx>
#define UNIT_SYSTEM_SI "SI"
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_DicGroup, MMgt_TShared)
+IMPLEMENT_STANDARD_RTTIEXT(DDS_DicGroup, Standard_Transient)
/*!
\class DDS_DicGroup
\param name group name
*/
DDS_DicGroup::DDS_DicGroup( const TCollection_AsciiString& name )
-: MMgt_TShared(),
+: Standard_Transient(),
myName( name ),
myActiveSystem( UNIT_SYSTEM_SI )
{
#include "DDS_DicItem.h"
-#include <MMgt_TShared.hxx>
+#include <Standard_Transient.hxx>
#include <TColStd_SequenceOfAsciiString.hxx>
#include <NCollection_List.hxx>
class LDOM_Element;
-DEFINE_STANDARD_HANDLE(DDS_DicGroup, MMgt_TShared)
+DEFINE_STANDARD_HANDLE(DDS_DicGroup, Standard_Transient)
-class DDS_DicGroup : public MMgt_TShared
+class DDS_DicGroup : public Standard_Transient
{
public:
Standard_EXPORT DDS_DicGroup( const TCollection_AsciiString& );
friend class DDS_Dictionary;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(DDS_DicGroup,MMgt_TShared)
+ DEFINE_STANDARD_RTTIEXT(DDS_DicGroup, Standard_Transient)
};
typedef NCollection_IndexedDataMap<TCollection_AsciiString, Handle(DDS_DicGroup)> DDS_IndexedDataMapOfDicGroups;
#include <UnitsAPI.hxx>
#include <Units_Dimensions.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_DicItem, MMgt_TShared)
+IMPLEMENT_STANDARD_RTTIEXT(DDS_DicItem, Standard_Transient)
/*!
\class DDS_DicItem
#include "DDS.h"
-#include <MMgt_TShared.hxx>
+#include <Standard_Transient.hxx>
#include <TCollection_AsciiString.hxx>
// optional : format, units,
// min value, max value, default value.
-class DDS_DicItem : public MMgt_TShared
+class DDS_DicItem : public Standard_Transient
{
public:
/*! Enum describes type of datum value */
friend class DDS_DicGroup;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(DDS_DicItem,MMgt_TShared)
+ DEFINE_STANDARD_RTTIEXT(DDS_DicItem, Standard_Transient)
};
-DEFINE_STANDARD_HANDLE(DDS_DicItem, MMgt_TShared)
+DEFINE_STANDARD_HANDLE(DDS_DicItem, Standard_Transient)
typedef NCollection_IndexedDataMap<TCollection_AsciiString, Handle(DDS_DicItem)> DDS_IndexedDataMapOfDicItems;
#include <Standard_Failure.hxx>
#include <Standard_ErrorHandler.hxx>
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_Dictionary, MMgt_TShared)
+IMPLEMENT_STANDARD_RTTIEXT(DDS_Dictionary, Standard_Transient)
Handle(DDS_Dictionary) DDS_Dictionary::myDictionary = Handle(DDS_Dictionary)();
Use Get() method instead.
*/
DDS_Dictionary::DDS_Dictionary()
-: MMgt_TShared()
+: Standard_Transient()
{
}
#include <LDOMString.hxx>
-#include <MMgt_TShared.hxx>
+#include <Standard_Transient.hxx>
class LDOM_Element;
class TCollection_AsciiString;
-DEFINE_STANDARD_HANDLE(DDS_Dictionary, MMgt_TShared)
+DEFINE_STANDARD_HANDLE(DDS_Dictionary, Standard_Transient)
-class DDS_Dictionary : public MMgt_TShared
+class DDS_Dictionary : public Standard_Transient
{
public:
Standard_EXPORT static Handle(DDS_Dictionary) Get();
static Handle(DDS_Dictionary) myDictionary;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(DDS_Dictionary,MMgt_TShared)
+ DEFINE_STANDARD_RTTIEXT(DDS_Dictionary, Standard_Transient)
};
#endif
#include "DDS_KeyWords.h"
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(DDS_KeyWords, MMgt_TShared)
+IMPLEMENT_STANDARD_RTTIEXT(DDS_KeyWords, Standard_Transient)
/*!
\class DDS_KeyWords
Use Get() method instead.
*/
DDS_KeyWords::DDS_KeyWords()
-: MMgt_TShared()
+: Standard_Transient()
{
SetKeyWord( "D_URI", "dictionary" );
#include "DDS.h"
-#include <MMgt_TShared.hxx>
+#include <Standard_Transient.hxx>
#include <NCollection_DataMap.hxx>
-DEFINE_STANDARD_HANDLE(DDS_KeyWords, MMgt_TShared)
+DEFINE_STANDARD_HANDLE(DDS_KeyWords, Standard_Transient)
class TCollection_AsciiString;
-class DDS_KeyWords : public MMgt_TShared
+class DDS_KeyWords : public Standard_Transient
{
public:
Standard_EXPORT static Handle(DDS_KeyWords) Get();
KeyWordMap myKeyWord;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(DDS_KeyWords,MMgt_TShared)
+ DEFINE_STANDARD_RTTIEXT(DDS_KeyWords, Standard_Transient)
};
#endif
# --- resources ---
# uic files / to be processed by pyuic
-SET(_pyuic_files
+SET(_pyuic_FILES
SelectVarsDialog.ui
genericdialog.ui
mytestdialog.ui
# --- scripts ---
# scripts / pyuic wrappings
-PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
+PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_FILES} TARGET_NAME _target_name_pyuic)
# scripts / static
SET(_other_SCRIPTS
selectvars.py
dockwidgets.py
)
+
SET(_bin_SCRIPTS
test_dockwidgets.py
)
${CMAKE_CURRENT_BINARY_DIR}/qtsalome.py
)
-# scripts / to install
-
-SET(_all_SCRIPTS ${_other_SCRIPTS} ${_pyuic_SCRIPTS})
-
# --- rules ---
SALOME_INSTALL_SCRIPTS("${_gen_SCRIPTS}" ${SALOME_INSTALL_PYTHON})
-SALOME_INSTALL_SCRIPTS("${_all_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/gui)
+SALOME_INSTALL_SCRIPTS("${_other_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/gui)
SALOME_INSTALL_SCRIPTS("${_bin_SCRIPTS}" ${SALOME_INSTALL_SCRIPT_DATA})
+SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/salome/gui TARGET_NAME _target_name_pyuic_py)
+# add dependency of compiled py files on uic files in order
+# to avoid races problems when compiling in parallel
+ADD_DEPENDENCIES(${_target_name_pyuic_py} ${_target_name_pyuic})
//since the 'toolbar marker' is not unique, find index of first occurrence of the
//'toolbar marker' in the array and check that next string is name of the toolbar
+void LightAppCleanUpAppResources()
+{
+ if ( LightApp_Application::_prefs_ ) {
+ delete LightApp_Application::_prefs_;
+ LightApp_Application::_prefs_ = 0;
+ }
+}
+
namespace
{
int getToolbarMarkerIndex( QByteArray input, const QStringList& aFlags ) {
savePreferences();
delete mySelMgr;
delete myScreenHelper;
+ myPrefs = 0;
}
/*!Start application.*/
resMgr->booleanValue( "3DViewer", "relative_size", vm->trihedronRelative() ));
vm->setInteractionStyle( resMgr->integerValue( "3DViewer", "navigation_mode", vm->interactionStyle() ) );
vm->setProjectionType( resMgr->integerValue( "OCCViewer", "projection_mode", vm->projectionType() ) );
- #if OCC_VERSION_LARGE > 0x06090000
vm->setStereoType( resMgr->integerValue( "OCCViewer", "stereo_type", vm->stereoType() ) );
vm->setAnaglyphFilter( resMgr->integerValue( "OCCViewer", "anaglyph_filter", vm->anaglyphFilter() ) );
vm->setStereographicFocus( resMgr->integerValue( "OCCViewer", "focus_type", vm->stereographicFocusType() ),
vm->setReverseStereo( resMgr->booleanValue( "OCCViewer", "reverse_stereo", vm->isReverseStereo() ) );
vm->setVSync( resMgr->booleanValue( "OCCViewer", "enable_vsync", vm->isVSync() ) );
vm->setQuadBufferSupport( resMgr->booleanValue( "OCCViewer", "enable_quad_buffer_support", vm->isQuadBufferSupport() ) );
- #endif
vm->setZoomingStyle( resMgr->integerValue( "3DViewer", "zooming_mode", vm->zoomingStyle() ) );
vm->enablePreselection( resMgr->booleanValue( "OCCViewer", "enable_preselection", vm->isPreselectionEnabled() ) );
vm->enableSelection( resMgr->booleanValue( "OCCViewer", "enable_selection", vm->isSelectionEnabled() ) );
{
_prefs_ = new LightApp_Preferences( resourceMgr() );
that->createPreferences( _prefs_ );
+ qAddPostRoutine( LightAppCleanUpAppResources );
}
that->myPrefs = _prefs_;
anIndicesList << 0 << 1;
pref->setItemProperty( "strings", aValuesList, occProjMode );
pref->setItemProperty( "indexes", anIndicesList, occProjMode );
-#if OCC_VERSION_LARGE > 0x06090000
+
// .... -> Stereo group
int stereoGroup = pref->addPreference( tr( "PREF_GROUP_STEREO" ), occGroup);
pref->setItemProperty( "columns", 2, stereoGroup );
// .... -> Enable quad-buffer support
pref->addPreference( tr( "PREF_ENABLE_QUAD_BUFFER_SUPPORT" ), stereoGroup,
LightApp_Preferences::Bool, "OCCViewer", "enable_quad_buffer_support" );
-#endif
+
// ... "Background" group <<start>>
int bgGroup = pref->addPreference( tr( "PREF_VIEWER_BACKGROUND" ), occGroup );
// pref->setItemProperty( "columns", 2, bgGroup );
}
}
#endif
-#if OCC_VERSION_LARGE > 0x06090000
+
#ifndef DISABLE_OCCVIEWER
if ( sec == QString( "OCCViewer" ) && param == QString( "stereo_type" ) )
{
}
}
#endif
-#endif
+
if ( sec == QString( "3DViewer" ) && param == QString( "zooming_mode" ) )
{
int mode = resMgr->integerValue( "3DViewer", "zooming_mode", 0 );
static int lastStudyId;
QStringList myUserWmTypes;
+
+ friend void LightAppCleanUpAppResources();
};
#ifdef WIN32
void LightApp_DataModel::updateWidgets()
{
LightApp_Application* app = dynamic_cast<LightApp_Application*>( module()->application() );
- if ( app )
+ if ( app && app->objectBrowser() )
app->objectBrowser()->updateTree( 0, false );
}
</message>
<message>
<source>PREF_GROUP_PY_EDITOR</source>
- <translation type="unfinished">Editor settings</translation>
+ <translation>Paramètres de l'éditeur</translation>
</message>
<message>
<source>PREF_PY_COMPLETION_MODE</source>
- <translation type="unfinished">Completion mode</translation>
+ <translation>Mode de complétion</translation>
</message>
<message>
<source>PREF_PY_NONE</source>
- <translation type="unfinished">None</translation>
+ <translation>Aucun</translation>
</message>
<message>
<source>PREF_PY_AUTO</source>
- <translation type="unfinished">Auto</translation>
+ <translation>Auto</translation>
</message>
<message>
<source>PREF_PY_MANUAL</source>
- <translation type="unfinished">Manual</translation>
+ <translation>Manuel</translation>
</message>
<message>
<source>PREF_PY_ALWAYS</source>
- <translation type="unfinished">Always</translation>
+ <translation>Toujours</translation>
</message>
<message>
<source>PREF_GROUP_PY_TAB</source>
<translation>ライン数エリアの表示</translation>
</message>
<message>
- <source>PREF_GROUP_PY_EDITOR</source>
- <translation type="unfinished">Editor settings</translation>
+ <source>PREF_GROUP_PY_EDITOR</source>
+ <translation>エディタ設定</translation>
</message>
<message>
- <source>PREF_PY_COMPLETION_MODE</source>
- <translation type="unfinished">Completion mode</translation>
+ <source>PREF_PY_COMPLETION_MODE</source>
+ <translation>完了モード</translation>
</message>
<message>
- <source>PREF_PY_NONE</source>
- <translation type="unfinished">None</translation>
+ <source>PREF_PY_NONE</source>
+ <translation>なし</translation>
</message>
<message>
- <source>PREF_PY_AUTO</source>
- <translation type="unfinished">Auto</translation>
+ <source>PREF_PY_AUTO</source>
+ <translation>自動</translation>
</message>
<message>
- <source>PREF_PY_MANUAL</source>
- <translation type="unfinished">Manual</translation>
+ <source>PREF_PY_MANUAL</source>
+ <translation>手動</translation>
</message>
<message>
- <source>PREF_PY_ALWAYS</source>
- <translation type="unfinished">Always</translation>
+ <source>PREF_PY_ALWAYS</source>
+ <translation>常に</translation>
</message>
<message>
<source>PREF_GROUP_PY_TAB</source>
#include "SALOME_AISObject.hxx"
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISObject, AIS_InteractiveObject)
+IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISObject, AIS_InteractiveObject)
SALOME_AISObject::SALOME_AISObject()
{
Standard_EXPORT virtual void setName(const Standard_CString aName) = 0;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_AISObject,AIS_InteractiveObject)
+ DEFINE_STANDARD_RTTIEXT(SALOME_AISObject, AIS_InteractiveObject)
};
DEFINE_STANDARD_HANDLE(SALOME_AISObject, AIS_InteractiveObject)
#include "SALOME_AISShape.hxx"
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISShape, ViewerData_AISShape)
+IMPLEMENT_STANDARD_RTTIEXT(SALOME_AISShape, ViewerData_AISShape)
/*!
Constructor
Standard_EXPORT virtual void highlightSubShapes(const TColStd_IndexedMapOfInteger& aIndexMap, const Standard_Boolean aHighlight ) = 0;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_AISShape,ViewerData_AISShape)
+ DEFINE_STANDARD_RTTIEXT(SALOME_AISShape, ViewerData_AISShape)
};
DEFINE_STANDARD_HANDLE(SALOME_AISShape, ViewerData_AISShape)
#include "SALOME_Filter.hxx"
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_Filter, MMgt_TShared)
+IMPLEMENT_STANDARD_RTTIEXT(SALOME_Filter, Standard_Transient)
SALOME_Filter::SALOME_Filter()
{
#ifndef SALOME_FILTER_HXX
#define SALOME_FILTER_HXX
-#include <MMgt_TShared.hxx>
#include <Standard.hxx>
+#include <Standard_Transient.hxx>
#include <Standard_DefineHandle.hxx>
#include "SALOME_InteractiveObject.hxx"
-class SALOME_Filter : public MMgt_TShared
+class SALOME_Filter : public Standard_Transient
{
public:
Standard_EXPORT SALOME_Filter();
Standard_EXPORT virtual Standard_Boolean IsOk(const Handle(SALOME_InteractiveObject)& anObj) const = 0;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_Filter,MMgt_TShared)
+ DEFINE_STANDARD_RTTIEXT(SALOME_Filter, Standard_Transient)
};
-DEFINE_STANDARD_HANDLE(SALOME_Filter, MMgt_TShared)
+DEFINE_STANDARD_HANDLE(SALOME_Filter, Standard_Transient)
#endif // SALOME_FILTER_HXX
#include "SALOME_InteractiveObject.hxx"
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_InteractiveObject, MMgt_TShared)
+IMPLEMENT_STANDARD_RTTIEXT(SALOME_InteractiveObject, Standard_Transient)
/*!
Default constructor
#ifndef SALOME_INTERACTIVEOBJECT_HXX
#define SALOME_INTERACTIVEOBJECT_HXX
-#include <MMgt_TShared.hxx>
#include <Standard.hxx>
+#include <Standard_Transient.hxx>
#include <Standard_DefineHandle.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <string>
class SALOME_InteractiveObject;
-DEFINE_STANDARD_HANDLE(SALOME_InteractiveObject, MMgt_TShared)
+DEFINE_STANDARD_HANDLE(SALOME_InteractiveObject, Standard_Transient)
-class SALOME_InteractiveObject : public MMgt_TShared
+class SALOME_InteractiveObject : public Standard_Transient
{
public:
Standard_EXPORT SALOME_InteractiveObject();
std::string myReference;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_InteractiveObject,MMgt_TShared)
+ DEFINE_STANDARD_RTTIEXT(SALOME_InteractiveObject, Standard_Transient)
};
#endif // SALOME_INTERACTIVEOBJECT_HXX
#include "SALOME_TypeFilter.hxx"
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(SALOME_TypeFilter, SALOME_Filter)
+IMPLEMENT_STANDARD_RTTIEXT(SALOME_TypeFilter, SALOME_Filter)
/*!
Constructor
Standard_CString myKind;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(SALOME_TypeFilter,SALOME_Filter)
+ DEFINE_STANDARD_RTTIEXT(SALOME_TypeFilter, SALOME_Filter)
};
DEFINE_STANDARD_HANDLE(SALOME_TypeFilter, SALOME_Filter)
#include "OCCViewer_AISSelector.h"
-#include <Basics_OCCTVersion.hxx>
-
/*!
Constructor
*/
{
myHilightColor = color;
if ( !myAISContext.IsNull() ) {
-#if OCC_VERSION_LARGE > 0x07000000
const Handle(Graphic3d_HighlightStyle)& hStyle = myAISContext->HighlightStyle();
hStyle->SetColor( myHilightColor );
-#else
- myAISContext->SetHilightColor( myHilightColor );
-#endif
}
}
{
mySelectColor = color;
if ( !myAISContext.IsNull() ) {
-#if OCC_VERSION_LARGE > 0x07000000
const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle();
sStyle->SetColor( mySelectColor );
-#else
- myAISContext->SelectionColor( mySelectColor );
-#endif
}
}
{
myAISContext = aisContext;
if ( ! myAISContext.IsNull() ) {
-#if OCC_VERSION_LARGE > 0x07000000
const Handle(Graphic3d_HighlightStyle)& hStyle = myAISContext->HighlightStyle();
const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle();
hStyle->SetColor( myHilightColor );
sStyle->SetColor( mySelectColor );
-#else
- myAISContext->SetHilightColor( myHilightColor );
- myAISContext->SelectionColor( mySelectColor );
-#endif
myAISContext->SetSubIntensityColor( Quantity_NOC_CYAN1 );
}
}
gp_Pnt aPickPoint = aFindPick.Point( 1 );
- const gp_Dir& aPlaneN = aPlanePln.Axis().Direction();
- const gp_Dir& aPlaneX = aPlanePln.XAxis().Direction();
- const gp_Dir& aPlaneY = aPlanePln.YAxis().Direction();
- const gp_Pnt& aPlaneCenter = aPlanePln.Location();
+ gp_Dir aPlaneN = aPlanePln.Axis().Direction();
+ gp_Dir aPlaneX = aPlanePln.XAxis().Direction();
+ gp_Dir aPlaneY = aPlanePln.YAxis().Direction();
+ gp_Pnt aPlaneCenter = aPlanePln.Location();
switch ( theDragOp )
{
myInteractedPlane = NULL;
myIsDraggable = false;
myIsClickable = false;
+ myViewer->getAISContext()->ClearSelected( Standard_True );
return true;
}
#include "OCCViewer_ViewManager.h"
#include "OCCViewer_ClipPlaneInteractor.h"
-#include <Basics_OCCTVersion.hxx>
-
#include <V3d_View.hxx>
#include <Geom_Plane.hxx>
#include <Prs3d_Presentation.hxx>
#include <AIS_ListOfInteractive.hxx>
#include <AIS_InteractiveObject.hxx>
#include <AIS_InteractiveContext.hxx>
-#if OCC_VERSION_LARGE > 0x06080000
- #include <Prs3d_Drawer.hxx>
-#else
- #include <AIS_Drawer.hxx>
-#endif
+#include <Prs3d_Drawer.hxx>
#include <IntAna_IntConicQuad.hxx>
#include <gp_Lin.hxx>
#include <gp_Pln.hxx>
if ( !aPrs->IsEmpty() && !aPrs->IsInfinite() ) {
isFound = true;
double xmin, ymin, zmin, xmax, ymax, zmax;
-#if OCC_VERSION_LARGE > 0x06070100
Bnd_Box aBox = aPrs->MinMaxValues();
xmin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().X();
ymin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().Y();
xmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().X();
ymax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Y();
zmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Z();
-#else
- aPrs->MinMaxValues( xmin, ymin, zmin, xmax, ymax, zmax );
-#endif
aXMin = qMin( aXMin, xmin ); aXMax = qMax( aXMax, xmax );
aYMin = qMin( aYMin, ymin ); aYMax = qMax( aYMax, ymax );
aZMin = qMin( aZMin, zmin ); aZMax = qMax( aZMax, zmax );
OCCViewer_ViewManager* aViewMgr = (OCCViewer_ViewManager*) myModel->getViewManager();
myInteractor = new OCCViewer_ClipPlaneInteractor( aViewMgr, this );
- connect( myInteractor, SIGNAL( planeClicked( const Handle(AIS_Plane)& ) ), SLOT( onPlaneClicked( const Handle(AIS_Plane)& ) ) );
- connect( myInteractor, SIGNAL( planeDragged( const Handle(AIS_Plane)& ) ), SLOT( onPlaneDragged( const Handle(AIS_Plane)& ) ) );
+ connect( myInteractor, SIGNAL( planeClicked( const Handle_AIS_Plane& ) ),
+ SLOT( onPlaneClicked( const Handle_AIS_Plane& ) ) );
+ connect( myInteractor, SIGNAL( planeDragged( const Handle_AIS_Plane& ) ),
+ SLOT( onPlaneDragged( const Handle_AIS_Plane& ) ) );
myLocalPlanes = myModel->getClipPlanes();
synchronize();
Standard_Boolean prev = aView3d->SetImmediateUpdate( Standard_False );
aView3d->SetScale( myCurrentItem.scale );
-#if OCC_VERSION_LARGE <= 0x06070100
- aView3d->SetCenter( myCurrentItem.centerX, myCurrentItem.centerY );
-#endif
aView3d->SetProj( myCurrentItem.projX, myCurrentItem.projY, myCurrentItem.projZ );
aView3d->SetTwist( myCurrentItem.twist );
aView3d->SetAt( myCurrentItem.atX, myCurrentItem.atY, myCurrentItem.atZ );
#include "QtxAction.h"
#include "QtxIntSpinBox.h"
-#include <Basics_OCCTVersion.hxx>
-
-#if OCC_VERSION_LARGE > 0x06080000
#include <Graphic3d_GraduatedTrihedron.hxx>
-#endif
#include <QCheckBox>
#include <QGroupBox>
// font support will be introduced in OCC-6.4)
int aGap = 20;
-#if OCC_VERSION_LARGE > 0x06080000
Graphic3d_GraduatedTrihedron gt;
// main params
gt.SetDrawGrid(Standard_True); // to draw grid
}
// draw trihedron
theView->GraduatedTrihedronDisplay(gt);
-#else
- theView->GraduatedTrihedronDisplay(
- anAxisData[0].Name.toLatin1().constData(),
- anAxisData[1].Name.toLatin1().constData(),
- anAxisData[2].Name.toLatin1().constData(),
- anAxisData[0].DrawName,
- anAxisData[1].DrawName,
- anAxisData[2].DrawName,
- anAxisData[0].DrawValues,
- anAxisData[1].DrawValues,
- anAxisData[2].DrawValues,
- Standard_True, // draw grid
- Standard_False, // draw axes
- anAxisData[0].NbValues - 1,
- anAxisData[1].NbValues - 1,
- anAxisData[2].NbValues - 1,
- anAxisData[0].Offset,
- anAxisData[1].Offset,
- anAxisData[2].Offset,
- anAxisData[0].Offset + aGap, // see above
- anAxisData[1].Offset + aGap, // see above
- anAxisData[2].Offset + aGap, // see above
- anAxisData[0].DrawTickmarks,
- anAxisData[1].DrawTickmarks,
- anAxisData[2].DrawTickmarks,
- anAxisData[0].TickmarkLength,
- anAxisData[1].TickmarkLength,
- anAxisData[2].TickmarkLength,
- Quantity_NOC_WHITE, // grid color
- Quantity_Color( anAxisData[0].NameColor.redF(),
- anAxisData[0].NameColor.greenF(),
- anAxisData[0].NameColor.blueF(),
- Quantity_TOC_RGB ),
- Quantity_Color( anAxisData[1].NameColor.redF(),
- anAxisData[1].NameColor.greenF(),
- anAxisData[1].NameColor.blueF(),
- Quantity_TOC_RGB ),
- Quantity_Color( anAxisData[2].NameColor.redF(),
- anAxisData[2].NameColor.greenF(),
- anAxisData[2].NameColor.blueF(),
- Quantity_TOC_RGB ),
- Quantity_Color( anAxisData[0].Color.redF(),
- anAxisData[0].Color.greenF(),
- anAxisData[0].Color.blueF(),
- Quantity_TOC_RGB ),
- Quantity_Color( anAxisData[1].Color.redF(),
- anAxisData[1].Color.greenF(),
- anAxisData[1].Color.blueF(),
- Quantity_TOC_RGB ),
- Quantity_Color( anAxisData[2].Color.redF(),
- anAxisData[2].Color.greenF(),
- anAxisData[2].Color.blueF(),
- Quantity_TOC_RGB ) );
-#endif // OCC_VERSION_LARGE > 0x06080000
}
else
theView->GraduatedTrihedronErase();
onTextureChanged();
else {
Handle(Graphic3d_TextureEnv) aTexture;
-#if OCC_VERSION_LARGE > 0x07000000
setEnvTexture( aTexture );
-#else
- setEnvTexture( aTexture, V3d_TEX_ALL );
-#endif
}
}
<< Graphic3d_NOT_ENV_LINES << Graphic3d_NOT_ENV_ROAD;
aTexture = new Graphic3d_TextureEnv( aTextures.at( myEnvTextureId->currentIndex() ) );
}
-#if OCC_VERSION_LARGE > 0x07000000
setEnvTexture( aTexture );
-#else
- setEnvTexture( aTexture, V3d_TEX_ENVIRONMENT );
-#endif
}
/*!
/*!
Sets current texture environment for all view in the viewer
*/
-#if OCC_VERSION_LARGE > 0x07000000
void OCCViewer_EnvTextureDlg::setEnvTexture( Handle(Graphic3d_TextureEnv) theTexture)
-#else
-void OCCViewer_EnvTextureDlg::setEnvTexture( Handle(Graphic3d_TextureEnv) theTexture, V3d_TypeOfSurfaceDetail theMode )
-#endif
{
for ( int i = OCCViewer_ViewFrame::BOTTOM_RIGHT; i <= OCCViewer_ViewFrame::TOP_RIGHT; i++ ) {
if ( OCCViewer_ViewWindow* aViewWindow = myViewFrame->getView(i) ) {
Handle(V3d_View) aView = aViewWindow->getViewPort()->getView();
aView->SetTextureEnv( theTexture );
-#if OCC_VERSION_LARGE <= 0x07000000
- aView->SetSurfaceDetail( theMode );
-#endif
aView->Redraw();
}
}
#include "OCCViewer.h"
#include <QDialog>
#include <V3d_View.hxx>
-#include <Basics_OCCTVersion.hxx>
class OCCViewer_ViewWindow;
class OCCViewer_ViewFrame;
private:
void initParam();
-#if OCC_VERSION_LARGE > 0x07000000
void setEnvTexture( Handle(Graphic3d_TextureEnv) );
-#else
- void setEnvTexture( Handle(Graphic3d_TextureEnv), V3d_TypeOfSurfaceDetail );
-#endif
OCCViewer_ViewFrame* myViewFrame;
Handle(V3d_View) myView3d;
#define PI 3.14159265359
-OCCT_IMPLEMENT_STANDARD_RTTIEXT( OCCViewer_Trihedron, AIS_InteractiveObject )
+IMPLEMENT_STANDARD_RTTIEXT( OCCViewer_Trihedron, AIS_InteractiveObject )
/*!
* Constructor
/*!
* Sets the bounding box (MinMax values).
*/
-#if OCC_VERSION_LARGE > 0x06070100 // for OCC-6.7.2 and higher version
void OCCViewer_Trihedron::bounds( Graphic3d_BndBox4f& theMinMax ) const
{
Graphic3d_Vec4 aMinPt (-1.f, -1.f, -1.f, 1.f);
theMinMax.Add (aMinPt);
theMinMax.Add (aMaxPt);
}
-#else
-void OCCViewer_Trihedron::bounds( Graphic3d_CBounds& aMinMax ) const
-{
- Standard_Real aXMin = -1, aYMin = -1, aZMin = -1;
- Standard_Real aXMax = 1, aYMax = 1, aZMax = 1;
-
- if( aMinMax.XMin > aXMin ) aMinMax.XMin = aXMin;
- if( aMinMax.YMin > aYMin ) aMinMax.YMin = aYMin;
- if( aMinMax.ZMin > aZMin ) aMinMax.ZMin = aZMin;
- if( aMinMax.XMax < aXMax ) aMinMax.XMax = aXMax;
- if( aMinMax.YMax < aYMax ) aMinMax.YMax = aYMax;
- if( aMinMax.ZMax < aZMax ) aMinMax.ZMax = aZMax;
-}
-#endif
/*!
* Redefined method. Calculates the object presentation.
#include "OCCViewer.h"
#include <AIS_InteractiveObject.hxx>
-#include <Basics_OCCTVersion.hxx>
-#if OCC_VERSION_LARGE > 0x06070100 // for OCC-6.7.2 and higher version
- #include <Graphic3d_BndBox4f.hxx>
-#else
- #include <Graphic3d_CBounds.hxx>
-#endif
+#include <Graphic3d_BndBox4f.hxx>
#include <Standard_DefineHandle.hxx>
/*!
virtual void ComputeSelection( const Handle( SelectMgr_Selection )&,
const Standard_Integer );
-#if OCC_VERSION_LARGE > 0x06070100
virtual void bounds( Graphic3d_BndBox4f& ) const;
-#else
- virtual void bounds( Graphic3d_CBounds& ) const;
-#endif
virtual void display();
- OCCT_DEFINE_STANDARD_RTTIEXT(OCCViewer_Trihedron,AIS_InteractiveObject)
+ DEFINE_STANDARD_RTTIEXT(OCCViewer_Trihedron, AIS_InteractiveObject)
private:
unsigned int myTextList;
};
-DEFINE_STANDARD_HANDLE( OCCViewer_Trihedron, AIS_InteractiveObject )
+DEFINE_STANDARD_HANDLE(OCCViewer_Trihedron, AIS_InteractiveObject)
-#endif
+#endif // OCCVIEWER_TRIHEDRON_H
#include "QtxActionToolMgr.h"
#include "QtxMultiAction.h"
-// KERNEL includes
-#include <Basics_OCCTVersion.hxx>
-
// OCC includes
#include <V3d_View.hxx>
#include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
-#if OCC_VERSION_LARGE < 0x07000000
-#include <Visual3d_View.hxx>
-#endif
// QT includes
#include <QImage>
const uchar* aImageBytes = anImage.bits();
for ( int aLine = anImage.height() - 1; aLine >= 0; --aLine ) {
-#if OCC_VERSION_LARGE > 0x06070100
// convert pixels from ARGB to renderer-compatible RGBA
for ( int aByte = 0; aByte < anImage.width(); ++aByte ) {
Image_ColorBGRA& aPixmapBytes = aPixmap->ChangeValue<Image_ColorBGRA>(aLine, aByte);
aPixmapBytes.r() = (Standard_Byte) *aImageBytes++;
aPixmapBytes.a() = (Standard_Byte) *aImageBytes++;
}
-#else
- Image_ColorBGRA* aPixmapBytes = aPixmap->EditData<Image_ColorBGRA>().ChangeRow(aLine);
-
- // convert pixels from ARGB to renderer-compatible RGBA
- for ( int aByte = 0; aByte < anImage.width(); ++aByte ) {
- aPixmapBytes->b() = (Standard_Byte) *aImageBytes++;
- aPixmapBytes->g() = (Standard_Byte) *aImageBytes++;
- aPixmapBytes->r() = (Standard_Byte) *aImageBytes++;
- aPixmapBytes->a() = (Standard_Byte) *aImageBytes++;
- aPixmapBytes++;
- }
-#endif
}
}
return aPixmap;
aStructure->IsInfinite() || aStructure->CStructure()->IsForHighlight )
continue;
double aBounds[6];
-#if OCC_VERSION_LARGE > 0x06070100
Bnd_Box aBox = aStructure->MinMaxValues();
aBounds[0] = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().X();
aBounds[2] = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().Y();
aBounds[1] = aBox.IsVoid() ? RealLast() : aBox.CornerMax().X();
aBounds[3] = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Y();
aBounds[5] = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Z();
-#else
- aStructure->MinMaxValues( aBounds[0], aBounds[2], aBounds[4],
- aBounds[1], aBounds[3], aBounds[5] );
-#endif
if ( aBounds[0] > -DBL_MAX && aBounds[1] < DBL_MAX &&
aBounds[2] > -DBL_MAX && aBounds[3] < DBL_MAX &&
#include <V3d_Viewer.hxx>
#include <V3d_View.hxx>
-#include <Basics_OCCTVersion.hxx>
-#if OCC_VERSION_LARGE > 0x06070200 // for OCC-6.7.3 and higher version
#include <OpenGl_GraphicDriver.hxx>
-#else
-#include <Graphic3d.hxx>
-#include <Graphic3d_GraphicDriver.hxx>
-#endif
#include <Aspect_DisplayConnection.hxx>
#if defined(WIN32)
const Standard_Boolean computedMode,
const Standard_Boolean defaultComputedMode )
{
-#if OCC_VERSION_LARGE > 0x06070200 // for OCC-6.7.3 and higher version
static Handle(OpenGl_GraphicDriver) aGraphicDriver;
-#else
- static Handle(Graphic3d_GraphicDriver) aGraphicDriver;
-#endif
if (aGraphicDriver.IsNull())
{
Handle(Aspect_DisplayConnection) aDisplayConnection;
#else
aDisplayConnection = new Aspect_DisplayConnection();
#endif
-#if OCC_VERSION_LARGE > 0x06070200 // for OCC-6.7.3 and higher version
aGraphicDriver = new OpenGl_GraphicDriver(aDisplayConnection);
-#else
- aGraphicDriver = Graphic3d::InitGraphicDriver( aDisplayConnection );
-#endif
}
-#if OCC_VERSION_LARGE > 0x07010001
return new V3d_Viewer( aGraphicDriver, name, domain, viewSize, viewProjection,
Quantity_NOC_GRAY30, V3d_ZBUFFER, V3d_GOURAUD,
computedMode, defaultComputedMode );
-
-#elif OCC_VERSION_LARGE > 0x07000000
- return new V3d_Viewer( aGraphicDriver, name, domain, viewSize, viewProjection,
- Quantity_NOC_GRAY30, V3d_ZBUFFER, V3d_GOURAUD, V3d_WAIT,
- computedMode, defaultComputedMode );
-#else
- return new V3d_Viewer( aGraphicDriver, name, domain, viewSize, viewProjection,
- Quantity_NOC_GRAY30, V3d_ZBUFFER, V3d_GOURAUD, V3d_WAIT,
- computedMode, defaultComputedMode, V3d_TEX_NONE );
-#endif
}
// set environment texture parameters
aView->SetTextureEnv( aMainView->TextureEnv() );
-#if OCC_VERSION_LARGE <= 0x07000000
- aView->SetSurfaceDetail( aMainView->SurfaceDetail() );
-#endif
}
void OCCViewer_ViewFrame::splitSubViews()
#include "ViewerData_AISShape.hxx"
-#include <Basics_OCCTVersion.hxx>
-
#include "QtxActionToolMgr.h"
#include "QtxBackgroundTool.h"
#include <QDesktopWidget>
#include <AIS_Axis.hxx>
-#if OCC_VERSION_LARGE > 0x06080000
- #include <Prs3d_Drawer.hxx>
-#else
- #include <AIS_Drawer.hxx>
-#endif
+#include <Prs3d_Drawer.hxx>
#include <AIS_ListIteratorOfListOfInteractive.hxx>
#include <Graphic3d_Texture2Dmanual.hxx>
#include <V3d_DirectionalLight.hxx>
#include <V3d_AmbientLight.hxx>
-#if OCC_VERSION_MAJOR < 7
- #include <Visual3d_View.hxx>
-#endif
-
/*!
Get data for supported background modes: gradient types, identifiers and supported image formats
*/
// init selector
myAISContext = new AIS_InteractiveContext( myV3dViewer );
-#if OCC_VERSION_LARGE > 0x07010100
myAISContext->HighlightStyle(Prs3d_TypeOfHighlight_LocalSelected)->SetColor( Quantity_NOC_WHITE );
myAISContext->HighlightStyle(Prs3d_TypeOfHighlight_Selected)->SetColor( Quantity_NOC_WHITE );
-#elif OCC_VERSION_LARGE > 0x07000000
- const Handle(Graphic3d_HighlightStyle)& sStyle = myAISContext->SelectionStyle();
- sStyle->SetColor( Quantity_NOC_WHITE );
-#else
- myAISContext->SelectionColor( Quantity_NOC_WHITE );
-#endif
// display isoline on planar faces (box for ex.)
myAISContext->IsoOnPlane( true );
+
+ // create color scale
+ myColorScale = new AIS_ColorScale();
+ myColorScale->SetZLayer( Graphic3d_ZLayerId_TopOSD );
+ myColorScale->SetTransformPersistence( Graphic3d_TransformPers::FromDeprecatedParams( Graphic3d_TMF_2d, gp_Pnt(-1, -1, 0) ) );
/* create trihedron */
if ( DisplayTrihedron )
//myTrihedron->SetColor( Col );
myTrihedron->SetArrowColor( Col.Name() );
myTrihedron->SetSize(100);
-#if OCC_VERSION_LARGE > 0x06080000
- Handle(Prs3d_Drawer) drawer = myTrihedron->Attributes();
- if (drawer->HasOwnDatumAspect()) {
-#else
- Handle(AIS_Drawer) drawer = myTrihedron->Attributes();
- if (drawer->HasDatumAspect()) {
-#endif
+ Handle(Prs3d_Drawer) drawer = myTrihedron->Attributes();
+ if (drawer->HasOwnDatumAspect()) {
Handle(Prs3d_DatumAspect) daspect = drawer->DatumAspect();
daspect->FirstAxisAspect()->SetColor(Quantity_Color(1.0, 0.0, 0.0, Quantity_TOC_RGB));
daspect->SecondAxisAspect()->SetColor(Quantity_Color(0.0, 1.0, 0.0, Quantity_TOC_RGB));
OCCViewer_ViewPort3d* vp3d = view->getViewPort();
if ( vp3d )
{
-#if OCC_VERSION_LARGE <= 0x07000000
- vp3d->getView()->SetSurfaceDetail(V3d_TEX_ALL);
-#endif
// connect signal from viewport
connect(vp3d, SIGNAL(vpClosed(OCCViewer_ViewPort3d*)), this, SLOT(onViewClosed(OCCViewer_ViewPort3d*)));
connect(vp3d, SIGNAL(vpMapped(OCCViewer_ViewPort3d*)), this, SLOT(onViewMapped(OCCViewer_ViewPort3d*)));
myV3dViewer->Update();
}
+bool OCCViewer_Viewer::isColorScaleVisible() const
+{
+ return !myColorScale.IsNull() && !myAISContext.IsNull() && myAISContext->IsDisplayed( myColorScale );
+}
+
+void OCCViewer_Viewer::setColorScaleShown( const bool on )
+{
+ if ( myColorScale.IsNull() )
+ return;
+ if ( on )
+ {
+ if ( !myAISContext->IsDisplayed( myColorScale ) )
+ myAISContext->Display( myColorScale, Standard_True );
+ myAISContext->Redisplay( myColorScale, Standard_True, Standard_True );
+ }
+ else
+ {
+ if ( myAISContext->IsDisplayed( myColorScale ) )
+ myAISContext->Erase( myColorScale, Standard_True );
+ }
+}
+
/*!
Changes visibility of trihedron to opposite
*/
double aMaxSide = 0;
double Xmin = 0, Ymin = 0, Zmin = 0, Xmax = 0, Ymax = 0, Zmax = 0;
-#if OCC_VERSION_LARGE > 0x06070100
Bnd_Box aBox = view3d->View()->MinMaxValues();
Xmin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().X();
Ymin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().Y();
Xmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().X();
Ymax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Y();
Zmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Z();
-#else
- view3d->View()->MinMaxValues( Xmin, Ymin, Zmin, Xmax, Ymax, Zmax );
-#endif
if ( Xmin != RealFirst() && Ymin != RealFirst() && Zmin != RealFirst() &&
Xmax != RealLast() && Ymax != RealLast() && Zmax != RealLast() )
#include "SUIT_ViewModel.h"
#include <V3d_View.hxx>
+#include <AIS_ColorScale.hxx>
#include <AIS_Trihedron.hxx>
#include <AIS_InteractiveContext.hxx>
#include <AIS_ListOfInteractive.hxx>
Qtx::BackgroundData background(int theViewId) const;
void setBackground( int theViewId, const Qtx::BackgroundData& );
+ bool isColorScaleVisible() const;
+ virtual void setColorScaleShown( const bool );
+
//! returns true if 3d Trihedron in viewer was created
bool trihedronActivated() const { return !myTrihedron.IsNull(); }
public:
Handle(V3d_Viewer) getViewer3d() const { return myV3dViewer;}
Handle(AIS_InteractiveContext) getAISContext() const { return myAISContext; }
+ Handle(AIS_ColorScale) getColorScale() const { return myColorScale; }
Handle(AIS_Trihedron) getTrihedron() const { return myTrihedron; }
int getTopLayerId();
protected:
Handle(V3d_Viewer) myV3dViewer;
-
+ Handle(AIS_ColorScale) myColorScale;
Handle(AIS_Trihedron) myTrihedron;
Handle(AIS_InteractiveContext) myAISContext;
setBackgroundRole( QPalette::NoRole );//NoBackground );
// set focus policy to threat QContextMenuEvent from keyboard
setFocusPolicy( Qt::StrongFocus );
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0) && OCC_VERSION_LARGE < 0x07000000) || QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
setAttribute( Qt::WA_PaintOnScreen );
-#endif
setAttribute( Qt::WA_NoSystemBackground );
}
#include <QApplication>
#include <QTimer>
-#if OCC_VERSION_MAJOR < 7
- #include <Visual3d_View.hxx>
-#endif
-
-#if OCC_VERSION_LARGE > 0x06070100
#include <V3d_View.hxx>
-#else
-#include <V3d_PerspectiveView.hxx>
-#include <V3d_OrthographicView.hxx>
-#endif
-
-#if OCC_VERSION_LARGE > 0x07010000
#include <Quantity_Ratio.hxx>
-#endif
#include "utilities.h"
// VSR: 01/07/2010 commented to avoid SIGSEGV at SALOME exit
//selectVisualId();
-#if OCC_VERSION_LARGE > 0x06070100
myActiveView = new V3d_View( viewer, type );
-#else
- if ( type == V3d_ORTHOGRAPHIC ) {
- myOrthoView = new V3d_OrthographicView( viewer );
- myActiveView = myOrthoView;
- myPerspView = 0;
- } else {
- myPerspView = new V3d_PerspectiveView( viewer );
- myActiveView = myPerspView;
- }
-#endif
setDefaultParams();
refView->Up( x, y, z ); tgtView->SetUp( x, y, z );
refView->Eye( x, y, z ); tgtView->SetEye( x, y, z );
refView->Proj( x, y, z ); tgtView->SetProj( x, y, z );
-#if OCC_VERSION_LARGE <= 0x06070100
- refView->Center( x, y ); tgtView->SetCenter( x, y );
-#endif
tgtView->SetScale( refView->Scale() );
tgtView->SetTwist( refView->Twist() );
/* update */
tgtView->Update();
tgtView->SetImmediateUpdate( Standard_True );
-#if OCC_VERSION_LARGE <= 0x07000000
- tgtView->ZFitAll();
-#endif
- return true;
-}
-#if OCC_VERSION_LARGE <= 0x07000000
-/*!
- Returns Z-size of this view. [ public ]
-*/
-double OCCViewer_ViewPort3d::getZSize() const
-{
- if ( !activeView().IsNull() )
- return activeView()->ZSize();
- return 0;
+ return true;
}
-/*!
- Sets Z-size of this view ( for both orthographic and perspective ). [ public ]
-*/
-void OCCViewer_ViewPort3d::setZSize( double zsize )
-{
- myActiveView->SetZSize( zsize );
- /* if ( !myOrthoView.IsNull() )
- myOrthoView->SetZSize( zsize );
- if ( !myPerspView.IsNull() )
- myPerspView->SetZSize( zsize );*/
-}
-#endif
/*!
Get axial scale to the view
void OCCViewer_ViewPort3d::endRotation()
{
if ( !activeView().IsNull() ) {
-#if OCC_VERSION_LARGE <= 0x07000000
- activeView()->ZFitAll( 1.0 );
- activeView()->SetZSize( 0.0 );
-#endif
activeView()->Update();
emit vpTransformed( this );
}
QApplication::syncX();
#endif
if ( !myPaintersRedrawing ) {
-#if OCC_VERSION_MAJOR < 7
- QRect rc = e->rect();
- activeView()->Redraw( rc.x(), rc.y(), rc.width(), rc.height() );
-#else
activeView()->Redraw();
-#endif
}
}
OCCViewer_ViewPort::paintEvent( e );
Standard_Real margin = 0.01;
-#if OCC_VERSION_LARGE > 0x06070100
activeView()->FitAll( margin, upd );
-#if OCC_VERSION_LARGE <= 0x07000000
- if(withZ)
- activeView()->ZFitAll();
-#endif
-#else
- activeView()->FitAll( margin, withZ, upd );
- activeView()->SetZSize(0.);
-#endif
+
emit vpTransformed( this );
}
Handle(V3d_View) aView3d = getView();
Handle(V3d_View) aRefView3d = vp3d->getView();
aView3d->SetImmediateUpdate( Standard_False );
-#if OCC_VERSION_LARGE > 0x06070100
aView3d->Camera()->Copy( aRefView3d->Camera() );
-#else
- aView3d->SetViewMapping( aRefView3d->ViewMapping() );
- aView3d->SetViewOrientation( aRefView3d->ViewOrientation() );
-#endif
-#if OCC_VERSION_LARGE <= 0x07000000
- aView3d->ZFitAll();
-#endif
aView3d->SetImmediateUpdate( Standard_True );
aView3d->Update();
blockSignals( blocked );
#ifndef OCCVIEWER_VIEWPORT3D_H
#define OCCVIEWER_VIEWPORT3D_H
-#include <Basics_OCCTVersion.hxx>
-
#include "OCCViewer_ViewPort.h"
#include "Qtx.h"
// void setActive( V3d_TypeOfView );
virtual bool syncronize( const OCCViewer_ViewPort3d* );
-#if OCC_VERSION_LARGE <= 0x07000000
- double getZSize() const;
- void setZSize( double );
-#endif
-
void getAxialScale( double&, double&, double& );
virtual void onUpdate();
private:
Handle(V3d_View) myActiveView;
-#if OCC_VERSION_LARGE <= 0x06070100
- Handle(V3d_View) myOrthoView;
- Handle(V3d_View) myPerspView;
-#endif
bool myBusy;
double myScale;
bool myIsAdvancedZoomingEnabled;
#include <QtxMultiAction.h>
#include <QtxRubberBand.h>
-#include <Basics_OCCTVersion.hxx>
-
#include <QPainter>
#include <QTime>
#include <QImage>
#include <Graphic3d_MapOfStructure.hxx>
#include <Graphic3d_Structure.hxx>
#include <Graphic3d_ExportFormat.hxx>
-#if OCC_VERSION_LARGE > 0x06090000
#include <Graphic3d_StereoMode.hxx>
#include <Graphic3d_RenderingParams.hxx>
-#endif
-
-#if OCC_VERSION_MAJOR < 7
- #include <Visual3d_View.hxx>
-#endif
#include <V3d_Plane.hxx>
#include <V3d_Light.hxx>
int x1 = (int)( aEvent->x() + width()*delta/100 );
int y1 = (int)( aEvent->y() + height()*delta/100 );
myViewPort->zoom( x, y, x1, y1 );
-#if OCC_VERSION_LARGE <= 0x07000000
- myViewPort->getView()->ZFitAll();
-#endif
emit vpTransformationFinished ( ZOOMVIEW );
}
}
// the ones which lie within the screen limits
Standard_Real aScreenLimits[4] = { 0.0, 0.0, 0.0, 0.0 };
-#if OCC_VERSION_LARGE > 0x06070100
// NDC space screen limits
aScreenLimits[0] = -1.0;
aScreenLimits[1] = 1.0;
aScreenLimits[2] = -1.0;
aScreenLimits[3] = 1.0;
-#else
- aView3d->View()->ViewMapping().WindowLimit( aScreenLimits[0],
- aScreenLimits[1],
- aScreenLimits[2],
- aScreenLimits[3] );
-#endif
Standard_Integer aPointsNb = 0;
if ( aStructure->IsEmpty() || !aStructure->IsVisible() || aStructure->CStructure()->IsForHighlight )
continue;
-#if OCC_VERSION_LARGE > 0x06070100
Bnd_Box aBox = aStructure->MinMaxValues();
aXmin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().X();
aYmin = aBox.IsVoid() ? RealFirst() : aBox.CornerMin().Y();
aXmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().X();
aYmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Y();
aZmax = aBox.IsVoid() ? RealLast() : aBox.CornerMax().Z();
-#else
- aStructure->MinMaxValues( aXmin, aYmin, aZmin, aXmax, aYmax, aZmax );
-#endif
// Infinite structures are skipped
Standard_Real aLIM = ShortRealLast() - 1.0;
for ( Standard_Integer aPointIt = 0; aPointIt < 8; ++aPointIt ) {
const gp_Pnt& aBBPoint = aPoints[aPointIt];
-#if OCC_VERSION_LARGE > 0x06070100
gp_Pnt aProjected = aView3d->Camera()->Project( aBBPoint );
const Standard_Real& U = aProjected.X();
const Standard_Real& V = aProjected.Y();
-#else
- Standard_Real U = 0.0;
- Standard_Real V = 0.0;
- Standard_Real W = 0.0;
- aView3d->View()->Projects( aBBPoint.X(), aBBPoint.Y(), aBBPoint.Z(), U, V, W );
-#endif
if (U >= aScreenLimits[0]
&& U <= aScreenLimits[1]
case PANVIEW:
case ZOOMVIEW:
-#if OCC_VERSION_LARGE <= 0x07000000
- myViewPort->getView()->ZFitAll();
-#endif
resetState();
break;
aAction->setStatusTip(tr("DSC_PERSPECTIVE_MODE"));
aAction->setCheckable(true);
toolMgr()->registerAction( aAction, PerspectiveId );
-#if OCC_VERSION_LARGE > 0x06090000
+
// - stereo projection
aAction = new QtxAction(tr("MNU_STEREO_MODE"), aResMgr->loadPixmap( "OCCViewer", tr( "ICON_OCCVIEWER_STEREO" ) ),
tr( "MNU_STEREO_MODE" ), 0, this);
aAction->setCheckable(true);
toolMgr()->registerAction( aAction, StereoId );
connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onStereoType(bool)));
-#endif
+
// - add exclusive action group
QActionGroup* aProjectionGroup = new QActionGroup( this );
aProjectionGroup->addAction( toolMgr()->action( OrthographicId ) );
QtxMultiAction* aScaleAction = new QtxMultiAction( this );
aScaleAction->insertAction( toolMgr()->action( FitAllId ) );
aScaleAction->insertAction( toolMgr()->action( FitRectId ) );
-#if OCC_VERSION_LARGE > 0x06090000
aScaleAction->insertAction( toolMgr()->action( FitSelectionId ) );
-#endif
aScaleAction->insertAction( toolMgr()->action( ZoomId ) );
toolMgr()->append( aScaleAction, tid );
toolMgr()->append( OrthographicId, tid );
toolMgr()->append( PerspectiveId, tid );
-#if OCC_VERSION_LARGE > 0x06090000
toolMgr()->append( StereoId, tid );
-#endif
toolMgr()->append( ResetId, tid );
}
aCamera->SetProjectionType ( Graphic3d_Camera::Projection_Perspective );
aCamera->SetFOVy(30.0);
}
-#if OCC_VERSION_LARGE > 0x06090000
if (toolMgr()->action( StereoId )->isChecked()) {
aCamera->SetProjectionType ( Graphic3d_Camera::Projection_Stereo );
aCamera->SetFOVy(30.0);
}
-#endif
aView3d->Redraw();
onViewFitAll();
}
*/
void OCCViewer_ViewWindow::onStereoType( bool activate )
{
-#if OCC_VERSION_LARGE > 0x06090000
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
Handle(Graphic3d_Camera) aCamera = aView3d->Camera();
if ( isQuadBufferSupport() && !isOpenGlStereoSupport() && stereoType() == QuadBuffer &&
toolMgr()->action( StereoId )->isChecked() )
SUIT_MessageBox::warning( 0, tr( "WRN_WARNING" ), tr( "WRN_SUPPORT_QUAD_BUFFER" ) );
-#endif
}
/*!
setProjectionType( Orthographic );
if (toolMgr()->action( PerspectiveId )->isChecked())
setProjectionType( Perspective );
-#if OCC_VERSION_LARGE > 0x06090000
if (toolMgr()->action( StereoId )->isChecked())
setProjectionType( Stereo );
-#endif
emit vpTransformationFinished( PROJECTION );
}
{
QtxAction* anOrthographicAction = dynamic_cast<QtxAction*>( toolMgr()->action( OrthographicId ) );
QtxAction* aPerspectiveAction = dynamic_cast<QtxAction*>( toolMgr()->action( PerspectiveId ) );
-#if OCC_VERSION_LARGE > 0x06090000
QtxAction* aStereoAction = dynamic_cast<QtxAction*>( toolMgr()->action( StereoId ) );
-#endif
switch ( mode ) {
case Orthographic:
onProjectionType( anOrthographicAction );
// update action state if method is called outside
if ( mode == Orthographic && !anOrthographicAction->isChecked() ) {
anOrthographicAction->setChecked( true );
- #if OCC_VERSION_LARGE > 0x06090000
aStereoAction->setChecked( false );
- #endif
}
if ( mode == Perspective && !aPerspectiveAction->isChecked() ) {
aPerspectiveAction->setChecked( true );
- #if OCC_VERSION_LARGE > 0x06090000
aStereoAction->setChecked( false );
- #endif
}
-#if OCC_VERSION_LARGE > 0x06090000
if ( mode == Stereo ) {
aStereoAction->setChecked( true );
if ( anOrthographicAction->isEnabled() ) {
if ( !aPerspectiveAction->isEnabled() )
aPerspectiveAction->setEnabled( true );
}
-#endif
}
/*!
void OCCViewer_ViewWindow::onFitSelection()
{
emit vpTransformationStarted( FITSELECTION );
-#if OCC_VERSION_LARGE > 0x06090000
myModel->getAISContext()->FitSelected( getViewPort()->getView() );
-#endif
emit vpTransformationFinished( FITSELECTION );
}
aView3d->SetProj( anItem.projX, anItem.projY, anItem.projZ );
aView3d->SetAxialScale( anItem.scaleX, anItem.scaleY, anItem.scaleZ );
-#if OCC_VERSION_LARGE > 0x06070100
if ( anItem.centerX != 0.0 || anItem.centerY != 0.0 )
{
double anUpX = 0.0, anUpY = 0.0, anUpZ = 0.0;
aView3d->SetAt( anAt.X(), anAt.Y(), anAt.Z() );
aView3d->SetProj( anItem.projX, anItem.projY, anItem.projZ );
}
-#else
- aView3d->SetCenter( anItem.centerX, anItem.centerY );
-#endif
if ( !baseParamsOnly ) {
QImage anImage( aWidth, aHeight, QImage::Format_ARGB32 );
for ( int i = 0; i < aWidth; i++ ) {
for ( int j = 0; j < aHeight; j++ ) {
-#if OCC_VERSION_LARGE > 0x07010001
Quantity_Color pixel = aPix.PixelColor( i, j ).GetRGB();
-#else
- Quantity_Color pixel = aPix.PixelColor( i, j );
-#endif
QColor color = QColor::fromRgbF( pixel.Red(), pixel.Green(), pixel.Blue() );
anImage.setPixelColor( i, j, color );
}
{
bool res = false;
QApplication::setOverrideCursor( Qt::WaitCursor );
- if ( format != "PS" && format != "EPS")
- res = myViewPort->getView()->Dump( fileName.toStdString().c_str() );
-#if OCC_VERSION_MAJOR < 7
- Handle(Visual3d_View) a3dView = myViewPort->getView()->View();
-#else
Handle(Graphic3d_CView) a3dView = myViewPort->getView()->View();
-#endif
- if (format == "PS")
+ if (format == "PS") {
+ Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(myViewPort->getViewer()->Driver());
+ OpenGl_Caps* aCaps = &aDriver->ChangeOptions();
+ int prev = aCaps->ffpEnable;
+ aCaps->ffpEnable = 1;
res = a3dView->Export(strdup(qPrintable(fileName)), Graphic3d_EF_PostScript);
- else if (format == "EPS")
+ aCaps->ffpEnable = prev;
+ }
+ else if (format == "EPS") {
+ Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(myViewPort->getViewer()->Driver());
+ OpenGl_Caps* aCaps = &aDriver->ChangeOptions();
+ int prev = aCaps->ffpEnable;
+ aCaps->ffpEnable = 1;
res = a3dView->Export(strdup(qPrintable(fileName)), Graphic3d_EF_EnhPostScript);
+ aCaps->ffpEnable = prev;
+ }
+ else {
+ res = myViewPort->getView()->Dump( fileName.toStdString().c_str() );
+ }
QApplication::restoreOverrideCursor();
return res;
gp_Pln pln (gp_Pnt(x, y, z), gp_Dir(dx, dy, dz));
double a, b, c, d;
pln.Coefficients(a, b, c, d);
-#if OCC_VERSION_LARGE > 0x07000000
Handle(Graphic3d_SequenceOfHClipPlane) aPlanes = view->ClipPlanes();
Graphic3d_SequenceOfHClipPlane::Iterator anIter (*aPlanes);
if(aPlanes->Size() > 0 ) {
-#else
- Graphic3d_SequenceOfHClipPlane aPlanes = view->GetClipPlanes();
- Graphic3d_SequenceOfHClipPlane::Iterator anIter (aPlanes);
- if(aPlanes.Size() > 0 ) {
-#endif
Handle(Graphic3d_ClipPlane) aClipPlane = anIter.Value();
aClipPlane->SetEquation(pln);
aClipPlane->SetOn(Standard_True);
}
}
else {
-#if OCC_VERSION_LARGE > 0x07000000
Handle(Graphic3d_SequenceOfHClipPlane) aPlanes = view->ClipPlanes();
Graphic3d_SequenceOfHClipPlane::Iterator anIter (*aPlanes);
-#else
- Graphic3d_SequenceOfHClipPlane aPlanes = view->GetClipPlanes();
- Graphic3d_SequenceOfHClipPlane::Iterator anIter (aPlanes);
-#endif
for( ;anIter.More();anIter.Next() ){
Handle(Graphic3d_ClipPlane) aClipPlane = anIter.Value();
aClipPlane->SetOn(Standard_False);
{
Handle(V3d_View) view = myViewPort->getView();
bool res = false;
-#if OCC_VERSION_LARGE > 0x07000000
Handle(Graphic3d_SequenceOfHClipPlane) aPlanes = view->ClipPlanes();
Graphic3d_SequenceOfHClipPlane::Iterator anIter (*aPlanes);
-#else
- Graphic3d_SequenceOfHClipPlane aPlanes = view->GetClipPlanes();
- Graphic3d_SequenceOfHClipPlane::Iterator anIter (aPlanes);
-#endif
for( ;anIter.More();anIter.Next() ) {
Handle(Graphic3d_ClipPlane) aClipPlane = anIter.Value();
if(aClipPlane->IsOn()) {
params.isVisible= isShown;
params.size = size;
-#if OCC_VERSION_LARGE <= 0x06070100 // the property is deprecated after OCCT 6.7.1
- aView3d->Center( params.centerX, params.centerY );
-#endif
-
// graduated trihedron
bool anIsVisible = false;
OCCViewer_AxisWidget::AxisData anAxisData[3];
QStringList data;
data << QString( "scale=%1" ) .arg( params.scale, 0, 'e', 12 );
-#if OCC_VERSION_LARGE <= 0x06070100 // the property is deprecated after OCCT 6.7.1
- data << QString( "centerX=%1" ) .arg( params.centerX, 0, 'e', 12 );
- data << QString( "centerY=%1" ) .arg( params.centerY, 0, 'e', 12 );
-#endif
data << QString( "projX=%1" ) .arg( params.projX, 0, 'e', 12 );
data << QString( "projY=%1" ) .arg( params.projY, 0, 'e', 12 );
data << QString( "projZ=%1" ) .arg( params.projZ, 0, 'e', 12 );
aTexture = new Graphic3d_TextureEnv( TCollection_AsciiString( et_paramValue.toStdString().c_str() ) );
Handle(V3d_View) aView = this->getViewPort()->getView();
aView->SetTextureEnv( aTexture );
-#if OCC_VERSION_LARGE <= 0x07000000
- aView->SetSurfaceDetail( V3d_TEX_ENVIRONMENT );
-#endif
}
}
else if ( paramName == "lightSource" )
mode = Perspective;
if (aCamera->ProjectionType() == Graphic3d_Camera::Projection_Orthographic)
mode = Orthographic;
- #if OCC_VERSION_LARGE > 0x06090000
if (aCamera->ProjectionType() == Graphic3d_Camera::Projection_Stereo)
mode = Stereo;
- #endif
}
return mode;
}
{
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams();
aParams->StereoMode = (Graphic3d_StereoMode)type;
- #endif
}
}
int type = QuadBuffer;
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams();
type = (OCCViewer_ViewWindow::StereoType)aParams->StereoMode;
- #endif
}
return type;
}
{
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams();
if (type == RedCyan)
aParams->AnaglyphFilter = Graphic3d_RenderingParams::Anaglyph_RedCyan_Optimized;
aParams->AnaglyphFilter = Graphic3d_RenderingParams::Anaglyph_YellowBlue_Optimized;
if (type == GreenMagenta)
aParams->AnaglyphFilter = Graphic3d_RenderingParams::Anaglyph_GreenMagenta_Simple;
- #endif
}
}
int type = RedCyan;
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams();
if (aParams->AnaglyphFilter == Graphic3d_RenderingParams::Anaglyph_RedCyan_Optimized)
type = RedCyan;
type = YellowBlue;
if (aParams->AnaglyphFilter == Graphic3d_RenderingParams::Anaglyph_GreenMagenta_Simple)
type = GreenMagenta;
- #endif
}
return type;
}
{
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Handle(Graphic3d_Camera) aCamera = aView3d->Camera();
aCamera->SetZFocus( (Graphic3d_Camera::FocusType) type, value );
- #endif
}
}
int type = Relative;
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Handle(Graphic3d_Camera) aCamera = aView3d->Camera();
type = (OCCViewer_ViewWindow::FocusIODType)aCamera->ZFocusType();
- #endif
}
return type;
}
double value = 1.0;
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Handle(Graphic3d_Camera) aCamera = aView3d->Camera();
value = aCamera->ZFocus();
- #endif
}
return value;
}
{
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Handle(Graphic3d_Camera) aCamera = aView3d->Camera();
aCamera->SetIOD( (Graphic3d_Camera::IODType) type, value );
- #endif
}
}
int type = Relative;
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Handle(Graphic3d_Camera) aCamera = aView3d->Camera();
type = (OCCViewer_ViewWindow::FocusIODType)aCamera->GetIODType();
- #endif
}
return type;
}
double value = 0.05;
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Handle(Graphic3d_Camera) aCamera = aView3d->Camera();
value = aCamera->IOD();
- #endif
}
return value;
}
{
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams();
aParams->ToReverseStereo = reverse;
- #endif
}
}
int reverse = false;
Handle(V3d_View) aView3d = myViewPort->getView();
if ( !aView3d.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Graphic3d_RenderingParams* aParams = &aView3d->ChangeRenderingParams();
reverse = aParams->ToReverseStereo;
- #endif
}
return reverse;
}
{
Handle(AIS_InteractiveContext) anIntCont = myModel->getAISContext();
if ( !anIntCont.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(anIntCont->CurrentViewer()->Driver());
OpenGl_Caps* aCaps = &aDriver->ChangeOptions();
aCaps->swapInterval = enable;
- #endif
}
}
int enable = true;
Handle(AIS_InteractiveContext) anIntCont = myModel->getAISContext();
if ( !anIntCont.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(anIntCont->CurrentViewer()->Driver());
OpenGl_Caps* aCaps = &aDriver->ChangeOptions();
enable = aCaps->swapInterval;
- #endif
}
return enable;
}
{
Handle(AIS_InteractiveContext) anIntCont = myModel->getAISContext();
if ( !anIntCont.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(anIntCont->CurrentViewer()->Driver());
OpenGl_Caps* aCaps = &aDriver->ChangeOptions();
aCaps->contextStereo = enable;
- #endif
}
}
int enable = true;
Handle(AIS_InteractiveContext) anIntCont = myModel->getAISContext();
if ( !anIntCont.IsNull() ) {
- #if OCC_VERSION_LARGE > 0x06090000
Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast(anIntCont->CurrentViewer()->Driver());
OpenGl_Caps* aCaps = &aDriver->ChangeOptions();
enable = aCaps->contextStereo;
- #endif
}
return enable;
}
aProps.setAxialScale( anAxialScale[0], anAxialScale[1], anAxialScale[2] );
aProps.setViewUp( anUp[0], anUp[1], anUp[2] );
-#if OCC_VERSION_LARGE > 0x06070100
aSourceView->Eye( anEye[0], anEye[1], anEye[2] );
// store camera properties "as is": it is up to synchronized
aProps.setViewAngle( aSourceView->Camera()->FOVy() );
}
aProps.setMappingScale( aSourceView->Camera()->Scale() );
-#else
- Standard_Real aCameraDepth = aSourceView->Depth() + aSourceView->ZSize() * 0.5;
-
- // generate view orientation matrix for transforming OCC projection reference point
- // into a camera (eye) position.
- gp_Dir aLeftDir = gp_Dir( anUp[0], anUp[1], anUp[2] ) ^ gp_Dir( aProj[0], aProj[1], aProj[2] );
-
- gp_GTrsf aTrsf;
- aTrsf.SetValue( 1, 1, aLeftDir.X() );
- aTrsf.SetValue( 2, 1, aLeftDir.Y() );
- aTrsf.SetValue( 3, 1, aLeftDir.Z() );
-
- aTrsf.SetValue( 1, 2, anUp[0] );
- aTrsf.SetValue( 2, 2, anUp[1] );
- aTrsf.SetValue( 3, 2, anUp[2] );
-
- aTrsf.SetValue( 1, 3, aProj[0] );
- aTrsf.SetValue( 2, 3, aProj[1] );
- aTrsf.SetValue( 3, 3, aProj[2] );
-
- aTrsf.SetValue( 1, 4, anAt[0] );
- aTrsf.SetValue( 2, 4, anAt[1] );
- aTrsf.SetValue( 3, 4, anAt[2] );
-
- Graphic3d_Vertex aProjRef = aSourceView->ViewMapping().ProjectionReferencePoint();
-
- // transform to world-space coordinate system
- gp_XYZ aPosition( aProjRef.X(), aProjRef.Y(), aCameraDepth );
- aTrsf.Transforms( aPosition );
-
- // compute focal point
- double aFocalPoint[3];
-
- aFocalPoint[0] = aPosition.X() - aProj[0] * aCameraDepth;
- aFocalPoint[1] = aPosition.Y() - aProj[1] * aCameraDepth;
- aFocalPoint[2] = aPosition.Z() - aProj[2] * aCameraDepth;
-
- aProps.setFocalPoint( aFocalPoint[0], aFocalPoint[1], aFocalPoint[2] );
- aProps.setPosition( aPosition.X(), aPosition.Y(), aPosition.Z() );
-
- Standard_Real aViewScale[2];
- aSourceView->Size( aViewScale[0], aViewScale[1] );
- aProps.setMappingScale( aViewScale[1] );
-#endif
return aProps;
}
aProps.getViewUp( anUpDir[0], anUpDir[1], anUpDir[2] );
aProps.getAxialScale( anAxialScale[0], anAxialScale[1], anAxialScale[2] );
-#if OCC_VERSION_LARGE > 0x06070100
aDestView->SetAt( aFocalPoint[0], aFocalPoint[1], aFocalPoint[2] );
aDestView->SetEye( aPosition[0], aPosition[1], aPosition[2] );
aDestView->SetUp( anUpDir[0], anUpDir[1], anUpDir[2] );
aDestView->Camera()->SetScale( aProps.getMappingScale() );
-#else
- gp_Dir aProjDir( aPosition[0] - aFocalPoint[0],
- aPosition[1] - aFocalPoint[1],
- aPosition[2] - aFocalPoint[2] );
-
- // get custom view translation
- Standard_Real aTranslation[3];
- aDestView->At( aTranslation[0], aTranslation[1], aTranslation[2] );
-
- gp_Dir aLeftDir = gp_Dir( anUpDir[0], anUpDir[1], anUpDir[2] )
- ^ gp_Dir( aProjDir.X(), aProjDir.Y(), aProjDir.Z() );
-
- gp_GTrsf aTrsf;
- aTrsf.SetValue( 1, 1, aLeftDir.X() );
- aTrsf.SetValue( 2, 1, aLeftDir.Y() );
- aTrsf.SetValue( 3, 1, aLeftDir.Z() );
-
- aTrsf.SetValue( 1, 2, anUpDir[0] );
- aTrsf.SetValue( 2, 2, anUpDir[1] );
- aTrsf.SetValue( 3, 2, anUpDir[2] );
-
- aTrsf.SetValue( 1, 3, aProjDir.X() );
- aTrsf.SetValue( 2, 3, aProjDir.Y() );
- aTrsf.SetValue( 3, 3, aProjDir.Z() );
-
- aTrsf.SetValue( 1, 4, aTranslation[0] );
- aTrsf.SetValue( 2, 4, aTranslation[1] );
- aTrsf.SetValue( 3, 4, aTranslation[2] );
- aTrsf.Invert();
-
- // transform to view-space coordinate system
- gp_XYZ aProjRef( aPosition[0], aPosition[1], aPosition[2] );
- aTrsf.Transforms( aProjRef );
-
- // set view camera properties using low-level approach. this is done
- // in order to avoid interference with static variables in v3d view used
- // when rotation is in process in another view.
- Visual3d_ViewMapping aMapping = aDestView->View()->ViewMapping();
- Visual3d_ViewOrientation anOrientation = aDestView->View()->ViewOrientation();
-
- Graphic3d_Vector aMappingProj( aProjDir.X(), aProjDir.Y(), aProjDir.Z() );
- Graphic3d_Vector aMappingUp( anUpDir[0], anUpDir[1], anUpDir[2] );
-
- aMappingProj.Normalize();
- aMappingUp.Normalize();
-
- anOrientation.SetViewReferencePlane( aMappingProj );
- anOrientation.SetViewReferenceUp( aMappingUp );
-
- aDestView->SetViewMapping( aMapping );
- aDestView->SetViewOrientation( anOrientation );
-
- // set panning
- aDestView->SetCenter( aProjRef.X(), aProjRef.Y() );
-
- // set mapping scale
- double aMapScaling = aProps.getMappingScale();
- Standard_Real aWidth, aHeight;
- aDestView->Size( aWidth, aHeight );
- aDestView->SetSize ( aWidth > aHeight ? aMapScaling * (aWidth / aHeight) : aMapScaling );
-#endif
getViewPort()->setAxialScale( anAxialScale[0], anAxialScale[1], anAxialScale[2] );
-#if OCC_VERSION_LARGE <= 0x07000000
- aDestView->ZFitAll();
-#endif
aDestView->SetImmediateUpdate( Standard_True );
aDestView->Redraw();
</message>
<message>
<source>MNU_RAY_TRACING</source>
- <translation type="unfinished">Ray tracing</translation>
+ <translation>Ray tracing</translation>
</message>
<message>
<source>DSC_RAY_TRACING</source>
- <translation type="unfinished">Ray tracing</translation>
+ <translation>Ray tracing</translation>
</message>
<message>
<source>MNU_ENV_TEXTURE</source>
- <translation type="unfinished">Environment texture</translation>
+ <translation>Texture de l'environnement</translation>
</message>
<message>
<source>DSC_ENV_TEXTURE</source>
- <translation type="unfinished">Environment texture</translation>
+ <translation>Texture de l'environnement</translation>
</message>
<message>
<source>MNU_LIGHT_SOURCE</source>
- <translation type="unfinished">Light source</translation>
+ <translation>Source de lumière</translation>
</message>
<message>
<source>DSC_LIGHT_SOURCE</source>
- <translation type="unfinished">Light source</translation>
+ <translation>Source de lumière</translation>
</message>
<message>
<source>OCC_IMAGE_FILES</source>
<name>OCCViewer_RayTracingDlg</name>
<message>
<source>RAY_TRACING</source>
- <translation type="unfinished">Ray tracing</translation>
+ <translation>Ray tracing</translation>
</message>
<message>
<source>DEPTH</source>
- <translation type="unfinished">Depth</translation>
+ <translation>Profondeur</translation>
</message>
<message>
<source>SHADOW</source>
- <translation type="unfinished">Shadows rendering</translation>
+ <translation>Rendu des ombres</translation>
</message>
<message>
<source>REFLECTION</source>
- <translation type="unfinished">Specular reflections</translation>
+ <translation>Réflexions spéculaires</translation>
</message>
<message>
<source>ANTIALIASING</source>
- <translation type="unfinished">Adaptive anti-aliasing</translation>
+ <translation>Anti-crénelage adaptatif</translation>
</message>
<message>
<source>TRANSPARENT_SHADOW</source>
- <translation type="unfinished">Transparent shadow</translation>
+ <translation>Ombres transparentes</translation>
</message>
</context>
<context>
<name>OCCViewer_EnvTextureDlg</name>
<message>
<source>ENV_TEXTURE</source>
- <translation type="unfinished">Environment texture</translation>
+ <translation>Texture de l'environnement</translation>
</message>
<message>
<source>ENV_CLOUDS</source>
- <translation type="unfinished">Clouds</translation>
+ <translation>Nuages</translation>
</message>
<message>
<source>ENV_CV</source>
- <translation type="unfinished">Cv</translation>
+ <translation>Cv</translation>
</message>
<message>
<source>ENV_MEDIT</source>
- <translation type="unfinished">Medit</translation>
+ <translation>Medit</translation>
</message>
<message>
<source>ENV_PEARL</source>
- <translation type="unfinished">Pearl</translation>
+ <translation>Perle</translation>
</message>
<message>
<source>ENV_SKY1</source>
- <translation type="unfinished">Sky1</translation>
+ <translation>Ciel1</translation>
</message>
<message>
<source>ENV_SKY2</source>
- <translation type="unfinished">Sky2</translation>
+ <translation>Ciel2</translation>
</message>
<message>
<source>ENV_LINES</source>
- <translation type="unfinished">Lines</translation>
+ <translation>Lignes</translation>
</message>
<message>
<source>ENV_ROAD</source>
- <translation type="unfinished">Road</translation>
+ <translation>Route</translation>
</message>
<message>
<source>ENV_CUSTOM</source>
- <translation type="unfinished">Custom...</translation>
+ <translation>Personnalisé...</translation>
</message>
</context>
<context>
<name>OCCViewer_LightSourceDlg</name>
<message>
<source>LIGHT_SOURCE</source>
- <translation type="unfinished">Light source</translation>
+ <translation>Source de lumière</translation>
</message>
<message>
<source>TYPE</source>
- <translation type="unfinished">Type</translation>
+ <translation>Type</translation>
</message>
<message>
<source>DIRECTIONAL</source>
- <translation type="unfinished">Directional</translation>
+ <translation>Directionnel</translation>
</message>
<message>
<source>DIRECTION</source>
- <translation type="unfinished">Direction</translation>
+ <translation>Direction</translation>
</message>
<message>
<source>POSITIONAL</source>
- <translation type="unfinished">Positional</translation>
+ <translation>Positionnel</translation>
</message>
<message>
<source>POSITION</source>
- <translation type="unfinished">Position</translation>
+ <translation>Position</translation>
</message>
<message>
<source>COLOR</source>
- <translation type="unfinished">Color</translation>
+ <translation>Couleur</translation>
</message>
<message>
<source>HEADLIGHT</source>
- <translation type="unfinished">Headlight</translation>
+ <translation>Lumière frontale</translation>
</message>
<message>
<source>BUT_DEFAULT</source>
- <translation type="unfinished">Default</translation>
+ <translation>Défaut</translation>
</message>
</context>
</TS>
// Load plugins distributed with application.
pqApplicationCore::instance()->loadDistributedPlugins();
+ new pqPipelineContextMenuBehavior(this);
new pqDefaultViewBehavior(this); // shows a 3D view as soon as a server connection is made
new pqAlwaysConnectedBehavior(this); // client always connected to a server
new pqVerifyRequiredPluginBehavior(this);
//new pqQtMessageHandlerBehavior(this); // THIS ONE TO EXCLUDE !! see comment above
new pqDataTimeStepBehavior(this);
new pqSpreadSheetVisibilityBehavior(this);
- new pqPipelineContextMenuBehavior(this);
+ //new pqPipelineContextMenuBehavior(this);
new pqUndoRedoBehavior(this);
new pqAutoLoadPluginXMLBehavior(this); // auto load plugins GUI stuff
new pqPluginDockWidgetsBehavior(desk);
#include <string>
#include <list>
-#include <Basics_OCCTVersion.hxx>
+#include <Standard_DefineHandle.hxx>
class SALOME_View;
class SALOME_Displayer;
class SALOME_ListIO;
-#if OCC_VERSION_MAJOR >= 7
- class SALOME_InteractiveObject;
-#else
- class Handle_SALOME_InteractiveObject;
-#endif
+class SALOME_InteractiveObject;
/*!
\class SALOME_Prs
</message>
<message>
<source>ACT_FIND</source>
- <translation type="unfinished">Find</translation>
+ <translation>Cherche</translation>
</message>
<message>
<source>TTP_FIND</source>
- <translation type="unfinished">Find</translation>
+ <translation>Cherche</translation>
</message>
<message>
<source>DSC_FIND</source>
- <translation type="unfinished">Find text</translation>
+ <translation>Cherche le text</translation>
</message>
<message>
<source>ACT_REPLACE</source>
- <translation type="unfinished">Replace</translation>
+ <translation>Remplace</translation>
</message>
<message>
<source>TTP_REPLACE</source>
- <translation type="unfinished">Find & Replace</translation>
+ <translation>Cherche & Remplace</translation>
</message>
<message>
<source>DSC_REPLACE</source>
- <translation type="unfinished">Find and replace text</translation>
+ <translation>Cherche et remplace le texte</translation>
</message>
<message>
<source>ACT_PREFERENCES</source>
</message>
<message>
<source>ACT_FIND</source>
- <translation type="unfinished">Find</translation>
+ <translation>検索</translation>
</message>
<message>
<source>TTP_FIND</source>
- <translation type="unfinished">Find</translation>
+ <translation>検索</translation>
</message>
<message>
<source>DSC_FIND</source>
- <translation type="unfinished">Find text</translation>
+ <translation>テキストの検索</translation>
</message>
<message>
<source>ACT_REPLACE</source>
- <translation type="unfinished">Replace</translation>
+ <translation>置換</translation>
</message>
<message>
<source>TTP_REPLACE</source>
- <translation type="unfinished">Find & Replace</translation>
+ <translation>検索と置換</translation>
</message>
<message>
<source>DSC_REPLACE</source>
- <translation type="unfinished">Find and replace text</translation>
+ <translation>テキストの検索と置換</translation>
</message>
<message>
<source>ACT_PREFERENCES</source>
QStringList comps;
aStudy->components( comps );
foreach( QString comp, comps ) {
- LightApp_Displayer* d = LightApp_Displayer::FindDisplayer( anApp->moduleTitle( comp ), true );
+ LightApp_Displayer* d = LightApp_Displayer::FindDisplayer( anApp->moduleTitle( comp ), false );
if ( d ) d->EraseAll( false, false, 0 );
}
QStringList comps;
aStudy->components( comps );
foreach( QString comp, comps ) {
- LightApp_Displayer* d = LightApp_Displayer::FindDisplayer( anApp->moduleTitle( comp ), true );
+ LightApp_Displayer* d = LightApp_Displayer::FindDisplayer( anApp->moduleTitle( comp ), false );
if ( d ) d->EraseAll( false, false, 0 );
}
}
if (!viewMgr) return;
SUIT_ViewWindow* window = viewMgr->getActiveView();
if ( window ) {
- SALOME_View* view = dynamic_cast<SALOME_View*>( window->getViewManager()->getActiveView() );
+ SALOME_View* view = dynamic_cast<SALOME_View*>( window->getViewManager()->getViewModel() );
if ( view ) {
SALOME_Prs* aPrs = view->CreatePrs( myEntry.toLatin1() );
myResult = !aPrs->IsNull();
if (!viewMgr) return;
SUIT_ViewWindow* window = viewMgr->getActiveView();
if ( window ) {
- SALOME_View* view = dynamic_cast<SALOME_View*>( window->getViewManager()->getActiveView() );
+ SALOME_View* view = dynamic_cast<SALOME_View*>( window->getViewManager()->getViewModel() );
if ( view )
view->Repaint();
}
SVTK_Selector.h
SVTK_SpaceMouse.h
SVTK_Utils.h
+ SVTK_Hash.h
)
# header files / no moc processing / internal
namespace
{
int
- GetEdgeId(SALOME_Actor* theActor,
- vtkPicker* thePicker,
- int theObjId)
+ GetEdgeAndNodesId(SALOME_Actor* theActor,
+ vtkPicker* thePicker,
+ int theObjId,
+ int& theFirstNodeId,
+ int& theSecondNodeId)
{
int anEdgeId = 0;
if (vtkCell* aPickedCell = theActor->GetElemCell(theObjId)) {
if (aDist < aMinDist) {
aMinDist = aDist;
anEdgeId = -1 - i;
+ theFirstNodeId = aSelEdge->GetPointId(0);
+ theSecondNodeId = aSelEdge->GetPointId(1);
}
}
}
if(mySelectionMode != ActorSelection){
TColStd_IndexedMapOfInteger aMapIndex;
mySelector->GetIndex( getIO(), aMapIndex );
- switch( mySelectionMode ){
+ switch( mySelectionMode ) {
case NodeSelection:
myHighlightActor->GetProperty()->SetRepresentationToPoints();
myHighlightActor->MapPoints( this, aMapIndex );
break;
- case EdgeOfCellSelection:
- myHighlightActor->GetProperty()->SetRepresentationToWireframe();
- myHighlightActor->MapEdge( this, aMapIndex );
- break;
case CellSelection:
case EdgeSelection:
case FaceSelection:
myHighlightActor->GetProperty()->SetRepresentationToSurface();
myHighlightActor->MapCells( this, aMapIndex );
break;
+ case EdgeOfCellSelection:
+ SVTK_IndexedMapOfIds aMapCompositeIndex;
+ mySelector->GetCompositeIndex( getIO(), aMapCompositeIndex );
+ myHighlightActor->GetProperty()->SetRepresentationToWireframe();
+ myHighlightActor->MapEdge( this, aMapCompositeIndex );
+ break;
}
myHighlightActor->SetVisibility( GetVisibility() && theIsHighlight );
}
if ( aVtkId >= 0 && mySelector->IsValid( this, aVtkId )) {
int anObjId = GetElemObjId( aVtkId );
if ( anObjId >= 0 ) {
- int anEdgeId = GetEdgeId(this,myCellPicker.GetPointer(),anObjId);
+ int aFNId, aSNId;
+ int anEdgeId = GetEdgeAndNodesId(this,myCellPicker.GetPointer(),anObjId,aFNId,aSNId);
myIsPreselected = anEdgeId < 0;
if(myIsPreselected){
- const TColStd_IndexedMapOfInteger& aMapIndex = myPreHighlightActor->GetMapIndex();
- int anExtent = aMapIndex.Extent();
- anIsChanged |= (anExtent == 0 || anExtent == 1);
- anIsChanged |= (anExtent == 2 && (anObjId != aMapIndex(1) || anEdgeId != aMapIndex(2)));
- if(anIsChanged){
- TColStd_IndexedMapOfInteger aMapIndex;
- aMapIndex.Add( anObjId );
- aMapIndex.Add( anEdgeId );
-
+ int aFNObjId = GetNodeObjId( aFNId );
+ int aSNObjId = GetNodeObjId( aSNId );
+ const SVTK_IndexedMapOfIds& aMapIds = myPreHighlightActor->GetMapCompositeIndex();
+ int anExtent = aMapIds.Extent();
+ anIsChanged |= (anExtent == 0 || (anExtent > 0 && aMapIds(1).size() == 2 &&
+ (aFNObjId != aMapIds(1)[0] || aSNObjId != aMapIds(1)[1] ) ) );
+ if( anIsChanged ) {
+ SVTK_IndexedMapOfIds aMapIds;
+ SVTK_ListOfInteger aCompositeID;
+ aCompositeID.push_back( aFNObjId );
+ aCompositeID.push_back( aSNObjId );
+ aMapIds.Add( aCompositeID );
myPreHighlightActor->GetProperty()->SetRepresentationToWireframe();
- myPreHighlightActor->MapEdge( this, aMapIndex );
+ myPreHighlightActor->MapEdge( this, aMapIds );
}
myPreHighlightActor->SetVisibility( true );
}
else if ( !anIsShift )
mySelector->RemoveIObject( this );
}
+ break;
+ }
+ case EdgeOfCellSelection:
+ {
+ SVTK::TPickLimiter aPickLimiter( myCellAreaPicker, this );
+ if( theSelectionEvent->myIsRectangle )
+ myCellAreaPicker->Pick( x1, y1, x2, y2, aRenderer, SVTK_AreaPicker::RectangleMode );
+ else if( theSelectionEvent->myIsPolygon )
+ myCellAreaPicker->Pick( theSelectionEvent->myPolygonPoints, aRenderer, SVTK_AreaPicker::PolygonMode );
+
+ const SVTK_AreaPicker::TVectorIdsMap& aVectorIdsMap = myCellAreaPicker->GetCellIdsMap();
+ SVTK_AreaPicker::TVectorIdsMap::const_iterator aMapIter = aVectorIdsMap.find(this);
+ SVTK_IndexedMapOfIds anIndexes;
+ if(aMapIter != aVectorIdsMap.end()){
+ const SVTK_AreaPicker::TVectorIds& aVectorIds = aMapIter->second;
+ vtkIdType anEnd = aVectorIds.size();
+ for(vtkIdType anId = 0; anId < anEnd; anId++ ) {
+ int aCellId = aVectorIds[anId];
+ if ( !mySelector->IsValid( this, aCellId ) )
+ continue;
+
+ int anObjId = GetElemObjId( aCellId );
+ if( anObjId != -1 ) {
+ int aFNId, aSNId;
+ int anEdgeId = GetEdgeAndNodesId(this,myCellPicker.GetPointer(),anObjId,aFNId,aSNId);
+ if( anEdgeId < 0 ) {
+ SVTK_ListOfInteger aCompositeID;
+ aCompositeID.push_back( GetNodeObjId( aFNId ) );
+ aCompositeID.push_back( GetNodeObjId( aSNId ) );
+ anIndexes.Add( aCompositeID );
+ }
+ }
+ }
+ }
+
+ if ( hasIO() ) {
+ if( !anIndexes.IsEmpty() ) {
+ mySelector->AddOrRemoveCompositeIndex( myIO, anIndexes, anIsShift );
+ mySelector->AddIObject( this );
+ anIndexes.Clear();
+ }
+ else if ( !anIsShift )
+ mySelector->RemoveIObject( this );
+ }
}
default:
break;
if( aVtkId >= 0 && mySelector->IsValid( this, aVtkId ) ) {
int anObjId = GetElemObjId( aVtkId );
if( anObjId >= 0 ) {
- int anEdgeId = GetEdgeId(this,myCellPicker.GetPointer(),anObjId);
+ int aFNId, aSNId;
+ int anEdgeId = GetEdgeAndNodesId(this,myCellPicker.GetPointer(),anObjId,aFNId,aSNId);
if( hasIO() && anEdgeId < 0 ) {
- mySelector->AddOrRemoveIndex( myIO, anObjId, false );
- mySelector->AddOrRemoveIndex( myIO, anEdgeId, true );
- mySelector->AddIObject( this );
+ SVTK_ListOfInteger aCompositeID;
+ aCompositeID.push_back( GetNodeObjId( aFNId ) );
+ aCompositeID.push_back( GetNodeObjId( aSNId ) );
+ mySelector->AddOrRemoveCompositeIndex( myIO, aCompositeID, anIsShift );
+ mySelector->AddIObject( this );
}
}
}
return myMapIndex;
}
+
+const SVTK_IndexedMapOfIds&
+SVTK_Actor
+::GetMapCompositeIndex() const
+{
+ return myMapCompositeIndex;
+}
+
void
SVTK_Actor
::MapCells(SALOME_Actor* theMapActor,
myMapIndex = theMapIndex;
}
+void
+SVTK_Actor
+::MapEdge( SALOME_Actor* theMapActor,
+ const SVTK_IndexedMapOfIds& theMapCompositeIndex) {
+ myUnstructuredGrid->Initialize();
+ myUnstructuredGrid->Allocate();
+
+ vtkUnstructuredGrid * aSourceGrid = ( vtkUnstructuredGrid * )theMapActor->GetInput();
+ GetSource()->SetPoints( aSourceGrid->GetPoints() );
+
+ int aNbOfParts = theMapCompositeIndex.Extent();
+ for(int ind = 1; ind <= aNbOfParts; ind++){
+ std::vector<int> aNodesIds = theMapCompositeIndex( ind );
+ vtkSmartPointer<vtkIdList> ids = vtkSmartPointer<vtkIdList>::New();
+ ids->InsertNextId(theMapActor->GetNodeVtkId( aNodesIds[0] ) );
+ ids->InsertNextId(theMapActor->GetNodeVtkId( aNodesIds[1] ) );
+ myUnstructuredGrid->InsertNextCell(VTK_LINE,ids);
+ }
+
+ UnShrink();
+ if(theMapActor->IsShrunk()){
+ SetShrinkFactor(theMapActor->GetShrinkFactor());
+ SetShrink();
+ }
+
+ myMapCompositeIndex = theMapCompositeIndex;
+}
+
/*!
To publish the actor an all its internal devices
*/
#ifndef SVTK_ACTOR_H
#define SVTK_ACTOR_H
+#include "SVTK_Selector.h"
#include <TColStd_IndexedMapOfInteger.hxx>
class vtkRenderer;
#include "SVTK.h"
#include "SVTK_DeviceActor.h"
-
+#include "SVTK_Hash.h"
#include <vtkSmartPointer.h>
class SALOME_Actor;
MapEdge(SALOME_Actor* theMapActor,
const TColStd_IndexedMapOfInteger& theMapIndex);
+//! Allow to recostruct selected edges from source SALOME_Actor and map of subindexes using corner node ids
+ virtual void
+ MapEdge(SALOME_Actor* theMapActor,
+ const SVTK_IndexedMapOfIds& theMapCompositeIndex);
+
+
const TColStd_IndexedMapOfInteger&
GetMapIndex() const;
+ const SVTK_IndexedMapOfIds&
+ GetMapCompositeIndex() const;
+
protected:
TColStd_IndexedMapOfInteger myMapIndex;
+ SVTK_IndexedMapOfIds myMapCompositeIndex;
vtkSmartPointer<vtkUnstructuredGrid> myUnstructuredGrid;
--- /dev/null
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+// SALOME SALOMEGUI :
+// File : SVTK_Hash.h
+// Author : Roman NIKOLAEV
+
+#ifndef SVTK_HASH_H
+#define SVTK_HASH_H
+
+#include <vector>
+#include <NCollection_IndexedMap.hxx>
+#include <Standard_Integer.hxx>
+
+typedef std::vector<Standard_Integer> SVTK_ListOfInteger;
+
+class SVTK_Hasher {
+
+public:
+ static Standard_Integer HashCode(const std::vector<Standard_Integer> ids,
+ const Standard_Integer upper) {
+ Standard_Integer seed = ids.size();
+ for( Standard_Integer i = 0; i < (Standard_Integer) ids.size(); i++ ) {
+ Standard_Integer v = ids[i];
+ seed ^= v + 0x9e3779b9 + ( seed << 6 ) + ( seed >> 2 );
+ }
+ return ::HashCode(seed,upper);
+ }
+
+ static Standard_Boolean IsEqual(const SVTK_ListOfInteger& theKey1,
+ const SVTK_ListOfInteger& theKey2) {
+ return theKey1 == theKey2;
+ }
+};
+
+typedef NCollection_IndexedMap<SVTK_ListOfInteger,SVTK_Hasher> SVTK_IndexedMapOfIds;
+
+#endif // SVTK_HASH_H
// SALOME SALOMEGUI : implementation of desktop and GUI kernel
// File : SALOME_Selection.cxx
// Author : Nicolas REJNERI
-
#include "SVTK_SelectorDef.h"
#include <VTKViewer_Filter.h>
if(mySelectionMode != theMode){
mySelectionMode = theMode;
myMapIOSubIndex.clear();
+ myMapIOSubCompositeIndex.clear();
this->EndPickCallback();
}
}
myIO2Actors.clear();
myIObjects.clear();
myMapIOSubIndex.clear();
+ myMapIOSubCompositeIndex.clear();
}
/*!
myIObjects.erase(theIO);
myIO2Actors.erase(theIO);
myMapIOSubIndex.erase(theIO);
+ myMapIOSubCompositeIndex.erase(theIO);
return anIsIOBound;
}
return anId != 0;
}
+static bool removeCompositeIndex( SVTK_IndexedMapOfIds& theMapIndex, const SVTK_ListOfInteger theIds )
+{
+ int anId = theMapIndex.FindIndex( theIds ); // i==0 if Index is not in the MapIndex
+ if( anId ) {
+ // only the last key can be removed
+ SVTK_ListOfInteger aLastIds = theMapIndex.FindKey( theMapIndex.Extent() );
+ if( aLastIds == theIds )
+ theMapIndex.RemoveLast();
+ else {
+ SVTK_IndexedMapOfIds aNewMap;
+ aNewMap.ReSize(theMapIndex.Extent()-1);
+ for( int j = 1; j <= theMapIndex.Extent(); j++ ){
+ SVTK_ListOfInteger anIds = theMapIndex( j );
+ if ( anIds != theIds )
+ aNewMap.Add( anIds );
+ }
+ theMapIndex = aNewMap;
+ }
+ }
+ return anId != 0;
+}
+
+
/*!
Changes indices of subselection for SALOME_InteractiveObject
\param theIO - SALOME_InteractiveObject
myMapIOSubIndex.clear();
}
+/*!
+ \return true if the SALOME_InteractiveObject has a composite index subselection
+ \param theIO - SALOME_InteractiveObject
+*/
+bool
+SVTK_SelectorDef
+::HasCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO ) const
+{
+ return myMapIOSubCompositeIndex.find( theIO ) != myMapIOSubCompositeIndex.end();
+}
+
+/*!
+ Gets composite indices of subselection for SALOME_InteractiveObject
+ \param theIO - SALOME_InteractiveObject
+*/
+void
+SVTK_SelectorDef
+::GetCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_IndexedMapOfIds& theIds )
+{
+ TMapIOSubCompositeIndex::const_iterator anIter = myMapIOSubCompositeIndex.find( theIO );
+ if( anIter != myMapIOSubCompositeIndex.end() )
+ theIds = anIter->second;
+ else
+ theIds.Clear();
+}
+
+/*!
+ Changes composite indices of subselection for SALOME_InteractiveObject
+ \param theIO - SALOME_InteractiveObject
+ \param theIndices - composite id
+ \param theIsModeShift - if it is false, then map will be cleared before indices are added
+*/
+bool
+SVTK_SelectorDef
+::AddOrRemoveCompositeIndex( const Handle( SALOME_InteractiveObject )& theIO,
+ const SVTK_IndexedMapOfIds& theIds,
+ bool theIsModeShift)
+{
+ TMapIOSubCompositeIndex::iterator aMapIter = myMapIOSubCompositeIndex.find( theIO );
+ if( aMapIter == myMapIOSubCompositeIndex.end() ) {
+ SVTK_IndexedMapOfIds anEmpty;
+ aMapIter = myMapIOSubCompositeIndex.insert( TMapIOSubCompositeIndex::value_type( theIO, anEmpty ) ).first;
+ }
+ SVTK_IndexedMapOfIds& aMapIndex = aMapIter->second;
+
+ if( !theIsModeShift )
+ aMapIndex.Clear();
+
+ for( int i = 1, iEnd = theIds.Extent(); i <= iEnd; i++ )
+ aMapIndex.Add( theIds( i ) );
+
+ if( aMapIndex.IsEmpty() ) {
+ myMapIOSubCompositeIndex.erase( theIO );
+ return false;
+ }
+ return true;
+}
+
+/*!
+ Changes indices of subselection for SALOME_InteractiveObject
+ \param theIO - SALOME_InteractiveObject
+ \param theIds - composite ids
+ \param theIsModeShift - if it is false, then map will be cleared before indices are added
+*/
+bool
+SVTK_SelectorDef
+::AddOrRemoveCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_ListOfInteger theIds,
+ bool theIsModeShift)
+{
+ TMapIOSubCompositeIndex::iterator anIter = myMapIOSubCompositeIndex.find( theIO );
+ if( anIter == myMapIOSubCompositeIndex.end() ) {
+ SVTK_IndexedMapOfIds anEmpty;
+ anIter = myMapIOSubCompositeIndex.insert(TMapIOSubCompositeIndex::value_type( theIO,anEmpty ) ).first;
+ }
+
+ SVTK_IndexedMapOfIds& aMapIndex = anIter->second;
+
+ bool anIsContains = aMapIndex.Contains( theIds ) == Standard_True;
+ if ( anIsContains )
+ removeCompositeIndex( aMapIndex, theIds );
+
+ if ( !theIsModeShift )
+ aMapIndex.Clear();
+
+ if ( !anIsContains )
+ aMapIndex.Add( theIds );
+
+ if ( aMapIndex.IsEmpty() )
+ myMapIOSubIndex.erase( theIO );
+
+ return false;
+}
+
+/*!
+ Removes composite index of subselection for SALOME_InteractiveObject
+ \param theIO - SALOME_InteractiveObject
+ \param theIds - index
+*/
+void
+SVTK_SelectorDef
+::RemoveCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_ListOfInteger theIds )
+{
+ if(IsCompositeIndexSelected( theIO, theIds ) ) {
+ TMapIOSubCompositeIndex::iterator anIter = myMapIOSubCompositeIndex.find( theIO );
+ SVTK_IndexedMapOfIds& aMapIndex = anIter->second;
+ removeCompositeIndex( aMapIndex,theIds );
+ }
+}
+
+/*!
+ \return true if the composite index presents in subselection
+ \param theIO - SALOME_InteractiveObject
+ \param theIds - index
+*/
+bool
+SVTK_SelectorDef
+::IsCompositeIndexSelected( const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_ListOfInteger theIds ) const
+{
+ TMapIOSubCompositeIndex::const_iterator anIter = myMapIOSubCompositeIndex.find( theIO );
+ if( anIter != myMapIOSubCompositeIndex.end() ) {
+ const SVTK_IndexedMapOfIds& aMapIndex = anIter->second;
+ return aMapIndex.Contains( theIds ) == Standard_True;
+ }
+ return false;
+}
+
+/*!
+ Clears all composite indices of subselection
+*/
+void
+SVTK_SelectorDef
+::ClearCompositeIndex()
+{
+ myMapIOSubCompositeIndex.clear();
+}
+
+
/*!
To apply a filter on the selection
\param theFilter - new filter
#include "SVTK.h"
#include "SVTK_Selection.h"
+#include "SVTK_Hash.h"
+
#include "SALOME_ListIO.hxx"
#include <VTKViewer_Filter.h>
void
ClearIndex() = 0;
+ /// ! Composite indexes
+ virtual
+ bool
+ HasCompositeIndex(const Handle(SALOME_InteractiveObject)& theIO ) const = 0;
+
+ //! Get composite indexes of subslection for given #SALOME_InteractiveObject
+ virtual
+ void
+ GetCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_IndexedMapOfIds& theIds ) = 0;
+
+ //! Change composite indices of subselection for given #SALOME_InteractiveObject
+ virtual
+ bool
+ AddOrRemoveCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ const SVTK_IndexedMapOfIds& theIds,
+ bool theIsModeShift) = 0;
+
+ //! Change composite index of subslection for given #SALOME_InteractiveObject
+ virtual
+ bool
+ AddOrRemoveCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_ListOfInteger ids,
+ bool theIsModeShift) = 0;
+
+ //! Change composite index of subslection for given #SALOME_InteractiveObject
+ virtual
+ void
+ RemoveCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_ListOfInteger ids ) = 0;
+
+ //! Check, if the given composite index is present in subselection
+ virtual
+ bool
+ IsCompositeIndexSelected(const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_ListOfInteger ids ) const = 0;
+
+ //! Clear composite indexes subselection
+ virtual
+ void
+ ClearCompositeIndex() = 0;
+
//----------------------------------------------------------------------------
typedef int TFilterID;
#ifndef SVTK_SELECTORDEF_H
#define SVTK_SELECTORDEF_H
+#include "SVTK_Selector.h"
+
#include <set>
#include <map>
#include "SALOME_InteractiveObject.hxx"
-#include "SVTK_Selector.h"
-
class SALOME_Actor;
class SVTK_Viewer;
void
ClearIndex();
+ //----------------------------------------------------------------------------
+ /// ! Composite indexes
+ virtual
+ bool
+ HasCompositeIndex(const Handle(SALOME_InteractiveObject)& theIO ) const;
+
+ virtual
+ void
+ GetCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_IndexedMapOfIds& theIds );
+ virtual
+ bool
+ AddOrRemoveCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ const SVTK_IndexedMapOfIds& theIds,
+ bool theIsModeShift);
+
+ virtual
+ bool
+ AddOrRemoveCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_ListOfInteger theIds,
+ bool theIsModeShift);
+
+ virtual
+ void
+ RemoveCompositeIndex( const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_ListOfInteger theIds );
+
+ virtual
+ bool
+ IsCompositeIndexSelected(const Handle(SALOME_InteractiveObject)& theIO,
+ SVTK_ListOfInteger theIds ) const;
+
+ virtual
+ void
+ ClearCompositeIndex();
+
//----------------------------------------------------------------------------
virtual
void
TIOLessThan> TMapIOSubIndex;
TMapIOSubIndex myMapIOSubIndex;
+ typedef std::map<Handle(SALOME_InteractiveObject),
+ SVTK_IndexedMapOfIds,
+ TIOLessThan> TMapIOSubCompositeIndex;
+ TMapIOSubCompositeIndex myMapIOSubCompositeIndex;
+
+
typedef std::map<TFilterID,Handle(VTKViewer_Filter)> TFilters;
TFilters myFilters;
#include "SalomeApp_Engine_i.h"
#include "SalomeApp_Application.h"
+#include "SalomeApp_Study.h"
+#include "SUIT_Session.h"
+#include "CAM_Module.h"
+#include "LightApp_DataModel.h"
#include <SALOME_NamingService.hxx>
#include <SALOMEDS_Tool.hxx>
#include <iostream>
+namespace
+{
+ SalomeApp_Study* getStudyById( int id )
+ {
+ SalomeApp_Study* study = 0;
+ QList<SUIT_Application*> apps = SUIT_Session::session()->applications();
+ for ( int i = 0; i < apps.count() && !study; i++ )
+ {
+ SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( apps[i]->activeStudy() );
+ if ( appStudy && appStudy->id() == id )
+ study = appStudy;
+ }
+ return study;
+ }
+}
+
/*!
Constructor
*/
SalomeApp_Engine_i::SalomeApp_Engine_i( const char* theComponentName )
+ : myComponentName( theComponentName )
{
- myComponentName = theComponentName;
MESSAGE("SalomeApp_Engine_i::SalomeApp_Engine_i(): myComponentName = " <<
- myComponentName << ", this = " << this);
+ qPrintable( myComponentName ) << ", this = " << this);
}
/*!
SalomeApp_Engine_i::~SalomeApp_Engine_i()
{
MESSAGE("SalomeApp_Engine_i::~SalomeApp_Engine_i(): myComponentName = " <<
- myComponentName << ", this = " << this);
+ qPrintable( myComponentName ) << ", this = " << this);
}
SALOMEDS::TMPFile* SalomeApp_Engine_i::Save (SALOMEDS::SComponent_ptr theComponent,
{
SALOMEDS::TMPFile_var aStreamFile = new SALOMEDS::TMPFile;
- if (CORBA::is_nil(theComponent) || CORBA::is_nil(theComponent->GetStudy()))
+ if ( CORBA::is_nil(theComponent) || CORBA::is_nil( theComponent->GetStudy() ) )
+ return aStreamFile._retn();
+
+ // Component type
+ QString componentName = theComponent->ComponentDataType();
+ // Error somewhere outside - Save() called with wrong SComponent instance
+ if ( myComponentName != componentName )
return aStreamFile._retn();
+ // Get study ID
const int studyId = theComponent->GetStudy()->StudyId();
- // Get a temporary directory to store a file
- //std::string aTmpDir = isMultiFile ? theURL : SALOMEDS_Tool::GetTmpDir();
+ bool manuallySaved = false;
- if (myMap.count(studyId)) {
- std::string componentName (theComponent->ComponentDataType());
+ if ( !myMap.count( studyId ) ) {
+ // Save was probably called from outside GUI, so SetListOfFiles was not called!
+ // Try to get list of files from directly from data model
- // Error somewhere outside - Save() called with
- // wrong SComponent instance
- if ( myComponentName != componentName )
+ MESSAGE("SalomeApp_Engine_i::Save(): myComponentName = " <<
+ qPrintable( myComponentName ) <<
+ "it seems Save() was called from outside GUI" );
+
+ // - Get study
+ SalomeApp_Study* study = getStudyById( studyId );
+ if ( !study )
+ return aStreamFile._retn();
+ QString url = QString::fromStdString(study->studyDS()->URL());
+ // - Get app
+ SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( study->application() );
+ if ( !app )
+ return aStreamFile._retn();
+ // - Get module
+ CAM_Module* module = app->module( SalomeApp_Application::moduleTitle( componentName ) );
+ if ( !module ) // load module???
return aStreamFile._retn();
+ // - Get data model
+ LightApp_DataModel* dataModel = dynamic_cast<LightApp_DataModel*>( module->dataModel() );
+ if ( !dataModel )
+ return aStreamFile._retn();
+ // - Save data files
+ QStringList dataFiles;
+ // we use 'url' instead of 'theURL' as latter normally contains path to the tmp dir,
+ // but not actual study's URL
+ dataModel->saveAs( url, study, dataFiles );
+ std::vector<std::string> names;
+ foreach ( QString name, dataFiles ) {
+ if ( !name.isEmpty() )
+ names.push_back(name.toUtf8().data());
+ }
+ SetListOfFiles( names, studyId );
+ manuallySaved = true;
+ }
+
+ // Get a temporary directory to store a file
+ //std::string aTmpDir = isMultiFile ? theURL : SALOMEDS_Tool::GetTmpDir();
+
+ if ( myMap.count( studyId ) ) {
const ListOfFiles& listOfFiles = myMap[studyId];
}
}
+ if ( manuallySaved )
+ SetListOfFiles( ListOfFiles(), studyId );
+
return aStreamFile._retn();
}
// Error somewhere outside - Load() called with
// wrong SComponent instance
- std::string componentName (theComponent->ComponentDataType());
+ QString componentName = theComponent->ComponentDataType();
if ( myComponentName != componentName )
return false;
void SalomeApp_Engine_i::SetListOfFiles (const ListOfFiles& theListOfFiles,
const int theStudyId)
{
- myMap[theStudyId] = theListOfFiles;
+ if ( theListOfFiles.empty() )
+ myMap.erase( theStudyId );
+ else
+ myMap[theStudyId] = theListOfFiles;
}
/*!
CORBA::Boolean& isValidScript)
{
MESSAGE("SalomeApp_Engine_i::DumpPython(): myComponentName = "<<
- myComponentName << ", this = " << this);
+ qPrintable( myComponentName ) << ", this = " << this);
// Temporary solution: returning a non-empty sequence
// even if there's nothing to dump, to avoid crashes in SALOMEDS
*/
char* SalomeApp_Engine_i::ComponentDataType()
{
- return const_cast<char*>( myComponentName.c_str() );
+ return CORBA::string_dup( myComponentName.toLatin1().constData() );
}
/*!
QString version;
SalomeApp_Application::ModuleShortInfo version_info;
foreach ( version_info, versions ) {
- if ( SalomeApp_Application::moduleName( version_info.name ) == myComponentName.c_str() ) {
+ if ( SalomeApp_Application::moduleName( version_info.name ) == myComponentName ) {
version = version_info.version;
break;
}
#include "SALOME_Component_i.hxx"
+#include <QString>
#include <vector>
#include <map>
typedef std::map<int, ListOfFiles> MapOfListOfFiles;
MapOfListOfFiles myMap;
- std::string myComponentName;
+ QString myComponentName;
};
#endif
#include "SalomeApp_ExceptionHandler.h"
#include "Utils_CorbaException.hxx"
-#include "CASCatch.hxx"
-
#include <OSD.hxx>
#include <stdexcept>
/*!Try to call SUIT_ExceptionHandler::internalHandle(o, e), catch if failure.*/
bool SalomeApp_ExceptionHandler::handleSignals( QObject* o, QEvent* e )
{
- try {
+ bool result = true;
+
+ try
+ {
OCC_CATCH_SIGNALS;
- SUIT_ExceptionHandler::internalHandle( o, e );
+ result = SUIT_ExceptionHandler::internalHandle( o, e );
}
- catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- throw Standard_Failure( aFail->GetMessageString() );
+ catch( Standard_Failure& e )
+ {
+ throw Standard_Failure( e.GetMessageString() );
}
- return true;
+ return result;
}
/*!Try to call handleSignals( o, e ), catch and show error message.*/
// for this module by LightApp_Engine_i::Load()
bool isMultiFile = false; // TODO: decide, how to access this parameter
RemoveTemporaryFiles( dm->module()->name().toStdString().c_str(), isMultiFile );
+ std::vector<std::string> listOfFiles ;
+ SetListOfFiles( dm->module()->name().toStdString().c_str(), listOfFiles );
// Something has been read -> create data model tree
LightApp_DataModel* aDM = dynamic_cast<LightApp_DataModel*>( dm );
# --- resources ---
# uic files / to be processed by pyuic
-SET(_pyuic_files
+SET(_pyuic_FILES
minmax.ui
)
# scripts / pyuic wrappings
-PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_files})
+PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_FILES} TARGET_NAME _target_name_pyuic)
# --- scripts ---
# scripts / static
# TODO: process UIC files via PyQt pyuic tool, see UsePyQt.cmake
SET(_plugins_SCRIPTS
- ${_pyuic_SCRIPTS}
minmax_plugin.py
trihedron.py
tubedialog_ui.py
salome_plugins.py
smesh_plugins.py
)
+
SET(_helper_SCRIPTS
xalome.py
)
# --- rules ---
-SALOME_INSTALL_SCRIPTS("${_plugins_SCRIPTS}" ${SALOME_GUI_INSTALL_PLUGINS}/demo DEF_PERMS)
SALOME_INSTALL_SCRIPTS("${_helper_SCRIPTS}" ${SALOME_INSTALL_PYTHON})
+SALOME_INSTALL_SCRIPTS("${_plugins_SCRIPTS}" ${SALOME_GUI_INSTALL_PLUGINS}/demo DEF_PERMS)
+SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_GUI_INSTALL_PLUGINS}/demo DEF_PERMS TARGET_NAME _target_name_pyuic_py)
+# add dependency of compiled py files on uic files in order
+# to avoid races problems when compiling in parallel
+ADD_DEPENDENCIES(${_target_name_pyuic_py} ${_target_name_pyuic})
return GetInput()->GetPoint(theObjID);
}
+/*!
+ Maps object index of a node to corresponding VTK index
+*/
+int
+VTKViewer_Actor
+::GetNodeVtkId( int theObjID )
+{
+ return theObjID;
+}
+
+
/*!
Get corresponding #vtkCell for given object index
*/
double*
GetNodeCoord(int theObjID);
+ //! Maps object index of a node to corresponding VTK index
+ virtual
+ int
+ GetNodeVtkId(int theObjID);
+
//! Maps VTK index of a cell to corresponding object index
virtual
int
#include "VTKViewer_Filter.h"
-OCCT_IMPLEMENT_STANDARD_RTTIEXT(VTKViewer_Filter, MMgt_TShared)
+IMPLEMENT_STANDARD_RTTIEXT(VTKViewer_Filter, Standard_Transient)
/*!
* \class VTKViewer_Filter
#include "VTKViewer.h"
-#include <MMgt_TShared.hxx>
+#include <Standard_Transient.hxx>
#include <Standard_DefineHandle.hxx>
-#include <Basics_OCCTVersion.hxx>
-
class VTKViewer_Actor;
-DEFINE_STANDARD_HANDLE(VTKViewer_Filter, MMgt_TShared);
+DEFINE_STANDARD_HANDLE(VTKViewer_Filter, Standard_Transient);
/*
Class : VTKViewer_Filter
should be redefined in derived classes
*/
-class VTKViewer_Filter : public MMgt_TShared
+class VTKViewer_Filter : public Standard_Transient
{
public:
VTKViewer_Actor* myActor;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(VTKViewer_Filter,MMgt_TShared)
+ DEFINE_STANDARD_RTTIEXT(VTKViewer_Filter, Standard_Transient)
};
#endif
void VTKViewer_OpenGLRenderer::Clear(void)
{
+ vtkOpenGLRenderer::Clear();
#ifdef VTK_OPENGL2
if (this->OpenGLHelper.IsInitialized())
{
#include "ViewerData_AISShape.hxx"
-#ifdef USE_TEXTURED_SHAPE
- OCCT_IMPLEMENT_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_TexturedShape)
-#else
- OCCT_IMPLEMENT_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_Shape)
-#endif
+IMPLEMENT_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_ColoredShape)
/*!
- Constructor
- \param shape - TopoDS shape
+ Constructor.
+ \param shape Shape to manage.
*/
-ViewerData_AISShape::ViewerData_AISShape (const TopoDS_Shape& theShape)
-: BASE_SHAPE (theShape),
- myIsClippable (true)
+ViewerData_AISShape::ViewerData_AISShape(const TopoDS_Shape& theShape)
+: AIS_ColoredShape(theShape),
+ myIsClippable(true)
{
}
/*!
- Destructor
+ Destructor.
*/
ViewerData_AISShape::~ViewerData_AISShape()
{
}
-
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#ifndef _ViewerData_AISShape_HeaderFile
-#define _ViewerData_AISShape_HeaderFile
-
-// When below macro is defined, AIS_TexturedShape is used as base class
-#define USE_TEXTURED_SHAPE
-
-#ifdef USE_TEXTURED_SHAPE
- #include <AIS_TexturedShape.hxx>
- #define BASE_SHAPE AIS_TexturedShape
-#else
- #include <AIS_Shape.hxx>
- #define BASE_SHAPE AIS_Shape
-#endif
+#ifndef VIEWERDATA_AISSHAPE
+#define VIEWERDATA_AISSHAPE
#include <Standard.hxx>
#include <Standard_DefineHandle.hxx>
+#include <AIS_ColoredShape.hxx>
-#include <Basics_OCCTVersion.hxx>
-
-class ViewerData_AISShape
- : public BASE_SHAPE
+class ViewerData_AISShape : public AIS_ColoredShape
{
public:
- Standard_EXPORT ViewerData_AISShape (const TopoDS_Shape& theShape);
+ Standard_EXPORT ViewerData_AISShape(const TopoDS_Shape&);
Standard_EXPORT ~ViewerData_AISShape();
- // checks if shape is clippable
+ //! Checks if shape is clippable.
Standard_EXPORT inline bool IsClippable() const
{
return myIsClippable;
}
- // makes shape clippable/not clippable
- Standard_EXPORT inline void SetClippable (bool isClippable)
+ //! Makes shape clippable/not clippable.
+ Standard_EXPORT inline void SetClippable(bool isClippable)
{
myIsClippable = isClippable;
}
bool myIsClippable;
public:
- OCCT_DEFINE_STANDARD_RTTIEXT(ViewerData_AISShape, BASE_SHAPE)
+ DEFINE_STANDARD_RTTIEXT(ViewerData_AISShape, AIS_ColoredShape)
};
-DEFINE_STANDARD_HANDLE(ViewerData_AISShape, BASE_SHAPE)
+DEFINE_STANDARD_HANDLE(ViewerData_AISShape, AIS_ColoredShape)
-#endif // _ViewerData_AISShape_HeaderFile
+#endif // VIEWERDATA_AISSHAPE
</message>
<message>
<source>TOO_MANY_MATCHES</source>
- <translation type="unfinished">Too many matches! Displaying first ones only...</translation>
+ <translation>Trop d'occurences! Affichage des premières...</translation>
</message>
<message>
<source>NO_DOC_AVAILABLE</source>
- <translation type="unfinished">no documentation available</translation>
+ <translation>pas de documentation disponible</translation>
</message>
</context>
</TS>
</message>
<message>
<source>GR_EDIT_SET</source>
- <translation type="unfinished">Editor settings</translation>
+ <translation>Paramètres de l'éditeur</translation>
</message>
<message>
<source>LBL_COMPLETION_MODE</source>
- <translation type="unfinished">Completion mode</translation>
+ <translation>Mode de complétion</translation>
</message>
<message>
<source>LBL_NONE</source>
- <translation type="unfinished">None</translation>
+ <translation>Auncun</translation>
</message>
<message>
<source>LBL_AUTO</source>
- <translation type="unfinished">Auto</translation>
+ <translation>Auto</translation>
</message>
<message>
<source>LBL_MANUAL</source>
- <translation type="unfinished">Manual</translation>
+ <translation>Manuel</translation>
</message>
<message>
<source>LBL_ALWAYS</source>
- <translation type="unfinished">Always</translation>
+ <translation>Toujours</translation>
</message>
<message>
<source>GR_TAB_SET</source>
</message>
<message>
<source>ACT_FIND</source>
- <translation type="unfinished">Find</translation>
+ <translation>Cherche</translation>
</message>
<message>
<source>TTP_FIND</source>
- <translation type="unfinished">Find</translation>
+ <translation>Cherche</translation>
</message>
<message>
<source>DSC_FIND</source>
- <translation type="unfinished">Find text</translation>
+ <translation>Cherche le texte</translation>
</message>
<message>
<source>ACT_REPLACE</source>
- <translation type="unfinished">Replace</translation>
+ <translation>Remplace</translation>
</message>
<message>
<source>TTP_REPLACE</source>
- <translation type="unfinished">Find & Replace</translation>
+ <translation>Cherche & Remplace</translation>
</message>
<message>
<source>DSC_REPLACE</source>
- <translation type="unfinished">Find and replace text</translation>
+ <translation>Cherche et remplace le texte</translation>
</message>
<message>
<source>ACT_PREFERENCES</source>
</message>
<message>
<source>FILE_PARAM_NAME</source>
- <translation type="unfinished">file</translation>
+ <translation>fichier</translation>
</message>
<message>
<source>FILE_PARAM_DESCRIPTION</source>
- <translation type="unfinished">File to edit.</translation>
+ <translation>Fichier à éditer.</translation>
</message>
</context>
<context>
<name>PyEditor_FindTool</name>
<message>
<source>FIND_LABEL</source>
- <translation type="unfinished">Find:</translation>
+ <translation>Cherche:</translation>
</message>
<message>
<source>REPLACE_LABEL</source>
- <translation type="unfinished">Replace with:</translation>
+ <translation>Remplace avec:</translation>
</message>
<message>
<source>REPLACE_BTN</source>
- <translation type="unfinished">Replace</translation>
+ <translation>Remplace</translation>
</message>
<message>
<source>REPLACE_ALL_BTN</source>
- <translation type="unfinished">Replace All</translation>
+ <translation>Remplace tout</translation>
</message>
<message>
<source>CASE_SENSITIVE_CHECK</source>
- <translation type="unfinished">Case Sensitive</translation>
+ <translation>Sensible à la casse</translation>
</message>
<message>
<source>WHOLE_WORDS_CHECK</source>
- <translation type="unfinished">Whole Words Only</translation>
+ <translation>Mots entiers uniquement</translation>
</message>
<message>
<source>REGEX_CHECK</source>
- <translation type="unfinished">Use Regular Expressions</translation>
+ <translation>Utilise des expressions régulières</translation>
</message>
<message>
<source>NB_MATCHED_LABEL</source>
- <translation type="unfinished">%1 of %2 matches</translation>
+ <translation>%1 sur %2 correspond</translation>
</message>
</context>
</TS>
</message>
<message>
<source>GR_EDIT_SET</source>
- <translation type="unfinished">Editor settings</translation>
+ <translation>エディタの設定</translation>
</message>
<message>
<source>LBL_COMPLETION_MODE</source>
- <translation type="unfinished">Completion mode</translation>
+ <translation>完全モード</translation>
</message>
<message>
<source>LBL_NONE</source>
- <translation type="unfinished">None</translation>
+ <translation>なし</translation>
</message>
<message>
<source>LBL_AUTO</source>
- <translation type="unfinished">Auto</translation>
+ <translation>自動</translation>
</message>
<message>
<source>LBL_MANUAL</source>
- <translation type="unfinished">Manual</translation>
+ <translation>手動</translation>
</message>
<message>
<source>LBL_ALWAYS</source>
- <translation type="unfinished">Always</translation>
+ <translation>常時</translation>
</message>
<message>
<source>GR_TAB_SET</source>
</message>
<message>
<source>ACT_FIND</source>
- <translation type="unfinished">Find</translation>
+ <translation>検索</translation>
</message>
<message>
<source>TTP_FIND</source>
- <translation type="unfinished">Find</translation>
+ <translation>検索</translation>
</message>
<message>
<source>DSC_FIND</source>
- <translation type="unfinished">Find text</translation>
+ <translation>テキストの検索</translation>
</message>
<message>
<source>ACT_REPLACE</source>
- <translation type="unfinished">Replace</translation>
+ <translation>置換</translation>
</message>
<message>
<source>TTP_REPLACE</source>
- <translation type="unfinished">Find & Replace</translation>
+ <translation>検索と置換</translation>
</message>
<message>
<source>DSC_REPLACE</source>
- <translation type="unfinished">Find and replace text</translation>
+ <translation>テキストの検索と置換</translation>
</message>
<message>
<source>ACT_PREFERENCES</source>
</message>
<message>
<source>WRN_READ_FILE</source>
- <translation>ファイルが読めません %1:
-%2.</translation>
+ <translation>ファイルが読めません %1:\n%2.</translation>
</message>
<message>
<source>WRN_WRITE_FILE</source>
- <translation>ファイルが書き込めません %1:
-%2.</translation>
+ <translation>ファイルが書き込めません %1:\n%2.</translation>
</message>
<message>
<source>STS_READY</source>
<name>PyEditor</name>
<message>
<source>PROGRAM_DESCRIPTION</source>
- <translation>Pythonのエディタ</translation>
+ <translation>簡易 Python エディタ</translation>
</message>
<message>
<source>FILE_PARAM_NAME</source>
- <translation type="unfinished">file</translation>
+ <translation>ファイル</translation>
</message>
<message>
<source>FILE_PARAM_DESCRIPTION</source>
- <translation type="unfinished">File to edit.</translation>
+ <translation>ファイルの編集</translation>
</message>
</context>
<context>
<name>PyEditor_FindTool</name>
<message>
<source>FIND_LABEL</source>
- <translation type="unfinished">Find:</translation>
+ <translation>Find:</translation>
</message>
<message>
<source>REPLACE_LABEL</source>
- <translation type="unfinished">Replace with:</translation>
+ <translation>Replace with:</translation>
</message>
<message>
<source>REPLACE_BTN</source>
- <translation type="unfinished">Replace</translation>
+ <translation>置換</translation>
</message>
<message>
<source>REPLACE_ALL_BTN</source>
- <translation type="unfinished">Replace All</translation>
+ <translation>全て置換</translation>
</message>
<message>
<source>CASE_SENSITIVE_CHECK</source>
- <translation type="unfinished">Case Sensitive</translation>
+ <translation>大文字と小文字を区別</translation>
</message>
<message>
<source>WHOLE_WORDS_CHECK</source>
- <translation type="unfinished">Whole Words Only</translation>
+ <translation>完全に同一な単語のみ</translation>
</message>
<message>
<source>REGEX_CHECK</source>
- <translation type="unfinished">Use Regular Expressions</translation>
+ <translation>正規表現を使用</translation>
</message>
<message>
<source>NB_MATCHED_LABEL</source>
- <translation type="unfinished">%1 of %2 matches</translation>
+ <translation>%1 of %2 matches</translation>
</message>
</context>
</TS>
