Some fixes for ProfileLib

FreeCAD · Apr 17, 2014 · 55d0ad5 · 55d0ad5
1 parent 2a950d6
commit 55d0ad5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt
@@ -105,6 +105,7 @@ SET(Sketcher_Scripts
 	TestSketcherApp.py
 	Profiles.py
 	ProfileLib/Hexagon.py
+	ProfileLib/__init__.py
 )
 
 add_library(Sketcher SHARED ${Sketcher_SRCS})

diff --git a/src/Mod/Sketcher/InitGui.py b/src/Mod/Sketcher/InitGui.py
@@ -70,9 +70,11 @@ def Initialize(self):
 		# load the module
 		import SketcherGui
 		import Sketcher
-		#try:
-		#	import Profiles
-		#except: pass 
+		try:
+			import Profiles
+		except:
+			print "Error in Profiles module"
+
 	def GetClassName(self):
 		return "SketcherGui::Workbench"
 

diff --git a/src/Mod/Sketcher/Profiles.py b/src/Mod/Sketcher/Profiles.py
@@ -20,8 +20,14 @@
 #*                                                                         *
 #***************************************************************************
 
-import FreeCAD, FreeCADGui, Sketcher
+import FreeCAD, Sketcher
 
+if FreeCAD.GuiUp:
+    import FreeCADGui,SketcherGui
+    from PySide import QtCore, QtGui
+    from PySide.QtCore import Qt
+    from PySide.QtGui import QApplication, QCursor
+    from FreeCADGui import PySideUic as uic
 
 __title__="Sketcher profile lib handling"
 __author__ = "Juergen Riegel"
@@ -35,19 +41,19 @@ class _CommandProfileHexagon1:
     "The basis hexagon profile command definition"
     def GetResources(self):
         return {'Pixmap'  : 'Sketcher_Hexagon',
-                'MenuText': QtCore.QT_TRANSLATE_NOOP("Creates a hexagon profile in the sketch"),
+                'MenuText': QtCore.QT_TRANSLATE_NOOP("Sketcher_ProfilesHexagon1","Creates a hexagon profile in the sketch"),
                 'Accel': "",
                 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Sketcher_ProfilesHexagon1","Creates a hexagon profile in the sketch")}
 
     def Activated(self):
 
         FreeCAD.ActiveDocument.openTransaction("Create hexagon profile")
         FreeCADGui.addModule("ProfileLib.Hexagon")
-        FreeCADGui.doCommand("Hexagon.makeHexagonSimple()")
+        FreeCADGui.doCommand("ProfileLib.Hexagon.makeHexagonSimple()")
 
     def IsActive(self):
         return isProfileActive()
 
-       
-         
+
+
 FreeCADGui.addCommand('Sketcher_ProfilesHexagon1',_CommandProfileHexagon1())