majoplot 0.1.2__py3-none-any.whl → 0.1.4__py3-none-any.whl

majoplot/domain/base.py

@@ -38,7 +38,7 @@ class LabelValue(NamedTuple):
                 elif other.unit is None:
                     return False
                 else:
-                    return self.unit.name < other.unit.name
+                    return self.unit < other.unit
             else:
                 return True
         elif isinstance(other.value, Real):
@@ -216,7 +216,7 @@ class Data:
 
     @property
     def y_for_plot(self)->NDArray[np.floating]:
-        if self._ylim is None:
+        if self._y_for_plot is None:
             self._y_for_plot = self.points_for_plot[:,1]
         return self._y_for_plot
 
@@ -320,8 +320,8 @@ class AnnotationSpec(NamedTuple):
 class ArrowSpec(NamedTuple):
     point_x:float
     point_y:float
-    arrowstyle:str = "->",
-    color:str = "black",
+    arrowstyle:str = "->"
+    color:str = "black"
     linewidth:float = 1.0
 
 class IgnoreOutlierSpec(NamedTuple):
@@ -350,10 +350,10 @@ class MutiAxesSpec(Protocol):
         ...
 
 # ======== Proj & folder ========
-class folder(dict[str:Figure]):
+class folder(dict[str,Figure]):
     pass
 
-class Project(dict[str:folder]):
+class Project(dict[str,folder]):
     pass
 
 # ======== Scenario ========

majoplot/domain/muti_axes_spec.py

@@ -77,7 +77,6 @@ class InsertAxesSpec(NamedTuple):
                     else:
                         break
                 histograms[y, x] = h
-        import matplotlib.pyplot as plt
         @dataclass(slots=True)
         class Rectangle:
             x0:int|np.int_

majoplot/domain/scenarios/VSM/MT.py

@@ -12,7 +12,7 @@ H = "Magnetic Field (Oe)"
 
 
 class MT:
-    data_summary_label_names = ["H","cooling_type"]
+    data_summary_label_names = ["mass","H","cooling_type"]
     axes_label_names = ("material","date","raw_data", "H")
     figure_label_names = ("material","date", "raw_data","H")
     figure_summary_label_names = ("raw_data","date")
@@ -76,7 +76,7 @@ class MT:
                 check_deque.append(point)
                 if len(check_deque) == 2:
                     # not the same H?
-                    if abs(check_deque[1][iH] - H_stage) > 2:
+                    if abs(check_deque[1][iH] - H_stage) > 1.5:
                         append_data()
                         current_points = [check_deque.pop()]
                         H_stage = round(current_points[0][iH])

majoplot/domain/scenarios/VSM/MT_insert.py

@@ -13,7 +13,7 @@ H = "Magnetic Field (Oe)"
 
 
 class MT_insert:
-    data_summary_label_names = ["H","cooling_type"]
+    data_summary_label_names = ["mass","H","cooling_type"]
     axes_label_names = ("material","date","raw_data", "H")
     figure_label_names = ("material","date", "raw_data")
     figure_summary_label_names = ("raw_data","date")
@@ -77,7 +77,7 @@ class MT_insert:
                 check_deque.append(point)
                 if len(check_deque) == 2:
                     # not the same H?
-                    if abs(check_deque[1][iH] - H_stage) > 2:
+                    if abs(check_deque[1][iH] - H_stage) > 1.5:
                         append_data()
                         current_points = [check_deque.pop()]
                         H_stage = round(current_points[0][iH])

majoplot/domain/scenarios/VSM/MT_reliability_analysis.py

@@ -24,7 +24,7 @@ _headers_group = [
 ]
 
 class MT_reliability_analysis:
-    data_summary_label_names = ["H","cooling_type"]
+    data_summary_label_names = ["mass","H","cooling_type"]
     axes_label_names = ("material","date","raw_data", "H", "Y_axis")
     figure_label_names = ("material","date", "raw_data","H")
     figure_summary_label_names = ("raw_data","date")
@@ -88,7 +88,7 @@ class MT_reliability_analysis:
                 check_deque.append(point)
                 if len(check_deque) == 2:
                     # not the same H?
-                    if abs(check_deque[1][iH] - H_stage) > 2:
+                    if abs(check_deque[1][iH] - H_stage) > 1.5:
                         append_data()
                         current_points = [check_deque.pop()]
                         H_stage = round(current_points[0][iH])

majoplot/domain/utils.py

@@ -8,7 +8,7 @@ def group_into_axes(all_datas:Iterable[Data], scenario:Scenario)->list[Axes]:
     make_axes_spec = scenario.make_axes_spec
 
     axes_labels_and_data_pools, _ = LabelDict.group(
-        ((data.labels, data) for data in all_datas if not data.unused),
+        ((data.labels, data) for data in all_datas if ( (not data.unused) and (data.points.size > 0) )),
         group_label_names=axes_label_names,
     )
     axes_pool = []

