Skip to content

Commit

Permalink
defocus and one instance only
Browse files Browse the repository at this point in the history
  • Loading branch information
microelly2 committed Jul 8, 2015
1 parent 785ee77 commit 476d4b4
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 22 deletions.
2 changes: 2 additions & 0 deletions FCCamera.FCMacro
Original file line number Diff line number Diff line change
Expand Up @@ -659,3 +659,5 @@ ui = Ui_MainWindow()
ui.setupUi(MainWindow)
MainWindow.show()

t=FreeCADGui.getMainWindow()
t.activateWindow()
38 changes: 21 additions & 17 deletions FCRotateView.FCMacro
Original file line number Diff line number Diff line change
Expand Up @@ -190,21 +190,21 @@ class rotate_gui(QtGui.QWidget):
#carry out the desired rotation about self.direction
try:
val = value*pi/180.0
FreeCAD.Console.PrintMessage(" val: "+ str(val) + "\n")
# FreeCAD.Console.PrintMessage(" val: "+ str(val) + "\n")
rot = coin.SbRotation(self.direction, -val)
nrot = self.view*rot
prot = rot.multVec(self.pos - self.centre) + self.centre
self.cam.orientation = nrot
self.cam.position = prot
FreeCAD.Console.PrintMessage("Rot "+ str(value) +"\n!")
FreeCAD.Console.PrintMessage(str(nrot) + "\n")
# FreeCAD.Console.PrintMessage("Rot "+ str(value) +"\n!")
# FreeCAD.Console.PrintMessage(str(nrot) + "\n")
except:
sayexc()
FreeCAD.Console.PrintMessage("-------------------" + "\n")

def mysender(self):
if self.keyctrl:
FreeCAD.Console.PrintMessage("-------keyctrl ------------== " +str(self.keyctrl) + "\n")
#FreeCAD.Console.PrintMessage("-------keyctrl ------------== " +str(self.keyctrl) + "\n")
return (self.keyctrl - 1)
else:
return self.sender()
Expand All @@ -216,23 +216,23 @@ class rotate_gui(QtGui.QWidget):
try:

if self.internal:
FreeCAD.Console.PrintMessage("return intren\n")
# FreeCAD.Console.PrintMessage("return intren\n")
return
sender = self.mysender()
FreeCAD.Console.PrintMessage("sender " + str(sender) +"\n")
#FreeCAD.Console.PrintMessage("sender " + str(sender) +"\n")
if sender.__class__ == int:
i=sender
else:
for i in range(3):
if sender == self.sld[i]:
break
FreeCAD.Console.PrintMessage("valueChanged sender:" + str(sender) + " i= " +str(i)+ "\n")
#FreeCAD.Console.PrintMessage("valueChanged sender:" + str(sender) + " i= " +str(i)+ "\n")
self.tbox[i].setText(str(value))
FreeCAD.Console.PrintMessage("check ---")
self.check(i)
FreeCAD.Console.PrintMessage(" ---done check ---")
#FreeCAD.Console.PrintMessage(" ---done check ---")
self.rotate(value)
FreeCAD.Console.PrintMessage(" ---rotiert ---")
#FreeCAD.Console.PrintMessage(" ---rotiert ---")
except:
sayexc()

Expand Down Expand Up @@ -268,19 +268,19 @@ class rotate_gui(QtGui.QWidget):
self.rotate(value)

def rot(self, axis,delta):
FreeCAD.Console.PrintMessage("rot ..." + str(axis) +"\n")
#FreeCAD.Console.PrintMessage("rot ..." + str(axis) +"\n")
i=axis

value = int(self.tbox[i].text())
FreeCAD.Console.PrintMessage("ww 3" +str(value) +"! ")
#FreeCAD.Console.PrintMessage("ww 3" +str(value) +"! ")
value += delta
FreeCAD.Console.PrintMessage("ww4 " +str(value) +"! ")
#FreeCAD.Console.PrintMessage("ww4 " +str(value) +"! ")
self.sld[i].setValue(value)
self.internal = False
self.valueChange(value)
FreeCAD.Console.PrintMessage("ww 5 " +str(self.keyctrl) +"! ")
#FreeCAD.Console.PrintMessage("ww 5 " +str(self.keyctrl) +"! ")
# self.keyctrl=False

def rotZ(self, delta):
self.keyctrl=2
self.rot(1,delta)
Expand All @@ -296,12 +296,16 @@ class rotate_gui(QtGui.QWidget):
self.rot(0,delta)
self.keyctrl=False



if hasattr(FreeCAD,"ViewMgrRel")and FreeCAD.ViewMgrRel:
FreeCAD.ViewMgrRel.show()
FreeCAD.Console.PrintMessage("schon da")
pass
else:
FreeCAD.ViewMgrRel=rotate_gui()
FreeCAD.ViewMgrRel.show()
FreeCAD.Console.PrintMessage("erzeugt")
# FreeCAD.ViewMgrRel.show()


# defocus
t=FreeCADGui.getMainWindow()
t.activateWindow()
39 changes: 34 additions & 5 deletions FCRotateViewAbsolute.FCMacro
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Form(QDialog):
super(Form, self).__init__(parent)
self.alpha=00
self.beta=180

self.setWindowFlags(Qt.WindowStaysOnTopHint)

dial = QDial()
dial.setNotchesVisible(True)
Expand Down Expand Up @@ -58,6 +58,28 @@ class Form(QDialog):
self.beta=self.dial2.value()
self.cami()

def rotY(self,delta=10):
if self.beta==1:
self.beta=0

self.beta += delta
if self.beta >360:
self.beta -= 360
if self.beta <0:
self.beta += 360
if self.beta==0:
self.beta=1
FreeCAD.Console.PrintMessage(str(self.beta)+" # ");
self.dial2.setValue(self.beta)


def rotZ(self,delta=10):
self.alpha += delta
if self.alpha >360:
self.alpha -= 360
if self.alpha <0:
self.alpha += 360
self.dial.setValue(self.alpha)

def cami(self):

Expand All @@ -75,7 +97,7 @@ class Form(QDialog):
else:
Gui.activeDocument().activeView().setCameraType("Perspective")

campos=Base.Vector( 1000 * cos (pi*alpha/360)*sin(pi*beta/360), 1000*sin(pi*alpha/360)*sin(pi*beta/360), 1000*cos(pi*beta/360))
campos=Base.Vector( 1000 * cos (pi*alpha/360*2)*sin(pi*beta/360*1), 1000*sin(pi*alpha/360*2)*sin(pi*beta/360*1), 1000*cos(pi*beta/360*1))
camera.position.setValue( campos)

pos3=FreeCAD.Vector(0,0,0)
Expand All @@ -87,6 +109,13 @@ class Form(QDialog):
App.ActiveDocument.recompute()
FreeCADGui.updateGui()


form = Form()
form.show()
if hasattr(FreeCAD,"ViewMgr")and FreeCAD.ViewMgr:
FreeCAD.ViewMgr.show()
FreeCAD.Console.PrintMessage("neu gestrte")
else:
FreeCAD.ViewMgr=Form()
FreeCAD.ViewMgr.show()
FreeCAD.Console.PrintMessage(" war schon da")

t=FreeCADGui.getMainWindow()
t.activateWindow()

0 comments on commit 476d4b4

Please sign in to comment.