kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[Robot] Gui: remove unused includes

Browse Source 
- also some sorting
This commit is contained in:
Uwe
2022-12-07 04:20:50 +01:00
parent 3177d3eec2
commit 83cd5faabe
39 changed files with 152 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Robot/Gui/AppRobotGui.cpp
View File

@@ -22,19 +22,17 @@
#include "PreCompiled.h"
#include <CXX/Extensions.hxx>
#include <CXX/Objects.hxx>
#include <Base/Console.h>
#include <Base/Interpreter.h>
#include <Base/PyObjectBase.h>
#include <Gui/Application.h>
#include <Gui/Language/Translator.h>
#include "ViewProviderEdge2TracObject.h"
#include "ViewProviderRobotObject.h"
#include "ViewProviderTrajectory.h"
#include "ViewProviderEdge2TracObject.h"
#include "ViewProviderTrajectoryDressUp.h"
#include "ViewProviderTrajectoryCompound.h"
#include "ViewProviderTrajectoryDressUp.h"
#include "Workbench.h"

13
src/Mod/Robot/Gui/Command.cpp
View File

@@ -20,28 +20,23 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
#endif
#include <App/Application.h>
#include <Gui/Application.h>
#include <Gui/MainWindow.h>
#include <Gui/Command.h>
#include <Gui/FileDialog.h>
#include <Gui/Control.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Gui/SelectionFilter.h>
#include <Gui/SelectionObject.h>
#include <Gui/Document.h>
#include <Gui/Control.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include "TrajectorySimulate.h"
#include "TaskDlgSimulate.h"
#include "TrajectorySimulate.h"
using namespace std;

10
src/Mod/Robot/Gui/CommandExport.cpp
View File

@@ -20,24 +20,20 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
#endif
#include <App/Application.h>
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/MainWindow.h>
#include <Gui/FileDialog.h>
#include <Gui/Selection.h>
#include <Gui/Document.h>
#include <Gui/FileDialog.h>
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include "TrajectorySimulate.h"
using namespace std;

11
src/Mod/Robot/Gui/CommandInsertRobot.cpp
View File

@@ -20,26 +20,21 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QMessageBox>
#endif
#include <App/Application.h>
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/MainWindow.h>
#include <Gui/FileDialog.h>
#include <Gui/Selection.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/Selection.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include "TrajectorySimulate.h"
using namespace std;
DEF_STD_CMD_A(CmdRobotInsertKukaIR500)

19
src/Mod/Robot/Gui/CommandTrajectory.cpp
View File

@@ -20,33 +20,26 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QInputDialog>
# include <QMessageBox>
#endif
#include <App/Application.h>
#include <Gui/Application.h>
#include <Gui/Command.h>
#include <Gui/MainWindow.h>
#include <Gui/FileDialog.h>
#include <Gui/Selection.h>
#include <Gui/Document.h>
#include <Gui/MainWindow.h>
#include <Gui/Placement.h>
#include <Gui/Control.h>
#include <Mod/Part/App/PartFeature.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include <Gui/Selection.h>
#include <Mod/Robot/App/Edge2TracObject.h>
#include <Mod/Robot/App/TrajectoryDressUpObject.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/TrajectoryCompound.h>
#include <Mod/Robot/App/TrajectoryDressUpObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include "TaskDlgEdge2Trac.h"
#include "TrajectorySimulate.h"
using namespace std;
using namespace RobotGui;

52
src/Mod/Robot/Gui/PreCompiled.h
View File

