Skip to content

Commit 4ec805c

Browse files
Alxiicecbentejac
Alxiice
authored and
cbentejac
committed
[chunks] Apply typos/cleaning suggestions from @cbentejac 
1 parent 746e0ff commit 4ec805c

File tree

5 files changed

+22
-33
lines changed

5 files changed

+22
-33
lines changed

‎bin/meshroom_createChunks‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ if not args.forceStatus and not args.forceCompute:
126126
f"\"{chunk.status.status.name}\". See file: \"{chunk.statusFile}\". " \
127127
f"ExecMode: {chunk.status.execMode.name}, computeSessionUid: {chunk.status.computeSessionUid}, " \
128128
f"submitterSessionUid: {node._nodeStatus.submitterSessionUid}")
129-
# sys.exit(-1)
130129

131130
if chunksToProcess:
132131
node.prepareLogger()

‎meshroom/core/desc/computation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class Level(IntEnum):
88
NONE = 0
99
NORMAL = 1
1010
INTENSIVE = 2
11-
EXTREME = 2
11+
EXTREME = 3
1212
SCRIPT=-1
1313

1414

‎meshroom/core/node.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ def initEndCompute(self):
326326
@property
327327
def elapsedTimeStr(self):
328328
return str(datetime.timedelta(seconds=self.elapsedTime))
329-
329+
330330
def toDict(self):
331331
keys = list(self.__slots__) or []
332332
d = {key:getattr(self, key) for key in keys}
@@ -2600,6 +2600,3 @@ def upgrade(self):
26002600
compatibilityIssue = Property(int, lambda self: self.issue.value, constant=True)
26012601
canUpgrade = Property(bool, canUpgrade.fget, constant=True)
26022602
issueDetails = Property(str, issueDetails.fget, constant=True)
2603-
2604-
issueDetails = Property(str, issueDetails.fget, constant=True)
2605-

‎meshroom/ui/graph.py‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ def stopTask(self, chunk: NodeChunk):
619619
job.stopChunkTask(node, chunkIteration)
620620
except Exception as e:
621621
self.parent().showMessage(f"Failed to stop chunk {chunkIteration} of {node.label}", "error")
622-
logging.warning(f"Error on stopTask :\n{e}")
622+
logging.warning(f"Error on stopTask:\n{e}")
623623
else:
624624
chunk.updateStatusFromCache()
625625
chunk.upgradeStatusTo(Status.STOPPED)
@@ -645,7 +645,7 @@ def stopNode(self, node: Node):
645645
job.stopChunkTask(node, -1)
646646
except Exception as e:
647647
self.parent().showMessage(f"Failed to stop node {node.label}", "error")
648-
logging.warning(f"Error on stopTask :\n{e}")
648+
logging.warning(f"Error on stopTask:\n{e}")
649649
else:
650650
node.updateNodeStatusFromCache()
651651
node.upgradeStatusTo(Status.STOPPED)
@@ -654,7 +654,6 @@ def stopNode(self, node: Node):
654654
else:
655655
self.cancelNodeComputation(node)
656656
node.stopComputation()
657-
# self._taskManager.removeNode(node, processList=True)
658657

659658
@Slot(NodeChunk)
660659
def restartTask(self, chunk: NodeChunk):
@@ -671,7 +670,7 @@ def restartTask(self, chunk: NodeChunk):
671670
chunk.updateStatusFromCache()
672671
chunk.upgradeStatusTo(Status.ERROR)
673672
self.parent().showMessage(f"Failed to relaunch chunk {chunkIteration} of {node.label}", "error")
674-
logging.warning(f"Error on restartTask :\n{e}")
673+
logging.warning(f"Error on restartTask:\n{e}")
675674
else:
676675
self.parent().showMessage(f"Relaunched chunk {chunkIteration} of {node.label}")
677676
else:
@@ -695,7 +694,7 @@ def skipTask(self, chunk: NodeChunk):
695694
job.skipChunkTask(node, chunkIteration)
696695
except Exception as e:
697696
self.parent().showMessage(f"Failed to skip chunk {chunkIteration} of {node.label}", "error")
698-
logging.warning(f"Error on skipTask :\n{e}")
697+
logging.warning(f"Error on skipTask:\n{e}")
699698
else:
700699
chunk.upgradeStatusTo(Status.SUCCESS)
701700
self.parent().showMessage(f"Skipped chunk {chunkIteration} of {node.label}")
@@ -715,12 +714,12 @@ def pauseJob(self, node: Node):
715714
try:
716715
job.pauseJob()
717716
except Exception as e:
718-
logging.warning(f"Error on pauseJob :\n{e}")
717+
logging.warning(f"Error on pauseJob:\n{e}")
719718
self.parent().showMessage(f"Failed to pause the job for node {node}", "error")
720719
else:
721720
self.parent().showMessage(f"Paused node {node.label} on farm")
722721
elif not node.isExtern():
723-
self.parent().showMessage(f"PauseJob is only available in local computation mode !", "warning")
722+
self.parent().showMessage(f"PauseJob is only available in external computation mode!", "warning")
724723
else:
725724
self.parent().showMessage(f"Cannot retrieve the job", "error")
726725

