From 0ffeeca220e3ae60f0c605af50c0d15cd797641c Mon Sep 17 00:00:00 2001 From: apo Date: Thu, 13 Jan 2005 06:23:11 +0000 Subject: [PATCH] Remove unused varibables --- src/OBJECT/VISU_Actor.h | 2 -- src/VISUGUI/VisuGUI.cxx | 8 +------- src/VISU_I/VISU_CutLines_i.cc | 7 ------- src/VISU_I/VISU_CutPlanes_i.cc | 5 ----- src/VISU_I/VISU_DeformedShape_i.cc | 2 -- src/VISU_I/VISU_IsoSurfaces_i.cc | 3 --- src/VISU_I/VISU_ScalarMap_i.cc | 4 ---- src/VISU_I/VISU_TimeAnimation.cxx | 3 --- src/VISU_I/VISU_Vectors_i.cc | 3 --- src/VISU_I/VISU_ViewManager_i.cc | 1 - 10 files changed, 1 insertion(+), 37 deletions(-) diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h index eb401ed8..4000d318 100644 --- a/src/OBJECT/VISU_Actor.h +++ b/src/OBJECT/VISU_Actor.h @@ -91,8 +91,6 @@ class VTKOCC_EXPORT VISU_Actor : public SALOME_Actor { virtual int GetNodeObjId(int theVtkID); virtual int GetElemObjId(int theVtkID); - std::string myFieldName; - protected: VISU_Actor(); diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index ee34ad50..0b726abe 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -143,10 +143,8 @@ using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #else static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #endif class CustomItem : public QCustomMenuItem @@ -419,7 +417,6 @@ bool VisuGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent) try{ QString VisuInputDir = getVisuInputDir(); QString VisuOutputDir = getVisuOutputDir(); - vtkRenderer *theRenderer = GetRenderer(); SALOMEDS::Study_var aStudy = GetActiveStudy()->getStudyDocument(); //Document OCAF de l'etude active SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); @@ -640,7 +637,6 @@ bool VisuGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent) case 54: { QMenuData* pp; - QMenuItem* item = parent->menuBar()->findItem(theCommandID,&pp); bool check = !pp->isItemChecked(theCommandID); pp->setItemChecked(theCommandID,check); switch(theCommandID){ @@ -2800,7 +2796,6 @@ int GetNbChildren( SALOMEDS::SObject_var SO, bool refToo ) bool VisuGUI::CustomPopup(QAD_Desktop* parent, QPopupMenu* thePopup, const QString & theContext, const QString & theParent, const QString & theObject) { - int isViewer = (theParent.compare("ObjectBrowser") != 0), initId = isViewer? 800: 900; QAD_ResourceMgr* rmgr = parent->createResourceManager(); bool aIsLocked = isStudyLocked( GetActiveStudy()->getStudyDocument() ); @@ -3901,7 +3896,7 @@ void VisuGUI::ExportToFile(){ QAD_Application::getDesktop()->putInfo( "Exporting To File " + aFile + "..." ); aDir = QAD_Tools::getDirFromPath(aFile); QAD_CONFIG->addSetting("Visu:OutputDir",aDir); - if(VISU::Result_i* aResult = dynamic_cast(aBase)){ + if(dynamic_cast(aBase)){ try{ //APO - aResult->GetInput()->ToFile(aFile.latin1()); QAD_Application::getDesktop()->putInfo(aFile+" exported."); @@ -3972,7 +3967,6 @@ VISU_Actor* VisuGUI::UpdateViewer(VISU::Prs3d_i* thePrs, bool theDispOnly){ vtkActor *anActor; VISU_Actor* anVISUActor = NULL; VISU_Actor* aResActor = NULL; - VISU::Prs3d_i* aSrcAddr = thePrs; for(anActColl->InitTraversal(); (anActor = anActColl->GetNextActor()) != NULL; ){ if(!SALOME_Actor::SafeDownCast(anActor)) continue; diff --git a/src/VISU_I/VISU_CutLines_i.cc b/src/VISU_I/VISU_CutLines_i.cc index 4021956f..f5185524 100644 --- a/src/VISU_I/VISU_CutLines_i.cc +++ b/src/VISU_I/VISU_CutLines_i.cc @@ -38,10 +38,8 @@ using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #else static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #endif int VISU::CutLines_i::IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity, @@ -68,7 +66,6 @@ VISU::CutLines_i::CutLines_i(Result_i* theResult, bool theAddToStudy, SALOMEDS:: void VISU::CutLines_i::SameAs(const CutLines_i* theOrigin){ - CutLines_i* aCutLines = const_cast(theOrigin); VISU::ScalarMap_i::SameAs(theOrigin); } @@ -251,11 +248,7 @@ void VISU::CutLines_i::BuildTableOfReal(SALOMEDS::SObject_ptr theSObject){ typedef map TXYMapCont; typedef map TLineIdCont; - const VISU::TField::TValField& aValField = myField->myValField; - const VISU::TField::TValForTime& aValForTime = aValField.find((int)myIteration)->second; - const VISU::TField::TTime& aTime = aValForTime.myTime; QString aTitle; - //aTitle.sprintf("%s %s",myTitle.c_str(),aTime.second.c_str()); aTitle.sprintf("%s",myTitle.c_str()); aTitle = aTitle.simplifyWhiteSpace(); aTableOfReal->SetTitle(aTitle.latin1()); diff --git a/src/VISU_I/VISU_CutPlanes_i.cc b/src/VISU_I/VISU_CutPlanes_i.cc index cfa89252..a18f32f3 100644 --- a/src/VISU_I/VISU_CutPlanes_i.cc +++ b/src/VISU_I/VISU_CutPlanes_i.cc @@ -34,10 +34,8 @@ using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #else static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #endif int VISU::CutPlanes_i::IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity, @@ -65,7 +63,6 @@ VISU::CutPlanes_i::CutPlanes_i(Result_i* theResult, bool theAddToStudy, SALOMEDS void VISU::CutPlanes_i::SameAs(const CutPlanes_i* theOrigin){ - CutPlanes_i* aCutPlanes = const_cast(theOrigin); VISU::ScalarMap_i::SameAs(theOrigin); } @@ -98,8 +95,6 @@ VISU::Storable* VISU::CutPlanes_i::Restore(const Storable::TRestoringMap& theMap void VISU::CutPlanes_i::ToStream(std::ostringstream& theStr){ ScalarMap_i::ToStream(theStr); - int aNbPlanes = GetNbPlanes(); - Storable::DataToStream( theStr, "myNbPlanes", int(GetNbPlanes())); Storable::DataToStream( theStr, "myDisplacement", GetDisplacement()); Storable::DataToStream( theStr, "myBasePlane", int(GetOrientationType())); diff --git a/src/VISU_I/VISU_DeformedShape_i.cc b/src/VISU_I/VISU_DeformedShape_i.cc index 8333217f..fd3eb6c6 100644 --- a/src/VISU_I/VISU_DeformedShape_i.cc +++ b/src/VISU_I/VISU_DeformedShape_i.cc @@ -36,10 +36,8 @@ using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #else static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #endif int VISU::DeformedShape_i::IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity, diff --git a/src/VISU_I/VISU_IsoSurfaces_i.cc b/src/VISU_I/VISU_IsoSurfaces_i.cc index 4d51d172..4a152703 100644 --- a/src/VISU_I/VISU_IsoSurfaces_i.cc +++ b/src/VISU_I/VISU_IsoSurfaces_i.cc @@ -34,10 +34,8 @@ using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #else static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #endif int VISU::IsoSurfaces_i::IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity, @@ -64,7 +62,6 @@ VISU::IsoSurfaces_i::IsoSurfaces_i(Result_i* theResult, bool theAddToStudy, SALO void VISU::IsoSurfaces_i::SameAs(const IsoSurfaces_i* theOrigin) { - IsoSurfaces_i* aIsoSurfaces = const_cast(theOrigin); VISU::ScalarMap_i::SameAs(theOrigin); } diff --git a/src/VISU_I/VISU_ScalarMap_i.cc b/src/VISU_I/VISU_ScalarMap_i.cc index 96beba4d..1bb7766d 100644 --- a/src/VISU_I/VISU_ScalarMap_i.cc +++ b/src/VISU_I/VISU_ScalarMap_i.cc @@ -38,10 +38,8 @@ using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #else static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #endif static int INCMEMORY = 4; @@ -201,7 +199,6 @@ VISU::Storable* VISU::ScalarMap_i::Create(const char* theMeshName, VISU::Entity myIsFixedRange = (aFixRange.compare("true") == 0); if(myIsFixedRange){ - float aScalarRange[2]; QString aRangeMin = QAD_CONFIG->getSetting("Visu:SBMinimumValue"); float aMin = (aRangeMin.isEmpty())? 0 : aRangeMin.toFloat(); QString aRangeMax = QAD_CONFIG->getSetting("Visu:SBMaximumValue"); @@ -502,7 +499,6 @@ VISU_Actor* VISU::ScalarMap_i::CreateActor(const Handle(SALOME_InteractiveObject VISU::Prs3d_i::CreateActor(anActor,theIO); anActor->SetBarVisibility(true); anActor->SetRepresentation(2); - anActor->myFieldName = myFieldName; UpdateActor(anActor); }catch(...) { anActor->Delete(); diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx index e1245e97..2f16e023 100644 --- a/src/VISU_I/VISU_TimeAnimation.cxx +++ b/src/VISU_I/VISU_TimeAnimation.cxx @@ -29,8 +29,6 @@ using namespace std; -//QWaitCondition myCondition; -static int MYDELAY = 1; //************************************************************************ VISU_TimeAnimation::VISU_TimeAnimation(SALOMEDS::Study_ptr theStudy, VISU::View3D_ptr theView3D) { @@ -247,7 +245,6 @@ CORBA::Boolean VISU_TimeAnimation::generateFrames() { bool aNoError = true; clearView(); - vtkRenderer* aRen = myView->getRenderer(); for (int i = 0; i < getNbFields(); i++) { FieldData& aData = myFieldsLst[i]; diff --git a/src/VISU_I/VISU_Vectors_i.cc b/src/VISU_I/VISU_Vectors_i.cc index b7ac3c0a..ff44a6c1 100644 --- a/src/VISU_I/VISU_Vectors_i.cc +++ b/src/VISU_I/VISU_Vectors_i.cc @@ -34,10 +34,8 @@ using namespace std; #ifdef _DEBUG_ static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #else static int MYDEBUG = 0; -static int MYDEBUGWITHFILES = 0; #endif static int INCMEMORY = 4+12; @@ -168,7 +166,6 @@ VISU_Actor* VISU::Vectors_i::CreateActor(const Handle(SALOME_InteractiveObject)& try{ VISU::Prs3d_i::CreateActor(anActor,theIO); anActor->SetBarVisibility(true); - anActor->myFieldName = myFieldName; anActor->GetProperty()->SetColor(myColor.R,myColor.G,myColor.B); anActor->GetProperty()->SetLineWidth(GetLineWidth()); UpdateActor(anActor); diff --git a/src/VISU_I/VISU_ViewManager_i.cc b/src/VISU_I/VISU_ViewManager_i.cc index f2f34ed0..6639b6b6 100644 --- a/src/VISU_I/VISU_ViewManager_i.cc +++ b/src/VISU_I/VISU_ViewManager_i.cc @@ -1607,7 +1607,6 @@ namespace VISU{ VISU_Actor* GetActor(VISU::Prs3d_i* thePrs3d, VTKViewer_ViewFrame* theVTKFrame){ - vtkActor *anActor; vtkActorCollection *anActColl = theVTKFrame->getRenderer()->GetActors(); anActColl->InitTraversal(); while(vtkActor *anActor = anActColl->GetNextActor()) -- 2.39.2