@@ -20,7 +20,6 @@
* *
***************************************************************************/
#ifndef ROBOTGUI_PRECOMPILED_H
#define ROBOTGUI_PRECOMPILED_H
@@ -31,7 +30,7 @@
# define RobotExport __declspec(dllimport)
# define PartExport __declspec(dllimport)
# define PartGuiExport __declspec(dllimport)
# define RobotGuiExport __declspec(dllexport)
# define RobotGuiExport __declspec(dllexport)
#else // for Linux
# define PartExport
# define RobotExport
@@ -42,37 +41,46 @@
#include <Standard_math.hxx>
#ifdef _MSC_VER
# pragma warning(disable : 4005)
# pragma warning(disable : 4273)
# pragma warning(disable : 4005)
# pragma warning(disable : 4273)
#endif
#ifdef _PreComp_
// standard
#include <iostream>
#include <cassert>
#include <cmath>
// STL
#include <vector>
#include <map>
#include <string>
#include <list>
#include <set>
#include <algorithm>
#include <stack>
#include <queue>
#include <bitset>
#include <sstream>
#ifdef FC_OS_WIN32
# include <windows.h>
#endif
// Qt
#include <QAction>
#include <QApplication>
#include <QDir>
#include <QFile>
#include <QFileInfo>
#include <QInputDialog>
#include <QMenu>
#include <QMessageBox>
#include <qobject.h>
#include <qpalette.h>
#include <QString>
#include <QTimer>
// Qt Toolkit
#ifndef __QtAll__
# include <Gui/QtAll.h>
#endif
// Inventor
#include <Inventor/SoDB.h>
#include <Inventor/SoInput.h>
#include <Inventor/SbVec3f.h>
#include <Inventor/actions/SoSearchAction.h>
#include <Inventor/draggers/SoJackDragger.h>
#include <Inventor/nodes/SoBaseColor.h>
#include <Inventor/nodes/SoCoordinate3.h>
#include <Inventor/nodes/SoDrawStyle.h>
#include <Inventor/nodes/SoLineSet.h>
#include <Inventor/nodes/SoMarkerSet.h>
#include <Inventor/nodes/SoSeparator.h>
#include <Inventor/VRMLnodes/SoVRMLTransform.h>
#endif //_PreComp_

10
src/Mod/Robot/Gui/TaskDlgEdge2Trac.cpp
View File

@@ -20,25 +20,23 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QApplication>
#endif
#include "TaskDlgEdge2Trac.h"
#include <Base/Console.h>
#include <Base/Exception.h>
#include <Gui/TaskView/TaskSelectLinkProperty.h>
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/TaskView/TaskSelectLinkProperty.h>
#include "TaskDlgEdge2Trac.h"
using namespace RobotGui;
//**************************************************************************
//**************************************************************************
// TaskDialog

6
src/Mod/Robot/Gui/TaskDlgEdge2Trac.h
View File