@@ -734,8 +733,8 @@ def resumeJob(self, node: Node):
734733
try:
735734
job.resumeJob()
736735
except Exception as e:
737-
self.parent().showMessage(f"Failed to rsume node {node.label} on farm")
738-
logging.warning(f"Error on resumeJob :\n{e}")
736+
self.parent().showMessage(f"Failed to resume node {node.label} on farm")
737+
logging.warning(f"Error on resumeJob:\n{e}")
739738
else:
740739
self.parent().showMessage(f"Resumed the job for node {node}")
741740
else:
@@ -754,7 +753,7 @@ def interruptJob(self, node: Node):
754753
job.interruptJob()
755754
except Exception as e:
756755
self.parent().showMessage(f"Failed to interrupt node {node.label} on farm", "error")
757-
logging.warning(f"Error on interruptJob :\n{e}")
756+
logging.warning(f"Error on interruptJob:\n{e}")
758757
else:
759758
for chunk in self._sortedDFSChunks:
760759
if jobManager.getNodeJob(chunk.node) == job:
@@ -794,9 +793,9 @@ def restartJobErrorTasks(self, node: Node):
794793
job.resumeJob()
795794
except Exception as e:
796795
self.parent().showMessage(f"Failed to restart error tasks for node {node.label} on farm", "error")
797-
logging.warning(f"Error on restartJobErrorTasks :\n{e}")
796+
logging.warning(f"Error on restartJobErrorTasks:\n{e}")
798797
else:
799-
self.parent().showMessage(f"Restared error tasks for the node {node}")
798+
self.parent().showMessage(f"Restarted error tasks for the node {node}")
800799
else:
801800
# In this case user can just relaunch the node computation
802801
# Could be implemented if we had a paused state on the task manager

‎meshroom/ui/qml/GraphEditor/TaskManager.qml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Item {
8888
spacing: 2
8989

9090
MaterialToolButton {
91-
ToolTip.text: "Stop task"
91+
ToolTip.text: "Stop Task"
9292
Layout.alignment: Qt.AlignHCenter
9393
enabled: selectedChunk !== null || root.uigraph.selectedNode !== null
9494
text: MaterialIcons.stop_circle
@@ -103,7 +103,7 @@ Item {
103103
}
104104

105105
MaterialToolButton {
106-
ToolTip.text: "Restart task"
106+
ToolTip.text: "Restart Task"
107107
Layout.alignment: Qt.AlignHCenter
108108
enabled: selectedChunk !== null
109109
text: MaterialIcons.replay_circle_filled
@@ -114,7 +114,7 @@ Item {
114114
}
115115

116116
MaterialToolButton {
117-
ToolTip.text: "Skip task"
117+
ToolTip.text: "Skip Task"
118118
Layout.alignment: Qt.AlignHCenter
119119
enabled: selectedChunk !== null
120120
text: MaterialIcons.skip_next
@@ -143,8 +143,6 @@ Item {
143143

144144
// Job toolbar
145145
Rectangle {
146-
// Layout.preferredWidth: childrenRect.width
147-
// Layout.preferredHeight: childrenRect.height
148146
Layout.preferredWidth: 40
149147
Layout.preferredHeight: jobColumn.height + 8
150148
color: "transparent"
@@ -158,7 +156,7 @@ Item {
158156
spacing: 2
159157

160158
MaterialToolButton {
161-
ToolTip.text: "Pause job"
159+
ToolTip.text: "Pause Job"
162160
Layout.alignment: Qt.AlignHCenter
163161
enabled: root.uigraph.selectedNode !== null
164162
text: MaterialIcons.pause_circle_filled
@@ -169,7 +167,7 @@ Item {
169167
}
170168

171169
MaterialToolButton {
172-
ToolTip.text: "Resume job"
170+
ToolTip.text: "Resume Job"
173171
Layout.alignment: Qt.AlignHCenter
174172
enabled: root.uigraph.selectedNode !== null
175173
text: MaterialIcons.play_circle_filled
@@ -180,7 +178,7 @@ Item {
180178
}
181179

182180
MaterialToolButton {
183-
ToolTip.text: "Interrupt job"
181+
ToolTip.text: "Interrupt Job"
184182
Layout.alignment: Qt.AlignHCenter
185183
enabled: root.uigraph.selectedNode !== null
186184
text: MaterialIcons.stop_circle
@@ -191,10 +189,10 @@ Item {
191189
}
192190

193191
MaterialToolButton {
194-
ToolTip.text: "Restart all error tasks"
192+
ToolTip.text: "Restart All Error Tasks"
195193
Layout.alignment: Qt.AlignHCenter
196194
enabled: root.uigraph.selectedNode !== null
197-
text: MaterialIcons.replay_circle_filled // MaterialIcons.restart_alt
195+
text: MaterialIcons.replay_circle_filled
198196
font.pointSize: 15
199197
onClicked: {
200198
uigraph.restartJobErrorTasks(uigraph.selectedNode)
@@ -439,9 +437,6 @@ Item {
439437

440438
delegate: Loader {
441439
id: chunkDelegate
442-
// width: ListView.view.model
443-
// ? ListView.view.width / ListView.view.model.count - chunkList.spacing
444-
// : 0
445440
width: ListView.view.model
446441
? (ListView.view.width - (ListView.view.model.count - 1) * chunkList.spacing) / ListView.view.model.count
447442
: 0
@@ -473,8 +468,7 @@ Item {
473468
visible: enabled
474469
anchors.fill: parent
475470
background: Rectangle {
476-
color: Colors.darkpurple
477-
// color: Colors.getNodeColor(chunkList.node, {"NONE": Colors.darkpurple})
471+
color: Colors.getNodeColor(chunkList.node, {"NONE": Colors.darkpurple})
478472
radius: 3
479473
border.width: 2
480474
border.color: (chunkList.node === uigraph.selectedNode) ? Qt.lighter(color, 1.3) : "transparent"

0 commit comments

Comments
 (0)