Cleared unused tools

FreeCAD · May 3, 2014 · 6094db6 · 6094db6
1 parent 12198fc
commit 6094db6
Show file tree

Hide file tree

Showing 23 changed files with 6 additions and 4,245 deletions.
diff --git a/src/Mod/Ship/CMakeLists.txt b/src/Mod/Ship/CMakeLists.txt
@@ -64,30 +64,7 @@ SET(ShipUtils_SRCS
 )
 SOURCE_GROUP("shiputils" FILES ${ShipUtils_SRCS})
 
-SET(ShipWeights_SRCS
-	tankWeights/__init__.py
-	tankWeights/Preview.py
-	tankWeights/TaskPanel.py
-	tankWeights/TaskPanel.ui
-)
-SOURCE_GROUP("shipweights" FILES ${ShipWeights_SRCS})
-
-SET(ShipCreateTank_SRCS
-	tankCreateTank/__init__.py
-	tankCreateTank/TaskPanel.py
-	tankCreateTank/TaskPanel.ui
-)
-SOURCE_GROUP("shipcreatetank" FILES ${ShipCreateTank_SRCS})
-
-SET(ShipGZ_SRCS
-	tankGZ/__init__.py
-	tankGZ/PlotAux.py
-	tankGZ/TaskPanel.py
-	tankGZ/TaskPanel.ui
-)
-SOURCE_GROUP("shipgz" FILES ${ShipGZ_SRCS})
-
-SET(all_files ${ShipMain_SRCS} ${ShipExamples_SRCS} ${ShipLoadExample_SRCS} ${ShipCreateShip_SRCS} ${ShipOutlineDraw_SRCS} ${ShipAreasCurve_SRCS} ${ShipHydrostatics_SRCS} ${ShipUtils_SRCS} ${ShipWeights_SRCS} ${ShipCreateTank_SRCS} ${ShipGZ_SRCS})
+SET(all_files ${ShipMain_SRCS} ${ShipExamples_SRCS} ${ShipLoadExample_SRCS} ${ShipCreateShip_SRCS} ${ShipOutlineDraw_SRCS} ${ShipAreasCurve_SRCS} ${ShipHydrostatics_SRCS} ${ShipUtils_SRCS})
 
 ADD_CUSTOM_TARGET(Ship ALL
     SOURCES ${all_files}
@@ -137,24 +114,6 @@ INSTALL(
     DESTINATION
         Mod/Ship/shipUtils
 )
-INSTALL(
-    FILES
-        ${ShipWeights_SRCS}
-    DESTINATION
-        Mod/Ship/tankWeights
-)
-INSTALL(
-    FILES
-        ${ShipCreateTank_SRCS}
-    DESTINATION
-        Mod/Ship/tankCreateTank
-)
-INSTALL(
-    FILES
-        ${ShipGZ_SRCS}
-    DESTINATION
-        Mod/Ship/tankGZ
-)
 INSTALL(
     FILES
         ${ShipMain_SRCS}

diff --git a/src/Mod/Ship/Makefile.am b/src/Mod/Ship/Makefile.am
@@ -37,18 +37,7 @@ nobase_data_DATA = \
 	shipHydrostatics/Tools.py \
 	shipUtils/__init__.py \
 	shipUtils/Math.py \
-	shipUtils/Paths.py \
-	tankWeights/__init__.py \
-	tankWeights/Preview.py \
-	tankWeights/TaskPanel.py \
-	tankWeights/TaskPanel.ui \
-	tankCreateTank/__init__.py \
-	tankCreateTank/TaskPanel.py \
-	tankCreateTank/TaskPanel.ui \
-	tankGZ/__init__.py \
-	tankGZ/PlotAux.py \
-	tankGZ/TaskPanel.py \
-	tankGZ/TaskPanel.ui
+	shipUtils/Paths.py
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/src/Mod/Ship/ShipGui.py b/src/Mod/Ship/ShipGui.py
@@ -119,62 +119,8 @@ def GetResources(self):
                 'ToolTip': ToolTip}
 
 
-class SetWeights:
-    def Activated(self):
-        import tankWeights
-        tankWeights.load()
-
-    def GetResources(self):
-        MenuText = QtCore.QT_TRANSLATE_NOOP(
-            'Ship_Weights',
-            'Set ship weights')
-        ToolTip = QtCore.QT_TRANSLATE_NOOP(
-            'Ship_Weights',
-            'Set the ship weights (tanks must be added later)')
-        return {'Pixmap': 'Weight',
-                'MenuText': MenuText,
-                'ToolTip': ToolTip}
-
-
-class CreateTank:
-    def Activated(self):
-        import tankCreateTank
-        tankCreateTank.load()
-
-    def GetResources(self):
-        MenuText = QtCore.QT_TRANSLATE_NOOP(
-            'Ship_CreateTank',
-            'Create a new tank')
-        ToolTip = QtCore.QT_TRANSLATE_NOOP(
-            'Ship_CreateTank',
-            'Create a new ship tank')
-        return {'Pixmap': 'Tank',
-                'MenuText': MenuText,
-                'ToolTip': ToolTip}
-
-
-class GZ:
-    def Activated(self):
-        import tankGZ
-        tankGZ.load()
-
-    def GetResources(self):
-        MenuText = QtCore.QT_TRANSLATE_NOOP(
-            'Ship_GZ',
-            'GZ curve')
-        ToolTip = QtCore.QT_TRANSLATE_NOOP(
-            'Ship_GZ',
-            'Transversal stability GZ curve computation')
-        return {'Pixmap': 'HydrostaticsIco',
-                'MenuText': MenuText,
-                'ToolTip': ToolTip}
-
-
 FreeCADGui.addCommand('Ship_LoadExample', LoadExample())
 FreeCADGui.addCommand('Ship_CreateShip', CreateShip())
 FreeCADGui.addCommand('Ship_OutlineDraw', OutlineDraw())
 FreeCADGui.addCommand('Ship_AreasCurve', AreasCurve())
 FreeCADGui.addCommand('Ship_Hydrostatics', Hydrostatics())
-FreeCADGui.addCommand('Ship_Weights', SetWeights())
-FreeCADGui.addCommand('Ship_CreateTank', CreateTank())
-FreeCADGui.addCommand('Ship_GZ', GZ())
diff --git a/src/Mod/Ship/Ship_rc.py b/src/Mod/Ship/Ship_rc.py
diff --git a/src/Mod/Ship/resources/Ship.qrc b/src/Mod/Ship/resources/Ship.qrc
@@ -7,8 +7,6 @@
         <file>icons/Ship_Logo.svg</file>
         <file>icons/Ship_Module.svg</file>
         <file>icons/Ship_OutlineDraw.svg</file>
-        <file>icons/Tank.png</file>
-        <file>icons/Weight.png</file>
         <file>translations/Ship.qm</file>
         <file>translations/Ship_af.qm</file>
         <file>translations/Ship_cs.qm</file>

diff --git a/src/Mod/Ship/resources/icons/Tank.png b/src/Mod/Ship/resources/icons/Tank.png
diff --git a/src/Mod/Ship/resources/icons/Tank.xcf b/src/Mod/Ship/resources/icons/Tank.xcf