- Added construction lines switching
- Moved callbacks into sketchwidget from main. - Changed reset on right click
This commit is contained in:
63
main.py
63
main.py
@@ -120,13 +120,13 @@ class MainWindow(QMainWindow):
|
||||
self.ui.pb_flip_face.pressed.connect(self.on_flip_face)
|
||||
|
||||
###Modes
|
||||
self.ui.pb_linetool.pressed.connect(self.act_line_mode)
|
||||
self.ui.pb_con_ptpt.pressed.connect(self.act_constrain_pt_pt_mode)
|
||||
self.ui.pb_con_line.pressed.connect(self.act_constrain_pt_line_mode)
|
||||
self.ui.pb_con_horiz.pressed.connect(self.act_constrain_horiz_line_mode)
|
||||
self.ui.pb_con_vert.pressed.connect(self.act_constrain_vert_line_mode)
|
||||
self.ui.pb_con_dist.pressed.connect(self.act_constrain_distance_mode)
|
||||
self.ui.pb_con_mid.pressed.connect(self.act_constrain_mid_point_mode)
|
||||
self.ui.pb_linetool.clicked.connect(self.sketchWidget.act_line_mode)
|
||||
self.ui.pb_con_ptpt.clicked.connect(self.sketchWidget.act_constrain_pt_pt_mode)
|
||||
self.ui.pb_con_line.clicked.connect(self.sketchWidget.act_constrain_pt_line_mode)
|
||||
self.ui.pb_con_horiz.clicked.connect(self.sketchWidget.act_constrain_horiz_line_mode)
|
||||
self.ui.pb_con_vert.clicked.connect(self.sketchWidget.act_constrain_vert_line_mode)
|
||||
self.ui.pb_con_dist.clicked.connect(self.sketchWidget.act_constrain_distance_mode)
|
||||
self.ui.pb_con_mid.clicked.connect(self.sketchWidget.act_constrain_mid_point_mode)
|
||||
|
||||
### Operations
|
||||
self.ui.pb_extrdop.pressed.connect(self.send_extrude)
|
||||
@@ -137,9 +137,8 @@ class MainWindow(QMainWindow):
|
||||
self.setFocusPolicy(Qt.StrongFocus)
|
||||
|
||||
self.send_command.connect(self.custom_3D_Widget.on_receive_command)
|
||||
|
||||
self.ui.actionNew_Project.triggered.connect(self.new_project)
|
||||
|
||||
self.ui.pb_enable_construct.clicked.connect(self.sketchWidget.on_construct_change)
|
||||
self.project = Project()
|
||||
self.new_project()
|
||||
|
||||
@@ -156,7 +155,6 @@ class MainWindow(QMainWindow):
|
||||
self.project.timeline = timeline
|
||||
self.new_component()
|
||||
|
||||
|
||||
def new_component(self):
|
||||
print("Creating a new component...")
|
||||
|
||||
@@ -270,7 +268,7 @@ class MainWindow(QMainWindow):
|
||||
sketch.original_sketch = sketch_from_widget
|
||||
|
||||
#Get parameters
|
||||
points = sketch_from_widget.points
|
||||
points = [point for point in sketch_from_widget.points if hasattr(point, 'is_helper') and not point.is_helper]
|
||||
|
||||
sketch.convert_points_for_sdf(points)
|
||||
sketch.id = sketch_from_widget.id
|
||||
@@ -353,49 +351,6 @@ class MainWindow(QMainWindow):
|
||||
def on_flip_face(self):
|
||||
self.send_command.emit("flip")
|
||||
|
||||
def act_line_mode(self):
|
||||
if not self.ui.pb_linetool.isChecked():
|
||||
self.sketchWidget.mouse_mode = 'line'
|
||||
else:
|
||||
self.sketchWidget.mouse_mode = None
|
||||
self.sketchWidget.line_draw_buffer = [None, None]
|
||||
|
||||
def act_constrain_pt_pt_mode(self):
|
||||
if not self.ui.pb_con_ptpt.isChecked():
|
||||
self.sketchWidget.mouse_mode = 'pt_pt'
|
||||
else:
|
||||
self.sketchWidget.mouse_mode = None
|
||||
|
||||
def act_constrain_pt_line_mode(self):
|
||||
if not self.ui.pb_con_line.isChecked():
|
||||
self.sketchWidget.mouse_mode = 'pt_line'
|
||||
else:
|
||||
self.sketchWidget.mouse_mode = None
|
||||
|
||||
def act_constrain_horiz_line_mode(self):
|
||||
if not self.ui.pb_con_horiz.isChecked():
|
||||
self.sketchWidget.mouse_mode = 'horiz'
|
||||
else:
|
||||
self.sketchWidget.mouse_mode = None
|
||||
|
||||
def act_constrain_vert_line_mode(self):
|
||||
if not self.ui.pb_con_vert.isChecked():
|
||||
self.sketchWidget.mouse_mode = 'vert'
|
||||
else:
|
||||
self.sketchWidget.mouse_mode = None
|
||||
|
||||
def act_constrain_distance_mode(self):
|
||||
if not self.ui.pb_con_dist.isChecked():
|
||||
self.sketchWidget.mouse_mode = 'distance'
|
||||
else:
|
||||
self.sketchWidget.mouse_mode = None
|
||||
|
||||
def act_constrain_mid_point_mode(self):
|
||||
if not self.ui.pb_con_mid.isChecked():
|
||||
self.sketchWidget.mouse_mode = 'pb_con_mid'
|
||||
else:
|
||||
self.sketchWidget.mouse_mode = None
|
||||
|
||||
def draw_op_complete(self):
|
||||
# safely disable the line modes
|
||||
self.ui.pb_linetool.setChecked(False)
|
||||
|
||||
Reference in New Issue
Block a user