@@ -20,24 +20,20 @@
* *
***************************************************************************/
#ifndef ROBOTGUI_TaskDlgEdge2Trac_H
#define ROBOTGUI_TaskDlgEdge2Trac_H
#include <Gui/TaskView/TaskDialog.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include <Mod/Robot/App/Edge2TracObject.h>
#include "TaskEdge2TracParameter.h"
// forward
namespace Gui { namespace TaskView { class TaskSelectLinkProperty;}}
namespace RobotGui {
/// simulation dialog for the TaskView
class RobotGuiExport TaskDlgEdge2Trac : public Gui::TaskView::TaskDialog
{

11
src/Mod/Robot/Gui/TaskDlgSimulate.cpp
View File

@@ -20,16 +20,12 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include "TaskDlgSimulate.h"
using namespace RobotGui;
using namespace RobotGui;
//**************************************************************************
//**************************************************************************
@@ -46,8 +42,9 @@ TaskDlgSimulate::TaskDlgSimulate(Robot::RobotObject *pcRobotObject,Robot::Trajec
msg = new TaskRobotMessages(pcRobotObject);
QObject::connect(trac ,SIGNAL(axisChanged(float,float,float,float,float,float,const Base::Placement &)),
rob ,SLOT (setAxis(float,float,float,float,float,float,const Base::Placement &)));
QObject::connect(
trac, SIGNAL(axisChanged(float, float, float, float, float, float, const Base::Placement&)),
rob, SLOT(setAxis(float, float, float, float, float, float, const Base::Placement&)));
Content.push_back(rob);
Content.push_back(ctr);

5
src/Mod/Robot/Gui/TaskDlgSimulate.h
View File

@@ -20,7 +20,6 @@
* *
***************************************************************************/
#ifndef ROBOTGUI_TASKDLGSIMULATE_H
#define ROBOTGUI_TASKDLGSIMULATE_H
@@ -29,13 +28,13 @@
#include <Mod/Robot/App/TrajectoryObject.h>
#include "TaskRobot6Axis.h"
#include "TaskTrajectory.h"
#include "TaskRobotControl.h"
#include "TaskRobotMessages.h"
#include "TaskTrajectory.h"
namespace RobotGui {
/// simulation dialog for the TaskView
class RobotGuiExport TaskDlgSimulate : public Gui::TaskView::TaskDialog
{

11
src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.cpp
View File

@@ -20,23 +20,20 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QApplication>
#endif
#include "TaskDlgTrajectoryCompound.h"
#include <Gui/TaskView/TaskSelectLinkProperty.h>
#include <Gui/Document.h>
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/TaskView/TaskSelectLinkProperty.h>
#include "TaskDlgTrajectoryCompound.h"
using namespace RobotGui;
//**************************************************************************
//**************************************************************************
// TaskDialog

3
src/Mod/Robot/Gui/TaskDlgTrajectoryCompound.h
View File

@@ -20,7 +20,6 @@
* *
***************************************************************************/
#ifndef ROBOTGUI_TaskDlgTrajectoryCompound_H
#define ROBOTGUI_TaskDlgTrajectoryCompound_H
@@ -31,10 +30,8 @@
// forward
namespace Gui { namespace TaskView { class TaskSelectLinkProperty;}}
namespace RobotGui {
/// simulation dialog for the TaskView
class RobotGuiExport TaskDlgTrajectoryCompound : public Gui::TaskView::TaskDialog
{

10
src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.cpp
View File

@@ -20,22 +20,16 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <Gui/Application.h>
#include <Gui/Document.h>
#include "TaskDlgTrajectoryDressUp.h"
#include <Gui/TaskView/TaskSelectLinkProperty.h>
#include <Gui/Document.h>
#include <Gui/Application.h>
using namespace RobotGui;
//**************************************************************************
//**************************************************************************
// TaskDialog

6
src/Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h
View File

@@ -20,24 +20,20 @@
* *
***************************************************************************/
#ifndef ROBOTGUI_TaskDlgTrajectoryDressUp_H
#define ROBOTGUI_TaskDlgTrajectoryDressUp_H
#include <Gui/TaskView/TaskDialog.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include <Mod/Robot/App/TrajectoryDressUpObject.h>
#include "TaskTrajectoryDressUpParameter.h"
// forward
namespace Gui { namespace TaskView { class TaskSelectLinkProperty;}}
namespace RobotGui {
/// simulation dialog for the TaskView
class RobotGuiExport TaskDlgTrajectoryDressUp : public Gui::TaskView::TaskDialog
{

17
src/Mod/Robot/Gui/TaskEdge2TracParameter.cpp
View File

@@ -20,23 +20,18 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QString>
#endif
#include <QString>
#include <QSlider>
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Document.h>
#include <Gui/ViewProvider.h>
#include "ui_TaskEdge2TracParameter.h"
#include "TaskEdge2TracParameter.h"
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/BitmapFactory.h>
#include <Gui/ViewProvider.h>
#include <Gui/WaitCursor.h>
#include <Base/Console.h>
#include <Gui/Selection.h>
using namespace RobotGui;

6
src/Mod/Robot/Gui/TaskEdge2TracParameter.h
View File

@@ -20,15 +20,11 @@
* *
***************************************************************************/
#ifndef GUI_TASKVIEW_TaskEdge2TracParameter_H
#define GUI_TASKVIEW_TaskEdge2TracParameter_H
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <Mod/Robot/App/Edge2TracObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
class Ui_TaskEdge2TracParameter;
@@ -43,8 +39,6 @@ class ViewProvider;
namespace RobotGui {
class TaskEdge2TracParameter : public Gui::TaskView::TaskBox
{
Q_OBJECT

21
src/Mod/Robot/Gui/TaskRobot6Axis.cpp
View File

@@ -20,30 +20,19 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <qpalette.h>
# include <QString>
#endif
#include <Base/Console.h>
#include <Base/UnitsApi.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Placement.h>
#include <Gui/Selection.h>
#include <QString>
#include <qpalette.h>
#include <QSlider>
#include "ui_TaskRobot6Axis.h"
#include "TaskRobot6Axis.h"
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/BitmapFactory.h>
#include <Gui/ViewProvider.h>
#include <Gui/WaitCursor.h>
#include <Gui/Selection.h>
#include <Gui/Placement.h>
using namespace RobotGui;
using namespace Gui;

4
src/Mod/Robot/Gui/TaskRobot6Axis.h
View File

@@ -20,15 +20,11 @@
* *
***************************************************************************/
#ifndef GUI_TASKVIEW_TaskRobot6Axis_H
#define GUI_TASKVIEW_TaskRobot6Axis_H
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
class Ui_TaskRobot6Axis;

13
src/Mod/Robot/Gui/TaskRobotControl.cpp
View File

@@ -20,23 +20,12 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <Gui/BitmapFactory.h>
#include <QString>
#include <QSlider>
#include "ui_TaskRobotControl.h"
#include "TaskRobotControl.h"
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/BitmapFactory.h>
#include <Gui/ViewProvider.h>
#include <Gui/WaitCursor.h>
#include <Base/Console.h>
#include <Gui/Selection.h>
using namespace RobotGui;

5
src/Mod/Robot/Gui/TaskRobotControl.h
View File

@@ -20,15 +20,12 @@
* *
***************************************************************************/
#ifndef GUI_TASKVIEW_TaskRobotControl_H
#define GUI_TASKVIEW_TaskRobotControl_H
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
class Ui_TaskRobotControl;
@@ -43,8 +40,6 @@ class ViewProvider;
namespace RobotGui {
class TaskRobotControl : public Gui::TaskView::TaskBox
{
Q_OBJECT

13
src/Mod/Robot/Gui/TaskRobotMessages.cpp
View File

@@ -20,23 +20,12 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <Gui/BitmapFactory.h>
#include <QString>
#include <QSlider>
#include "ui_TaskRobotMessages.h"
#include "TaskRobotMessages.h"
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/BitmapFactory.h>
#include <Gui/ViewProvider.h>
#include <Gui/WaitCursor.h>
#include <Base/Console.h>
#include <Gui/Selection.h>
using namespace RobotGui;

4
src/Mod/Robot/Gui/TaskRobotMessages.h
View File

@@ -20,15 +20,11 @@
* *
***************************************************************************/
#ifndef GUI_TASKVIEW_TaskRobotMessages_H
#define GUI_TASKVIEW_TaskRobotMessages_H
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
class Ui_TaskRobotMessages;

13
src/Mod/Robot/Gui/TaskTrajectory.cpp
View File

@@ -20,21 +20,14 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Document.h>
#include "ui_TaskTrajectory.h"
#include "TaskTrajectory.h"
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/BitmapFactory.h>
#include <Gui/ViewProvider.h>
#include <Gui/WaitCursor.h>
#include <Base/Console.h>
#include <Gui/Selection.h>
using namespace RobotGui;

11
src/Mod/Robot/Gui/TaskTrajectory.h
View File

@@ -20,21 +20,14 @@
* *
***************************************************************************/
#ifndef GUI_TASKVIEW_TaskTrajectory_H
#define GUI_TASKVIEW_TaskTrajectory_H
#include <Base/UnitsApi.h>
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <Gui/TaskView/TaskView.h>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/Robot6Axis.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include <Mod/Robot/App/Trajectory.h>
#include <Mod/Robot/App/Simulation.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include "ViewProviderRobotObject.h"

17
src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.cpp
View File

@@ -20,24 +20,17 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QString>
#endif
#include <QString>
#include <QSlider>
#include "ui_TaskTrajectoryDressUpParameter.h"
#include "TaskTrajectoryDressUpParameter.h"
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/BitmapFactory.h>
#include <Gui/ViewProvider.h>
#include <Gui/WaitCursor.h>
#include <Base/Console.h>
#include <Gui/Selection.h>
#include <Gui/Placement.h>
#include <Gui/Selection.h>
#include "TaskTrajectoryDressUpParameter.h"
#include "ui_TaskTrajectoryDressUpParameter.h"
using namespace RobotGui;

8
src/Mod/Robot/Gui/TaskTrajectoryDressUpParameter.h
View File

@@ -20,25 +20,17 @@
* *
***************************************************************************/
#ifndef GUI_TASKVIEW_TaskTrajectoryDressUpParameter_h
#define GUI_TASKVIEW_TaskTrajectoryDressUpParameter_h
#include <Gui/TaskView/TaskView.h>
#include <Gui/Selection.h>
#include <Mod/Robot/App/Edge2TracObject.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include <Mod/Robot/App/TrajectoryDressUpObject.h>
class Ui_TaskTrajectoryDressUpParameter;
namespace RobotGui {
class TaskTrajectoryDressUpParameter : public Gui::TaskView::TaskBox
{
Q_OBJECT

9
src/Mod/Robot/Gui/TaskWatcher.cpp
View File

@@ -20,22 +20,13 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QPixmap>
#endif
#include "TaskWatcher.h"
#include <Gui/SelectionObject.h>
using namespace RobotGui;
//**************************************************************************
//**************************************************************************
// TaskWatcher

5
src/Mod/Robot/Gui/TaskWatcher.h
View File

@@ -20,17 +20,14 @@
* *
***************************************************************************/
#ifndef ROBOTGUI_TASKWATCHER_H
#define ROBOTGUI_TASKWATCHER_H
#include <Gui/TaskView/TaskWatcher.h>
#include "TaskRobot6Axis.h"
#include "TaskRobotControl.h"
#include <QObject>
namespace RobotGui {

38
src/Mod/Robot/Gui/TrajectorySimulate.cpp
View File

@@ -20,25 +20,18 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <QTimer>
#endif
#include <QTimer>
#include "ui_TrajectorySimulate.h"
#include "TrajectorySimulate.h"
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/BitmapFactory.h>
#include <Gui/ViewProvider.h>
#include <Gui/WaitCursor.h>
#include <Base/Console.h>
#include <Gui/Selection.h>
#include <Mod/Robot/App/Waypoint.h>
#include "ui_TrajectorySimulate.h"
#include "TrajectorySimulate.h"
using namespace RobotGui;
using namespace Gui;
@@ -83,21 +76,20 @@ TrajectorySimulate::TrajectorySimulate(Robot::RobotObject *pcRobotObject,Robot::
}
QObject::connect(ui->ButtonStepStart ,SIGNAL(clicked()),this,SLOT(start()));
QObject::connect(ui->ButtonStepStop ,SIGNAL(clicked()),this,SLOT(stop()));
QObject::connect(ui->ButtonStepRun ,SIGNAL(clicked()),this,SLOT(run()));
QObject::connect(ui->ButtonStepBack ,SIGNAL(clicked()),this,SLOT(back()));
QObject::connect(ui->ButtonStepForward ,SIGNAL(clicked()),this,SLOT(forward()));
QObject::connect(ui->ButtonStepEnd ,SIGNAL(clicked()),this,SLOT(end()));
QObject::connect(ui->ButtonStepStart, SIGNAL(clicked()), this, SLOT(start()));
QObject::connect(ui->ButtonStepStop, SIGNAL(clicked()), this, SLOT(stop()));
QObject::connect(ui->ButtonStepRun, SIGNAL(clicked()), this, SLOT(run()));
QObject::connect(ui->ButtonStepBack, SIGNAL(clicked()), this, SLOT(back()));
QObject::connect(ui->ButtonStepForward, SIGNAL(clicked()), this, SLOT(forward()));
QObject::connect(ui->ButtonStepEnd, SIGNAL(clicked()), this, SLOT(end()));
// set up timer
timer = new QTimer( this );
timer = new QTimer(this);
timer->setInterval(100);
QObject::connect(timer ,SIGNAL(timeout ()),this,SLOT(timerDone()));
QObject::connect(ui->timeSpinBox ,SIGNAL(valueChanged(double)), this, SLOT(valueChanged(double)) );
QObject::connect(ui->timeSlider ,SIGNAL(valueChanged(int) ), this, SLOT(valueChanged(int)) );
QObject::connect(timer, SIGNAL(timeout()), this, SLOT(timerDone()));
QObject::connect(ui->timeSpinBox, SIGNAL(valueChanged(double)), this,
SLOT(valueChanged(double)));
QObject::connect(ui->timeSlider, SIGNAL(valueChanged(int)), this, SLOT(valueChanged(int)));
// get the view provider
ViewProv = static_cast<ViewProviderRobotObject*>(Gui::Application::Instance->activeDocument()->getViewProvider(pcRobotObject) );

8
src/Mod/Robot/Gui/TrajectorySimulate.h
View File

@@ -20,19 +20,15 @@
* *
***************************************************************************/
#ifndef GUI_TASKVIEW_TrajectorySimulate_H
#define GUI_TASKVIEW_TrajectorySimulate_H
#include <QDialog>
#include <memory>
#include <QDialog>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Robot/App/Robot6Axis.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include <Mod/Robot/App/Trajectory.h>
#include <Mod/Robot/App/Simulation.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include "ViewProviderRobotObject.h"

8
src/Mod/Robot/Gui/ViewProviderEdge2TracObject.cpp
View File

@@ -20,16 +20,14 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include "ViewProviderEdge2TracObject.h"
#include <Gui/Control.h>
#include <Mod/Robot/Gui/TaskDlgEdge2Trac.h>
#include "ViewProviderEdge2TracObject.h"
using namespace Gui;
using namespace RobotGui;

27
src/Mod/Robot/Gui/ViewProviderRobotObject.cpp
View File

@@ -20,36 +20,29 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <sstream>
# include <QFile>
# include <Inventor/SoDB.h>
# include <Inventor/SoInput.h>
# include <Inventor/SbVec3f.h>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoTransform.h>
# include <Inventor/nodes/SoSphere.h>
# include <Inventor/nodes/SoRotation.h>
# include <Inventor/actions/SoSearchAction.h>
# include <Inventor/draggers/SoJackDragger.h>
# include <Inventor/draggers/SoTrackballDragger.h>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/VRMLnodes/SoVRMLTransform.h>
# include <QFile>
#endif
#include "ViewProviderRobotObject.h"
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Part/App/PartFeature.h>
#include <Mod/Part/Gui/ViewProvider.h>
#include <App/Document.h>
#include <App/VRMLObject.h>
#include <Gui/Application.h>
#include <Base/FileInfo.h>
#include <Base/Stream.h>
#include <Base/Console.h>
#include <sstream>
#include <Mod/Robot/App/RobotObject.h>
#include <Mod/Part/Gui/ViewProvider.h>
#include "ViewProviderRobotObject.h"
using namespace Gui;
using namespace RobotGui;

8
src/Mod/Robot/Gui/ViewProviderRobotObject.h
View File

@@ -20,14 +20,14 @@
* *
***************************************************************************/
#ifndef ROBOT_VIEWPROVIDERROBOTOBJECT_H
#define ROBOT_VIEWPROVIDERROBOTOBJECT_H
#include <Inventor/VRMLnodes/SoVRMLTransform.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/SoFCSelection.h>
#include <Base/Placement.h>
#include <Gui/SoFCSelection.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Inventor/VRMLnodes/SoVRMLTransform.h>
class SoDragger;
class SoJackDragger;

37
src/Mod/Robot/Gui/ViewProviderTrajectory.cpp
View File

@@ -20,43 +20,28 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <Inventor/SoDB.h>
# include <Inventor/SoInput.h>
# include <Inventor/SbVec3f.h>
# include <Inventor/nodes/SoSeparator.h>
# include <Inventor/nodes/SoTransform.h>
# include <Inventor/nodes/SoSphere.h>
# include <Inventor/nodes/SoRotation.h>
# include <Inventor/actions/SoSearchAction.h>
# include <Inventor/draggers/SoJackDragger.h>
# include <Inventor/VRMLnodes/SoVRMLTransform.h>
# include <sstream>
# include <QAction>
# include <QMenu>
# include <Inventor/nodes/SoBaseColor.h>
# include <Inventor/nodes/SoCoordinate3.h>
# include <Inventor/nodes/SoDrawStyle.h>
# include <Inventor/nodes/SoFaceSet.h>
# include <Inventor/nodes/SoLineSet.h>
# include <Inventor/nodes/SoMarkerSet.h>
# include <Inventor/nodes/SoShapeHints.h>
# include <QFile>
# include <QAction>
# include <QMenu>
# include <Inventor/nodes/SoSeparator.h>
#endif
#include <App/Application.h>
#include <App/Document.h>
#include <Gui/Inventor/MarkerBitmaps.h>
#include <Mod/Robot/App/TrajectoryObject.h>
#include "ViewProviderTrajectory.h"
#include <Mod/Robot/App/TrajectoryObject.h>
#include <Mod/Robot/App/Trajectory.h>
#include <App/Document.h>
#include <Base/FileInfo.h>
#include <Base/Stream.h>
#include <Base/Console.h>
#include <App/Application.h>
#include <Gui/Inventor/MarkerBitmaps.h>
#include <sstream>
using namespace Gui;
using namespace RobotGui;
using namespace Robot;

9
src/Mod/Robot/Gui/ViewProviderTrajectory.h
View File

@@ -20,18 +20,17 @@
* *
***************************************************************************/
#ifndef ROBOT_ViewProviderTrajectory_H
#define ROBOT_ViewProviderTrajectory_H
#include <Inventor/VRMLnodes/SoVRMLTransform.h>
#include <Gui/ViewProviderGeometryObject.h>
#include <Gui/SoFCSelection.h>
#include <Gui/ViewProviderGeometryObject.h>
class SoDragger;
class SoJackDragger;
class SoCoordinate3;
class SoDragger;
class SoDrawStyle;
class SoJackDragger;
class SoLineSet;
namespace RobotGui

8
src/Mod/Robot/Gui/ViewProviderTrajectoryCompound.cpp
View File

@@ -20,17 +20,15 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include "ViewProviderTrajectoryCompound.h"
#include <Gui/Control.h>
#include <Mod/Robot/Gui/TaskDlgTrajectoryCompound.h>
#include <Mod/Robot/App/TrajectoryCompound.h>
#include "ViewProviderTrajectoryCompound.h"
using namespace Gui;
using namespace RobotGui;

8
src/Mod/Robot/Gui/ViewProviderTrajectoryDressUp.cpp
View File

@@ -20,16 +20,14 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
#endif
#include "ViewProviderTrajectoryDressUp.h"
#include <Gui/Control.h>
#include <Mod/Robot/Gui/TaskDlgTrajectoryDressUp.h>
#include "ViewProviderTrajectoryDressUp.h"
using namespace Gui;
using namespace RobotGui;

12
src/Mod/Robot/Gui/Workbench.cpp
View File

@@ -20,26 +20,24 @@
* *
***************************************************************************/
#include "PreCompiled.h"
#ifndef _PreComp_
# include <qobject.h>
# include <QDir>
# include <qobject.h>
# include <QFileInfo>
# include <QMessageBox>
#endif
#include "Workbench.h"
#include <App/Application.h>
#include <Gui/ToolBarManager.h>
#include <Gui/MenuManager.h>
#include <Gui/MainWindow.h>
#include <Gui/Control.h>
#include <Gui/MainWindow.h>
#include <Gui/MenuManager.h>
#include <Gui/ToolBarManager.h>
#include <Gui/WaitCursor.h>
#include <Gui/TaskView/TaskView.h>
#include <Gui/TaskView/TaskWatcher.h>
#include "Workbench.h"
#include "TaskWatcher.h"

2
src/Mod/Robot/Gui/Workbench.h
View File

@@ -20,13 +20,13 @@
* *
***************************************************************************/
#ifndef IMAGE_WORKBENCH_H
#define IMAGE_WORKBENCH_H
#include <Gui/Workbench.h>
#include <Gui/TaskView/TaskWatcher.h>
namespace RobotGui {
/**