{majoplot-0.1.2.dist-info → majoplot-0.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: majoplot
-Version: 0.1.2
+Version: 0.1.4
 Summary: Automates scenario-specific data preprocessing and plotting workflows for condensed-matter physics labs (OriginLab COM backend + Matplotlib for preview).
 Project-URL: Homepage, https://github.com/ponyofshadows/majoplot
 Project-URL: Source, https://github.com/ponyofshadows/majoplot

{majoplot-0.1.2.dist-info → majoplot-0.1.4.dist-info}/RECORD

@@ -4,24 +4,24 @@ majoplot/config.json,sha256=Fsh4B6pg6et-beyNUQ-pOu3CWd48FYIriqnOUgsaGig,183
 majoplot/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 majoplot/app/cli.py,sha256=L3ADrNasVBFZdmh5r6exuxJEcXJKx7_MROOM4DtjxxM,10033
 majoplot/app/gui.py,sha256=CpRg6LRI3dM2ALswnwz89KSKjONHRlfs69eO8P2VWYE,142
-majoplot/domain/base.py,sha256=sDTtqTnJQkJwMssy4Ez3RWcDUV-2im565BivlWtphqc,14347
-majoplot/domain/muti_axes_spec.py,sha256=LJQQS0Sql29okA5VH-cPHBrtF0NBeoCafr6unfFGEyA,6354
-majoplot/domain/utils.py,sha256=apAilr9QHNmfX49JlWPmbZJZqYSoIH3qM3tFDNcWAuI,3283
+majoplot/domain/base.py,sha256=DKlK1_2cdRS2CVwnWJc-EFYKKl3MS3WZ445LoMMq6PU,14341
+majoplot/domain/muti_axes_spec.py,sha256=pF4Yy2x12QSFny5x18gave-f-ZYuJMW-czwwsJ-6Ths,6313
+majoplot/domain/utils.py,sha256=D3TujFG3gu_VRIehAtKKKgU-Gu8kujdAhXISE2TjzM4,3316
 majoplot/domain/importers/PPMS_Resistivity.py,sha256=zJe_33w0i90am9yI24r4STjG53AggUH_QdOY1HobT3g,4492
 majoplot/domain/importers/VSM.py,sha256=bn9DQVrjAt8cnSXxZhHzXoDrMjV6MXrs84_c7UkmfKM,3549
 majoplot/domain/importers/XRD.py,sha256=K93Gwce45-ta-TfOt7ijrJVBtePU1veDcRYUyeP4sOI,2808
 majoplot/domain/scenarios/PPMS_Resistivity/RT.py,sha256=Qt3jHr4gK0Wu8FYee-duznIqqCK4G6OBAat0H3MbQjU,4573
-majoplot/domain/scenarios/VSM/MT.py,sha256=T09q9D2CMnD2bdk-THb7FpSmcO4kzUvSEMdugs_XibY,4530
-majoplot/domain/scenarios/VSM/MT_insert.py,sha256=rpkDfrN1HjCcFb7UFfD7F2078QFm2AVYOQG35IrUMhQ,4691
-majoplot/domain/scenarios/VSM/MT_reliability_analysis.py,sha256=V5F_iPw6q2boA04o00Av6STkZ-xOAF1Cz9vS4Uo0SyE,5089
+majoplot/domain/scenarios/VSM/MT.py,sha256=UGCx0_R_h_gjLHyQ6eIwxJkevfoxY8vFsQqiYQ8Jzjc,4539
+majoplot/domain/scenarios/VSM/MT_insert.py,sha256=JVRLJxEg4wQjpCe5NhTyiZdrQ2Qkp_w0jzUthu4YNBk,4700
+majoplot/domain/scenarios/VSM/MT_reliability_analysis.py,sha256=igg34PAuMY18xvEXfWWzo8zqD7GyDS61nYQTltqzkQk,5098
 majoplot/domain/scenarios/XRD/Compare.py,sha256=6ST3Uwcv4_2Xegxa1Zugu8noAy_rJHpCRc3iH2n2EMU,3859
 majoplot/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 majoplot/gui/main.py,sha256=A3hLqs96zK7TrXAOUdSn-sip9Ivzmy74263lDmjINSk,20222
 majoplot/infra/plotters/matplot.py,sha256=DE3nCfFjL9FxNbuEgggJyXlolkP1nWKmNwJElt1bgHw,12281
 majoplot/infra/plotters/origin.py,sha256=m5cMYqnKHB2GJSTWlAbd61b2Xz7rvaHT38JXLHUTSQQ,39034
 majoplot/infra/plotters/origin_utils/originlab_type_library.py,sha256=zxOxF7nB57zwnXSaFSoCUV64ZTHhDBDRv57exatiBoU,37398
-majoplot-0.1.2.dist-info/METADATA,sha256=Pxe4jeLSYGaQgZTlcwh5b3L_39WlpPymVSuiTfnBJ_M,2877
-majoplot-0.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-majoplot-0.1.2.dist-info/entry_points.txt,sha256=zEiPXZtNyJQMvVS-Zl9psx8SpTafOcs8F9S8xGtOaBM,52
-majoplot-0.1.2.dist-info/licenses/LICENSE,sha256=fj2NqLupbHWfA5W-8tqCpT5yjO8A4F1HcKnt_maww20,1070
-majoplot-0.1.2.dist-info/RECORD,,
+majoplot-0.1.4.dist-info/METADATA,sha256=FgxI5PR1SL936gEJGIcfuBmKboYtlUqsao18vchg-l8,2877
+majoplot-0.1.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+majoplot-0.1.4.dist-info/entry_points.txt,sha256=zEiPXZtNyJQMvVS-Zl9psx8SpTafOcs8F9S8xGtOaBM,52
+majoplot-0.1.4.dist-info/licenses/LICENSE,sha256=fj2NqLupbHWfA5W-8tqCpT5yjO8A4F1HcKnt_maww20,1070
+majoplot-0.1.4.dist-info/RECORD,,